Skip to content

use emplace instead of find + emplace #1195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 17 commits into
base: fb-mysql-8.0.23
Choose a base branch
from
Open

use emplace instead of find + emplace #1195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ebb564c
Setting enforce_single_del_contracts=false by default
yoshinorim May 21, 2022
f516f1c
Fix multiquery audit logging
lth May 24, 2022
6815cf6
add a test bypass rpc plugin and a new mtr test
May 9, 2022
2549a07
add more mtr test for bypass rpc and fix bugs
May 26, 2022
80ba30e
read instant column default value data
luqun Apr 26, 2022
38256b2
Changing raft WAL dir to datadir so it does not conflict with raft lo…
abhinav04sharma Jun 1, 2022
3d0f1c2
changes to optimize thread id system call
shivamverma321 May 26, 2022
5c07d01
Marking the shardbeater as stopped after sb_thd has been destroyed an…
anirbanr-fb Jun 2, 2022
42fce2f
Fix bypass thd->lock leak
yizhang82 May 30, 2022
d9fd7c6
add a missing file to libservices
Jun 3, 2022
fda095d
update innodb.alter_kill MTR
luqun Jun 6, 2022
f794782
Fix dumping into compressed outfile
Jun 6, 2022
c266fdc
Fix in test_service_privacy
Jun 8, 2022
1021e6e
Add SE_PRIVATE_DATA into I_S.tables and I_S.columns
luqun May 21, 2022
81baa6c
update dynamic_load_error to compare error message only
luqun Jun 9, 2022
ec8d307
Stabilize rocksdb.rocksdb_mrr
lth Jun 9, 2022
b277527
use emplace instead of find + emplace
rockeet Jun 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/mysql/thread_pool_priv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ void thd_set_not_killable(THD *thd);
ulong thd_get_net_wait_timeout(THD *thd);
my_socket thd_get_fd(THD *thd);
void thd_store_globals(THD *thd);
void thd_store_globals(THD *thd, pid_t id);
bool thd_check_connection_admin_privilege(THD *thd);

/*
Expand Down
3 changes: 2 additions & 1 deletion libservices/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
#
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License, version 2.0,
# as published by the Free Software Foundation.
Expand Down Expand Up @@ -40,6 +40,7 @@ SET(MYSQLSERVICES_SOURCES
mysql_password_policy_service.c
parser_service.c
srv_session_info_service.c
rpc_plugin_service.c
rpl_transaction_ctx_service.c
rpl_transaction_write_set_service.c
security_context_service.c
Expand Down
26 changes: 26 additions & 0 deletions libservices/rpc_plugin_service.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@

/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,
as published by the Free Software Foundation.

This program is also distributed with certain software (including
but not limited to OpenSSL) that is licensed under separate terms,
as designated in a particular file or component or in included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License, version 2.0, for more details.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */

#include "service_versions.h"

SERVICE_VERSION *rpc_plugin_service = (void **)VERSION_rpc_plugin_service;
3 changes: 3 additions & 0 deletions mysql-test/include/plugin.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,3 +156,6 @@ component_reference_cache plugin_output_directory REFERENCE_CACHE_COMPONENT
# test privacy service
libtest_get_column_ref_info plugin_output_directory TEST_GET_COLUMN_REF_INFO test_get_column_ref_info
libtest_build_column_lineage_info plugin_output_directory TEST_BUILD_COLUMN_LINEAGE_INFO test_build_column_lineage_info

# test bypass rpc plugin
libtest_bypass_rpc_plugin plugin_output_directory TEST_BYPASS_RPC_PLUGIN test_bypass_rpc_plugin_info
2 changes: 1 addition & 1 deletion mysql-test/lib/My/ConfigFactory.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ my @mysqld_rules = (
{ 'secure-file-priv' => sub { return shift->{ARGS}->{vardir}; }
},
{ 'loose-rpl_raft_log_dir' => \&fix_tmpdir },
{ 'loose-rpl_raft_wal_dir' => \&fix_tmpdir },
{ 'loose-rpl_raft_wal_dir' => \&fix_datadir },
);

