diff --git a/mysql-test/suite/funcs_1/r/is_columns_mysql.result b/mysql-test/suite/funcs_1/r/is_columns_mysql.result index a7f7cf82c89..37893f9f45e 100644 --- a/mysql-test/suite/funcs_1/r/is_columns_mysql.result +++ b/mysql-test/suite/funcs_1/r/is_columns_mysql.result @@ -253,7 +253,6 @@ COL_CML DATA_TYPE CHARACTER_SET_NAME COLLATION_NAME 1.0000 longblob NULL NULL 1.0000 char latin1 latin1_bin 1.0000 char latin1 latin1_swedish_ci -1.0000 varchar latin1 latin1_swedish_ci 1.0000 text utf8 utf8_bin 1.0000 mediumtext utf8 utf8_general_ci 1.0000 text utf8 utf8_general_ci @@ -287,7 +286,6 @@ COL_CML DATA_TYPE CHARACTER_SET_NAME COLLATION_NAME NULL bigint NULL NULL NULL datetime NULL NULL NULL decimal NULL NULL -NULL float NULL NULL NULL int NULL NULL NULL smallint NULL NULL NULL time NULL NULL diff --git a/mysql-test/suite/funcs_1/r/is_key_column_usage.result b/mysql-test/suite/funcs_1/r/is_key_column_usage.result index 1b6b6f00e26..2e54df0f000 100644 --- a/mysql-test/suite/funcs_1/r/is_key_column_usage.result +++ b/mysql-test/suite/funcs_1/r/is_key_column_usage.result @@ -107,11 +107,8 @@ def mysql PRIMARY def mysql innodb_index_stats database_name def mysql PRIMARY def mysql innodb_index_stats table_name def mysql PRIMARY def mysql innodb_index_stats index_name def mysql PRIMARY def mysql innodb_index_stats stat_name -def mysql innodb_index_stats_ibfk_1 def mysql innodb_index_stats database_name -def mysql innodb_index_stats_ibfk_1 def mysql innodb_index_stats table_name def mysql PRIMARY def mysql innodb_table_stats database_name def mysql PRIMARY def mysql innodb_table_stats table_name -def mysql PRIMARY def mysql ndb_binlog_index epoch def mysql PRIMARY def mysql plugin name def mysql PRIMARY def mysql proc db def mysql PRIMARY def mysql proc name @@ -126,10 +123,6 @@ def mysql PRIMARY def mysql proxies_priv User def mysql PRIMARY def mysql proxies_priv Proxied_host def mysql PRIMARY def mysql proxies_priv Proxied_user def mysql PRIMARY def mysql servers Server_name -def mysql PRIMARY def mysql slave_master_info Master_id -def mysql PRIMARY def mysql slave_relay_log_info Master_id -def mysql PRIMARY def mysql slave_worker_info Master_id -def mysql PRIMARY def mysql slave_worker_info Worker_id def mysql PRIMARY def mysql table_stats db_name def mysql PRIMARY def mysql table_stats table_name def mysql PRIMARY def mysql tables_priv Host diff --git a/mysql-test/suite/funcs_1/r/is_table_constraints.result b/mysql-test/suite/funcs_1/r/is_table_constraints.result index cf0fce25e4c..6ad0e17307e 100644 --- a/mysql-test/suite/funcs_1/r/is_table_constraints.result +++ b/mysql-test/suite/funcs_1/r/is_table_constraints.result @@ -72,17 +72,12 @@ def mysql name mysql help_topic def mysql PRIMARY mysql host def mysql PRIMARY mysql index_stats def mysql PRIMARY mysql innodb_index_stats -def mysql innodb_index_stats_ibfk_1 mysql innodb_index_stats def mysql PRIMARY mysql innodb_table_stats -def mysql PRIMARY mysql ndb_binlog_index def mysql PRIMARY mysql plugin def mysql PRIMARY mysql proc def mysql PRIMARY mysql procs_priv def mysql PRIMARY mysql proxies_priv def mysql PRIMARY mysql servers -def mysql PRIMARY mysql slave_master_info -def mysql PRIMARY mysql slave_relay_log_info -def mysql PRIMARY mysql slave_worker_info def mysql PRIMARY mysql table_stats def mysql PRIMARY mysql tables_priv def mysql PRIMARY mysql time_zone diff --git a/mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result b/mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result index b8032efcd0e..4369547a62f 100644 --- a/mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result +++ b/mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result @@ -21,18 +21,13 @@ def mysql name mysql help_topic UNIQUE def mysql PRIMARY mysql help_topic PRIMARY KEY def mysql PRIMARY mysql host PRIMARY KEY def mysql PRIMARY mysql index_stats PRIMARY KEY -def mysql innodb_index_stats_ibfk_1 mysql innodb_index_stats FOREIGN KEY def mysql PRIMARY mysql innodb_index_stats PRIMARY KEY def mysql PRIMARY mysql innodb_table_stats PRIMARY KEY -def mysql PRIMARY mysql ndb_binlog_index PRIMARY KEY def mysql PRIMARY mysql plugin PRIMARY KEY def mysql PRIMARY mysql proc PRIMARY KEY def mysql PRIMARY mysql procs_priv PRIMARY KEY def mysql PRIMARY mysql proxies_priv PRIMARY KEY def mysql PRIMARY mysql servers PRIMARY KEY -def mysql PRIMARY mysql slave_master_info PRIMARY KEY -def mysql PRIMARY mysql slave_relay_log_info PRIMARY KEY -def mysql PRIMARY mysql slave_worker_info PRIMARY KEY def mysql PRIMARY mysql tables_priv PRIMARY KEY def mysql PRIMARY mysql table_stats PRIMARY KEY def mysql PRIMARY mysql time_zone PRIMARY KEY diff --git a/mysql-test/suite/funcs_1/r/storedproc.result b/mysql-test/suite/funcs_1/r/storedproc.result index e64d7a1b0ed..b756226ae9f 100644 --- a/mysql-test/suite/funcs_1/r/storedproc.result +++ b/mysql-test/suite/funcs_1/r/storedproc.result @@ -16350,7 +16350,6 @@ fn7(99999999999) 9999999999 Warnings: Warning 1264 Out of range value for column 'f1' at row 1 -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn8; CREATE FUNCTION fn8( f1 decimal (0) unsigned zerofill) returns decimal (0) unsigned zerofill BEGIN @@ -16360,8 +16359,6 @@ END// SELECT fn8(999999999); fn8(999999999) 1000000000 -Warnings: -Note 1265 Data truncated for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn9; CREATE FUNCTION fn9( f1 decimal (0) zerofill) returns decimal (0) zerofill BEGIN @@ -16373,7 +16370,6 @@ fn9(-1.00e+09) 0000000010 Warnings: Warning 1264 Out of range value for column 'f1' at row 1 -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn10; CREATE FUNCTION fn10( f1 decimal (0, 0)) returns decimal (0, 0) BEGIN @@ -16394,7 +16390,6 @@ fn11(99999999999) 9999999999 Warnings: Warning 1264 Out of range value for column 'f1' at row 1 -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn12; CREATE FUNCTION fn12( f1 decimal (0, 0) unsigned zerofill) returns decimal (0, 0) unsigned zerofill BEGIN @@ -16404,8 +16399,6 @@ END// SELECT fn12(999999999); fn12(999999999) 1000000000 -Warnings: -Note 1265 Data truncated for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn13; CREATE FUNCTION fn13( f1 decimal (0, 0) zerofill) returns decimal (0, 0) zerofill BEGIN @@ -16417,7 +16410,6 @@ fn13(-1.00e+09) 0000000010 Warnings: Warning 1264 Out of range value for column 'f1' at row 1 -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn14; CREATE FUNCTION fn14( f1 decimal (63, 30)) returns decimal (63, 30) BEGIN @@ -16456,7 +16448,6 @@ fn17(-1.00e+21) 000000000000000000000000000000010.000000000000000000000000000000 Warnings: Warning 1264 Out of range value for column 'f1' at row 1 -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn18_d; CREATE FUNCTION fn18_d( f1 decimal (64)) returns decimal (64) BEGIN @@ -16493,8 +16484,6 @@ END// SELECT fn21_d_z(1.00e+00); fn21_d_z(1.00e+00) 0000000000000000000000000000000000000000000000000000000000000010 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn22; CREATE FUNCTION fn22( f1 decimal unsigned) returns decimal unsigned BEGIN @@ -16504,8 +16493,6 @@ END// SELECT fn22(1.00e+00); fn22(1.00e+00) 10 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn23; CREATE FUNCTION fn23( f1 decimal unsigned zerofill) returns decimal unsigned zerofill BEGIN @@ -16515,8 +16502,6 @@ END// SELECT fn23(1.00e+00); fn23(1.00e+00) 0000000010 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn24; CREATE FUNCTION fn24( f1 decimal zerofill) returns decimal zerofill BEGIN @@ -16528,7 +16513,6 @@ fn24(-1.00e+09) 0000000010 Warnings: Warning 1264 Out of range value for column 'f1' at row 1 -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn25; CREATE FUNCTION fn25( f1 double) returns double BEGIN @@ -16547,8 +16531,6 @@ END// SELECT fn26(1.00e+00); fn26(1.00e+00) 10 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn27; CREATE FUNCTION fn27( f1 double unsigned zerofill) returns double unsigned zerofill BEGIN @@ -16558,8 +16540,6 @@ END// SELECT fn27(1.00e+00); fn27(1.00e+00) 10 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn28; CREATE FUNCTION fn28( f1 double zerofill) returns double zerofill BEGIN @@ -16569,8 +16549,6 @@ END// SELECT fn28(1.00e+00); fn28(1.00e+00) 10 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn29; CREATE FUNCTION fn29( f1 float) returns float BEGIN @@ -16589,8 +16567,6 @@ END// SELECT fn30(1.00e+00); fn30(1.00e+00) 10 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn31; CREATE FUNCTION fn31( f1 float unsigned zerofill) returns float unsigned zerofill BEGIN @@ -16600,8 +16576,6 @@ END// SELECT fn31(1.00e+00); fn31(1.00e+00) 10 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn32; CREATE FUNCTION fn32( f1 float zerofill) returns float zerofill BEGIN @@ -16611,8 +16585,6 @@ END// SELECT fn32(1.00e+00); fn32(1.00e+00) 10 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn33; CREATE FUNCTION fn33( f1 float(0)) returns float(0) BEGIN @@ -16631,8 +16603,6 @@ END// SELECT fn34(1.00e+00); fn34(1.00e+00) 10 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn35; CREATE FUNCTION fn35( f1 float(0) unsigned zerofill) returns float(0) unsigned zerofill BEGIN @@ -16642,8 +16612,6 @@ END// SELECT fn35(1.00e+00); fn35(1.00e+00) 10 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn36; CREATE FUNCTION fn36( f1 float(0) zerofill) returns float(0) zerofill BEGIN @@ -16653,8 +16621,6 @@ END// SELECT fn36(1.00e+00); fn36(1.00e+00) 10 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn37; CREATE FUNCTION fn37( f1 float(23)) returns float(23) BEGIN @@ -16673,8 +16639,6 @@ END// SELECT fn38(1.00e+00); fn38(1.00e+00) 10 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn39; CREATE FUNCTION fn39( f1 float(23) unsigned zerofill) returns float(23) unsigned zerofill BEGIN @@ -16684,8 +16648,6 @@ END// SELECT fn39(1.00e+00); fn39(1.00e+00) 10 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn40; CREATE FUNCTION fn40( f1 float(23) zerofill) returns float(23) zerofill BEGIN @@ -16695,8 +16657,6 @@ END// SELECT fn40(1.00e+00); fn40(1.00e+00) 10 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn41; CREATE FUNCTION fn41( f1 float(24)) returns float(24) BEGIN @@ -16715,8 +16675,6 @@ END// SELECT fn42(1.00e+00); fn42(1.00e+00) 10 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn43; CREATE FUNCTION fn43( f1 float(24) unsigned zerofill) returns float(24) unsigned zerofill BEGIN @@ -16726,8 +16684,6 @@ END// SELECT fn43(1.00e+00); fn43(1.00e+00) 10 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn44; CREATE FUNCTION fn44( f1 float(24) zerofill) returns float(24) zerofill BEGIN @@ -16737,8 +16693,6 @@ END// SELECT fn44(1.00e+00); fn44(1.00e+00) 10 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn45; CREATE FUNCTION fn45( f1 float(53)) returns float(53) BEGIN @@ -16757,8 +16711,6 @@ END// SELECT fn46(1.00e+00); fn46(1.00e+00) 10 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn47; CREATE FUNCTION fn47( f1 float(53) unsigned zerofill) returns float(53) unsigned zerofill BEGIN @@ -16768,8 +16720,6 @@ END// SELECT fn47(1.00e+00); fn47(1.00e+00) 10 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn48; CREATE FUNCTION fn48( f1 float(53) zerofill) returns float(53) zerofill BEGIN @@ -16779,8 +16729,6 @@ END// SELECT fn48(1.00e+00); fn48(1.00e+00) 10 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn49; CREATE FUNCTION fn49( f1 int) returns int BEGIN @@ -16792,7 +16740,6 @@ fn49(-2.15e+09) -2147483638 Warnings: Warning 1264 Out of range value for column 'f1' at row 1 -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn50; CREATE FUNCTION fn50( f1 int unsigned) returns int unsigned BEGIN @@ -16829,8 +16776,6 @@ END// SELECT fn53(-8388600); fn53(-8388600) -8388598 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn54; CREATE FUNCTION fn54( f1 mediumint unsigned) returns mediumint unsigned BEGIN @@ -16866,8 +16811,6 @@ END// SELECT fn57(-999999999); fn57(-999999999) -1000000000 -Warnings: -Note 1265 Data truncated for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn58; CREATE FUNCTION fn58( f1 numeric (0)) returns numeric (0) BEGIN @@ -16877,8 +16820,6 @@ END// SELECT fn58(-999999999); fn58(-999999999) -1000000000 -Warnings: -Note 1265 Data truncated for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn59; CREATE FUNCTION fn59( f1 numeric (0) unsigned) returns numeric (0) unsigned BEGIN @@ -16888,8 +16829,6 @@ END// SELECT fn59(9999999999); fn59(9999999999) 9999999999 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn60; CREATE FUNCTION fn60( f1 numeric (0) unsigned zerofill) returns numeric (0) unsigned zerofill BEGIN @@ -16899,8 +16838,6 @@ END// SELECT fn60(99999999); fn60(99999999) 0100000000 -Warnings: -Note 1265 Data truncated for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn61; CREATE FUNCTION fn61( f1 numeric (0) zerofill) returns numeric (0) zerofill BEGIN @@ -16912,7 +16849,6 @@ fn61(-99999999) 0000000010 Warnings: Warning 1264 Out of range value for column 'f1' at row 1 -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn62; CREATE FUNCTION fn62( f1 numeric (0, 0)) returns numeric (0, 0) BEGIN @@ -16922,8 +16858,6 @@ END// SELECT fn62(-999999999); fn62(-999999999) -1000000000 -Warnings: -Note 1265 Data truncated for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn63; CREATE FUNCTION fn63( f1 numeric (0, 0) unsigned) returns numeric (0, 0) unsigned BEGIN @@ -16933,8 +16867,6 @@ END// SELECT fn63(9999999999); fn63(9999999999) 9999999999 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn64; CREATE FUNCTION fn64( f1 numeric (0, 0) unsigned zerofill) returns numeric (0, 0) unsigned zerofill BEGIN @@ -16944,8 +16876,6 @@ END// SELECT fn64(99999999); fn64(99999999) 0100000000 -Warnings: -Note 1265 Data truncated for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn65; CREATE FUNCTION fn65( f1 numeric (0, 0) zerofill) returns numeric (0, 0) zerofill BEGIN @@ -16957,7 +16887,6 @@ fn65(-99999999) 0000000010 Warnings: Warning 1264 Out of range value for column 'f1' at row 1 -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn66; CREATE FUNCTION fn66( f1 numeric (63, 30)) returns numeric (63, 30) BEGIN @@ -16969,7 +16898,6 @@ fn66(-1e+36) -999999999999999999999999999999989.999999999999999999999999999999 Warnings: Warning 1264 Out of range value for column 'f1' at row 1 -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn67; CREATE FUNCTION fn67( f1 numeric (63, 30) unsigned) returns numeric (63, 30) unsigned BEGIN @@ -16981,7 +16909,6 @@ fn67(1e+36) 999999999999999999999999999999999.999999999999999999999999999999 Warnings: Warning 1264 Out of range value for column 'f1' at row 1 -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn68; CREATE FUNCTION fn68( f1 numeric (63, 30) unsigned zerofill) returns numeric (63, 30) unsigned zerofill BEGIN @@ -16993,7 +16920,6 @@ fn68(1e+36) 999999999999999999999999999999999.999999999999999999999999999999 Warnings: Warning 1264 Out of range value for column 'f1' at row 1 -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn69; CREATE FUNCTION fn69( f1 numeric (63, 30) zerofill) returns numeric (63, 30) zerofill BEGIN @@ -17005,7 +16931,6 @@ fn69(-1e+36) 000000000000000000000000000000010.000000000000000000000000000000 Warnings: Warning 1264 Out of range value for column 'f1' at row 1 -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn70_n; CREATE FUNCTION fn70_n( f1 numeric (64)) returns numeric (64) BEGIN @@ -17054,8 +16979,6 @@ END// SELECT fn74(999999999); fn74(999999999) 1000000000 -Warnings: -Note 1265 Data truncated for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn75; CREATE FUNCTION fn75( f1 numeric unsigned zerofill) returns numeric unsigned zerofill BEGIN @@ -17065,8 +16988,6 @@ END// SELECT fn75(999999999); fn75(999999999) 1000000000 -Warnings: -Note 1265 Data truncated for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn76; CREATE FUNCTION fn76( f1 numeric zerofill) returns numeric zerofill BEGIN @@ -17078,7 +16999,6 @@ fn76(-999999999) 0000000010 Warnings: Warning 1264 Out of range value for column 'f1' at row 1 -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn77; CREATE FUNCTION fn77( f1 real) returns real BEGIN @@ -17097,8 +17017,6 @@ END// SELECT fn78(1.1); fn78(1.1) 10 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn79; CREATE FUNCTION fn79( f1 real unsigned zerofill) returns real unsigned zerofill BEGIN @@ -17108,8 +17026,6 @@ END// SELECT fn79(1.1); fn79(1.1) 10 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn80; CREATE FUNCTION fn80( f1 real zerofill) returns real zerofill BEGIN @@ -17119,8 +17035,6 @@ END// SELECT fn80(1.1); fn80(1.1) 10 -Warnings: -Warning 1264 Out of range value for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn81; CREATE FUNCTION fn81( f1 smallint) returns smallint BEGIN @@ -17253,8 +17167,6 @@ END// SELECT fn94( 'h'); fn94( 'h') a -Warnings: -Warning 1265 Data truncated for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn95; CREATE FUNCTION fn95( f1 char ascii) returns char ascii BEGIN @@ -17264,8 +17176,6 @@ END// SELECT fn95('h'); fn95('h') a -Warnings: -Warning 1265 Data truncated for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn96; CREATE FUNCTION fn96( f1 binary) returns binary(2) BEGIN @@ -17275,8 +17185,6 @@ END// SELECT fn96( 'h'); fn96( 'h') a -Warnings: -Warning 1265 Data truncated for column 'f1' at row 1 DROP FUNCTION IF EXISTS fn97; CREATE FUNCTION fn97( f1 longtext) returns longtext BEGIN