if (IS_WINDOWS) {
Expand Down
10 changes: 5 additions & 5 deletions mysql-test/r/create.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2972,11 +2972,11 @@ t1 CREATE TABLE `t1` (
`d` tinyint(1) unsigned zerofill DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1';
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT GENERATION_EXPRESSION SRS_ID
def test t1 a 1 NULL YES tinyint NULL NULL 3 0 NULL NULL NULL tinyint(1) select,insert,update,references NULL
def test t1 b 2 NULL YES tinyint NULL NULL 3 0 NULL NULL NULL tinyint(1) select,insert,update,references NULL
def test t1 c 3 NULL YES tinyint NULL NULL 3 0 NULL NULL NULL tinyint unsigned select,insert,update,references NULL
def test t1 d 4 NULL YES tinyint NULL NULL 3 0 NULL NULL NULL tinyint(1) unsigned zerofill select,insert,update,references NULL
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT GENERATION_EXPRESSION SRS_ID COLUMN_SE_PRIVATE_DATA
def test t1 a 1 NULL YES tinyint NULL NULL 3 0 NULL NULL NULL tinyint(1) select,insert,update,references NULL #
def test t1 b 2 NULL YES tinyint NULL NULL 3 0 NULL NULL NULL tinyint(1) select,insert,update,references NULL #
def test t1 c 3 NULL YES tinyint NULL NULL 3 0 NULL NULL NULL tinyint unsigned select,insert,update,references NULL #
def test t1 d 4 NULL YES tinyint NULL NULL 3 0 NULL NULL NULL tinyint(1) unsigned zerofill select,insert,update,references NULL #
DESCRIBE t1;
Field Type Null Key Default Extra
a tinyint(1) YES NULL
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/r/dd_is_compatibility_cs.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ tables_priv
# I_S view definitions.
SHOW CREATE TABLE information_schema.tables;
View Create View character_set_client collation_connection
TABLES CREATE ALGORITHM=UNDEFINED DEFINER=`mysql.infoschema`@`localhost` SQL SECURITY DEFINER VIEW `information_schema`.`TABLES` AS select `cat`.`name` AS `TABLE_CATALOG`,`sch`.`name` AS `TABLE_SCHEMA`,`tbl`.`name` AS `TABLE_NAME`,`tbl`.`type` AS `TABLE_TYPE`,if((`tbl`.`type` = 'BASE TABLE'),`tbl`.`engine`,NULL) AS `ENGINE`,if((`tbl`.`type` = 'VIEW'),NULL,10) AS `VERSION`,`tbl`.`row_format` AS `ROW_FORMAT`,if((`tbl`.`type` = 'VIEW'),NULL,internal_table_rows(`sch`.`name`,`tbl`.`name`,if((`tbl`.`partition_type` is null),`tbl`.`engine`,''),`tbl`.`se_private_id`,(`tbl`.`hidden` <> 'Visible'),`ts`.`se_private_data`,coalesce(`stat`.`table_rows`,0),coalesce(cast(`stat`.`cached_time` as unsigned),0))) AS `TABLE_ROWS`,if((`tbl`.`type` = 'VIEW'),NULL,internal_avg_row_length(`sch`.`name`,`tbl`.`name`,if((`tbl`.`partition_type` is null),`tbl`.`engine`,''),`tbl`.`se_private_id`,(`tbl`.`hidden` <> 'Visible'),`ts`.`se_private_data`,coalesce(`stat`.`avg_row_length`,0),coalesce(cast(`stat`.`cached_time` as unsigned),0))) AS `AVG_ROW_LENGTH`,if((`tbl`.`type` = 'VIEW'),NULL,internal_data_length(`sch`.`name`,`tbl`.`name`,if((`tbl`.`partition_type` is null),`tbl`.`engine`,''),`tbl`.`se_private_id`,(`tbl`.`hidden` <> 'Visible'),`ts`.`se_private_data`,coalesce(`stat`.`data_length`,0),coalesce(cast(`stat`.`cached_time` as unsigned),0))) AS `DATA_LENGTH`,if((`tbl`.`type` = 'VIEW'),NULL,internal_max_data_length(`sch`.`name`,`tbl`.`name`,if((`tbl`.`partition_type` is null),`tbl`.`engine`,''),`tbl`.`se_private_id`,(`tbl`.`hidden` <> 'Visible'),`ts`.`se_private_data`,coalesce(`stat`.`max_data_length`,0),coalesce(cast(`stat`.`cached_time` as unsigned),0))) AS `MAX_DATA_LENGTH`,if((`tbl`.`type` = 'VIEW'),NULL,internal_index_length(`sch`.`name`,`tbl`.`name`,if((`tbl`.`partition_type` is null),`tbl`.`engine`,''),`tbl`.`se_private_id`,(`tbl`.`hidden` <> 'Visible'),`ts`.`se_private_data`,coalesce(`stat`.`index_length`,0),coalesce(cast(`stat`.`cached_time` as unsigned),0))) AS `INDEX_LENGTH`,if((`tbl`.`type` = 'VIEW'),NULL,internal_data_free(`sch`.`name`,`tbl`.`name`,if((`tbl`.`partition_type` is null),`tbl`.`engine`,''),`tbl`.`se_private_id`,(`tbl`.`hidden` <> 'Visible'),`ts`.`se_private_data`,coalesce(`stat`.`data_free`,0),coalesce(cast(`stat`.`cached_time` as unsigned),0))) AS `DATA_FREE`,if((`tbl`.`type` = 'VIEW'),NULL,internal_auto_increment(`sch`.`name`,`tbl`.`name`,if((`tbl`.`partition_type` is null),`tbl`.`engine`,''),`tbl`.`se_private_id`,(`tbl`.`hidden` <> 'Visible'),`ts`.`se_private_data`,coalesce(`stat`.`auto_increment`,0),coalesce(cast(`stat`.`cached_time` as unsigned),0),`tbl`.`se_private_data`)) AS `AUTO_INCREMENT`,`tbl`.`created` AS `CREATE_TIME`,if((`tbl`.`type` = 'VIEW'),NULL,internal_update_time(`sch`.`name`,`tbl`.`name`,if((`tbl`.`partition_type` is null),`tbl`.`engine`,''),`tbl`.`se_private_id`,(`tbl`.`hidden` <> 'Visible'),`ts`.`se_private_data`,coalesce(cast(`stat`.`update_time` as unsigned),0),coalesce(cast(`stat`.`cached_time` as unsigned),0))) AS `UPDATE_TIME`,if((`tbl`.`type` = 'VIEW'),NULL,internal_check_time(`sch`.`name`,`tbl`.`name`,if((`tbl`.`partition_type` is null),`tbl`.`engine`,''),`tbl`.`se_private_id`,(`tbl`.`hidden` <> 'Visible'),`ts`.`se_private_data`,coalesce(cast(`stat`.`check_time` as unsigned),0),coalesce(cast(`stat`.`cached_time` as unsigned),0))) AS `CHECK_TIME`,`col`.`name` AS `TABLE_COLLATION`,if((`tbl`.`type` = 'VIEW'),NULL,internal_checksum(`sch`.`name`,`tbl`.`name`,if((`tbl`.`partition_type` is null),`tbl`.`engine`,''),`tbl`.`se_private_id`,(`tbl`.`hidden` <> 'Visible'),`ts`.`se_private_data`,coalesce(`stat`.`checksum`,0),coalesce(cast(`stat`.`cached_time` as unsigned),0))) AS `CHECKSUM`,if((`tbl`.`type` = 'VIEW'),NULL,get_dd_create_options(`tbl`.`options`,if((ifnull(`tbl`.`partition_expression`,'NOT_PART_TBL') = 'NOT_PART_TBL'),0,1),if((`sch`.`default_encryption` = 'YES'),1,0))) AS `CREATE_OPTIONS`,internal_get_comment_or_error(`sch`.`name`,`tbl`.`name`,`tbl`.`type`,`tbl`.`options`,`tbl`.`comment`) AS `TABLE_COMMENT` from (((((`mysql`.`tables` `tbl` join `mysql`.`schemata` `sch` on((`tbl`.`schema_id` = `sch`.`id`))) join `mysql`.`catalogs` `cat` on((`cat`.`id` = `sch`.`catalog_id`))) left join `mysql`.`collations` `col` on((`tbl`.`collation_id` = `col`.`id`))) left join `mysql`.`tablespaces` `ts` on((`tbl`.`tablespace_id` = `ts`.`id`))) left join `mysql`.`table_stats` `stat` on(((`tbl`.`name` = `stat`.`table_name`) and (`sch`.`name` = `stat`.`schema_name`)))) where ((0 <> can_access_table(`sch`.`name`,`tbl`.`name`)) and (0 <> is_visible_dd_object(`tbl`.`hidden`))) utf8 utf8_general_ci
TABLES CREATE ALGORITHM=UNDEFINED DEFINER=`mysql.infoschema`@`localhost` SQL SECURITY DEFINER VIEW `information_schema`.`TABLES` AS select `cat`.`name` AS `TABLE_CATALOG`,`sch`.`name` AS `TABLE_SCHEMA`,`tbl`.`name` AS `TABLE_NAME`,`tbl`.`type` AS `TABLE_TYPE`,if((`tbl`.`type` = 'BASE TABLE'),`tbl`.`engine`,NULL) AS `ENGINE`,if((`tbl`.`type` = 'VIEW'),NULL,10) AS `VERSION`,`tbl`.`row_format` AS `ROW_FORMAT`,if((`tbl`.`type` = 'VIEW'),NULL,internal_table_rows(`sch`.`name`,`tbl`.`name`,if((`tbl`.`partition_type` is null),`tbl`.`engine`,''),`tbl`.`se_private_id`,(`tbl`.`hidden` <> 'Visible'),`ts`.`se_private_data`,coalesce(`stat`.`table_rows`,0),coalesce(cast(`stat`.`cached_time` as unsigned),0))) AS `TABLE_ROWS`,if((`tbl`.`type` = 'VIEW'),NULL,internal_avg_row_length(`sch`.`name`,`tbl`.`name`,if((`tbl`.`partition_type` is null),`tbl`.`engine`,''),`tbl`.`se_private_id`,(`tbl`.`hidden` <> 'Visible'),`ts`.`se_private_data`,coalesce(`stat`.`avg_row_length`,0),coalesce(cast(`stat`.`cached_time` as unsigned),0))) AS `AVG_ROW_LENGTH`,if((`tbl`.`type` = 'VIEW'),NULL,internal_data_length(`sch`.`name`,`tbl`.`name`,if((`tbl`.`partition_type` is null),`tbl`.`engine`,''),`tbl`.`se_private_id`,(`tbl`.`hidden` <> 'Visible'),`ts`.`se_private_data`,coalesce(`stat`.`data_length`,0),coalesce(cast(`stat`.`cached_time` as unsigned),0))) AS `DATA_LENGTH`,if((`tbl`.`type` = 'VIEW'),NULL,internal_max_data_length(`sch`.`name`,`tbl`.`name`,if((`tbl`.`partition_type` is null),`tbl`.`engine`,''),`tbl`.`se_private_id`,(`tbl`.`hidden` <> 'Visible'),`ts`.`se_private_data`,coalesce(`stat`.`max_data_length`,0),coalesce(cast(`stat`.`cached_time` as unsigned),0))) AS `MAX_DATA_LENGTH`,if((`tbl`.`type` = 'VIEW'),NULL,internal_index_length(`sch`.`name`,`tbl`.`name`,if((`tbl`.`partition_type` is null),`tbl`.`engine`,''),`tbl`.`se_private_id`,(`tbl`.`hidden` <> 'Visible'),`ts`.`se_private_data`,coalesce(`stat`.`index_length`,0),coalesce(cast(`stat`.`cached_time` as unsigned),0))) AS `INDEX_LENGTH`,if((`tbl`.`type` = 'VIEW'),NULL,internal_data_free(`sch`.`name`,`tbl`.`name`,if((`tbl`.`partition_type` is null),`tbl`.`engine`,''),`tbl`.`se_private_id`,(`tbl`.`hidden` <> 'Visible'),`ts`.`se_private_data`,coalesce(`stat`.`data_free`,0),coalesce(cast(`stat`.`cached_time` as unsigned),0))) AS `DATA_FREE`,if((`tbl`.`type` = 'VIEW'),NULL,internal_auto_increment(`sch`.`name`,`tbl`.`name`,if((`tbl`.`partition_type` is null),`tbl`.`engine`,''),`tbl`.`se_private_id`,(`tbl`.`hidden` <> 'Visible'),`ts`.`se_private_data`,coalesce(`stat`.`auto_increment`,0),coalesce(cast(`stat`.`cached_time` as unsigned),0),`tbl`.`se_private_data`)) AS `AUTO_INCREMENT`,`tbl`.`created` AS `CREATE_TIME`,if((`tbl`.`type` = 'VIEW'),NULL,internal_update_time(`sch`.`name`,`tbl`.`name`,if((`tbl`.`partition_type` is null),`tbl`.`engine`,''),`tbl`.`se_private_id`,(`tbl`.`hidden` <> 'Visible'),`ts`.`se_private_data`,coalesce(cast(`stat`.`update_time` as unsigned),0),coalesce(cast(`stat`.`cached_time` as unsigned),0))) AS `UPDATE_TIME`,if((`tbl`.`type` = 'VIEW'),NULL,internal_check_time(`sch`.`name`,`tbl`.`name`,if((`tbl`.`partition_type` is null),`tbl`.`engine`,''),`tbl`.`se_private_id`,(`tbl`.`hidden` <> 'Visible'),`ts`.`se_private_data`,coalesce(cast(`stat`.`check_time` as unsigned),0),coalesce(cast(`stat`.`cached_time` as unsigned),0))) AS `CHECK_TIME`,`col`.`name` AS `TABLE_COLLATION`,if((`tbl`.`type` = 'VIEW'),NULL,internal_checksum(`sch`.`name`,`tbl`.`name`,if((`tbl`.`partition_type` is null),`tbl`.`engine`,''),`tbl`.`se_private_id`,(`tbl`.`hidden` <> 'Visible'),`ts`.`se_private_data`,coalesce(`stat`.`checksum`,0),coalesce(cast(`stat`.`cached_time` as unsigned),0))) AS `CHECKSUM`,if((`tbl`.`type` = 'VIEW'),NULL,get_dd_create_options(`tbl`.`options`,if((ifnull(`tbl`.`partition_expression`,'NOT_PART_TBL') = 'NOT_PART_TBL'),0,1),if((`sch`.`default_encryption` = 'YES'),1,0))) AS `CREATE_OPTIONS`,internal_get_comment_or_error(`sch`.`name`,`tbl`.`name`,`tbl`.`type`,`tbl`.`options`,`tbl`.`comment`) AS `TABLE_COMMENT`,`tbl`.`se_private_data` AS `TABLE_SE_PRIVATE_DATA` from (((((`mysql`.`tables` `tbl` join `mysql`.`schemata` `sch` on((`tbl`.`schema_id` = `sch`.`id`))) join `mysql`.`catalogs` `cat` on((`cat`.`id` = `sch`.`catalog_id`))) left join `mysql`.`collations` `col` on((`tbl`.`collation_id` = `col`.`id`))) left join `mysql`.`tablespaces` `ts` on((`tbl`.`tablespace_id` = `ts`.`id`))) left join `mysql`.`table_stats` `stat` on(((`tbl`.`name` = `stat`.`table_name`) and (`sch`.`name` = `stat`.`schema_name`)))) where ((0 <> can_access_table(`sch`.`name`,`tbl`.`name`)) and (0 <> is_visible_dd_object(`tbl`.`hidden`))) utf8 utf8_general_ci
#########################################################
# Issue WL#6599/HLS/6c): Capital cased I_S table column names.
#########################################################
Expand Down
22 changes: 11 additions & 11 deletions mysql-test/r/dd_upgrade_test.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,8 +435,8 @@ DESC `test`.`initial_vü`;
Field Type Null Key Default Extra
cü char(1) YES NULL
SELECT * FROM information_schema.tables WHERE table_schema = 'test' and table_type='VIEW';
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT
def test initial_vü VIEW NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL CREATE_TIME NULL NULL NULL NULL NULL VIEW
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT TABLE_SE_PRIVATE_DATA
def test initial_vü VIEW NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL CREATE_TIME NULL NULL NULL NULL NULL VIEW NULL
SET names default;
#Test case for Bug#26636238
SHOW CREATE TABLE performance_schema.threads;
Expand Down Expand Up @@ -671,15 +671,15 @@ x y
3 5
SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE
TABLE_SCHEMA='view_with_column_names' ORDER BY TABLE_NAME,ORDINAL_POSITION;
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT GENERATION_EXPRESSION SRS_ID
def view_with_column_names t1 x 1 NULL YES int NULL NULL 10 0 NULL NULL NULL int select,insert,update,references NULL
def view_with_column_names t1 y 2 NULL YES int NULL NULL 10 0 NULL NULL NULL int select,insert,update,references NULL
def view_with_column_names v1 a 1 NULL YES int NULL NULL 10 0 NULL NULL NULL int select,insert,update,references NULL
def view_with_column_names v1 b 2 NULL YES int NULL NULL 10 0 NULL NULL NULL int select,insert,update,references NULL
def view_with_column_names v2 e 1 NULL YES int NULL NULL 10 0 NULL NULL NULL int select,insert,update,references NULL
def view_with_column_names v2 f 2 NULL YES int NULL NULL 10 0 NULL NULL NULL int select,insert,update,references NULL
def view_with_column_names v3 x 1 NULL YES int NULL NULL 10 0 NULL NULL NULL int select,insert,update,references NULL
def view_with_column_names v3 y 2 NULL YES int NULL NULL 10 0 NULL NULL NULL int select,insert,update,references NULL
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT GENERATION_EXPRESSION SRS_ID COLUMN_SE_PRIVATE_DATA
def view_with_column_names t1 x 1 NULL YES int NULL NULL 10 0 NULL NULL NULL int select,insert,update,references NULL NULL
def view_with_column_names t1 y 2 NULL YES int NULL NULL 10 0 NULL NULL NULL int select,insert,update,references NULL NULL
def view_with_column_names v1 a 1 NULL YES int NULL NULL 10 0 NULL NULL NULL int select,insert,update,references NULL NULL
def view_with_column_names v1 b 2 NULL YES int NULL NULL 10 0 NULL NULL NULL int select,insert,update,references NULL NULL
def view_with_column_names v2 e 1 NULL YES int NULL NULL 10 0 NULL NULL NULL int select,insert,update,references NULL NULL
def view_with_column_names v2 f 2 NULL YES int NULL NULL 10 0 NULL NULL NULL int select,insert,update,references NULL NULL
def view_with_column_names v3 x 1 NULL YES int NULL NULL 10 0 NULL NULL NULL int select,insert,update,references NULL NULL
def view_with_column_names v3 y 2 NULL YES int NULL NULL 10 0 NULL NULL NULL int select,insert,update,references NULL NULL
# Bug #28480149 "UPGRADE FAIL: FAILED TO ADD THE FOREIGN KEY CONSTRAINT.
# MISSING INDEX FOR CONSTR". Coverage for upgrade scenario. Main part
# of coverage resides in foreign_key test.
Expand Down
Loading