diff options
author | Sergei Golubchik <serg@mariadb.org> | 2015-09-03 12:58:41 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2015-09-03 12:58:41 +0200 |
commit | 530a6e74819ec14b5fdc42aa588b236ecb9f2fcd (patch) | |
tree | a4d45b1fd0e434c23577507364fa443226676eb5 /mysql-test | |
parent | 5088cbf4ed7224698678f3eaf406361c6e7db4b8 (diff) | |
parent | 4b41e3c7f33714186c97a6cc2e6d3bb93b050c61 (diff) | |
download | mariadb-git-530a6e74819ec14b5fdc42aa588b236ecb9f2fcd.tar.gz |
Merge branch '10.0' into 10.1
referenced_by_foreign_key2(), needed for InnoDB to compile,
was taken from 10.0-galera
Diffstat (limited to 'mysql-test')
181 files changed, 3621 insertions, 1489 deletions
diff --git a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test index 48e922d2e67..74fbe6b482a 100644 --- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test +++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test @@ -228,7 +228,7 @@ rollback; create table t0 (n int); insert t0 select * from t1; set autocommit=1; -insert into t0 select GET_LOCK("lock1",null); +insert into t0 select GET_LOCK("lock1",0); set autocommit=0; create table t2 (n int) engine=innodb; insert into t2 values (3); diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 841e1d98b70..549bbfa2c5c 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2579,15 +2579,18 @@ sub setup_vardir() { { $plugindir="$opt_vardir/plugins"; mkpath($plugindir); - if (IS_WINDOWS && !$opt_embedded_server) + if (IS_WINDOWS) { - for (<$bindir/storage/*$opt_vs_config/*.dll>, - <$bindir/plugin/*$opt_vs_config/*.dll>, - <$bindir/sql$opt_vs_config/*.dll>) + if (!$opt_embedded_server) { - my $pname=basename($_); - copy rel2abs($_), "$plugindir/$pname"; - set_plugin_var($pname); + for (<$bindir/storage/*$opt_vs_config/*.dll>, + <$bindir/plugin/*$opt_vs_config/*.dll>, + <$bindir/sql$opt_vs_config/*.dll>) + { + my $pname=basename($_); + copy rel2abs($_), "$plugindir/$pname"; + set_plugin_var($pname); + } } } else @@ -4430,6 +4433,7 @@ sub extract_warning_lines ($$) { qr|InnoDB: Setting thread \d+ nice to \d+ failed, current nice \d+, errno 13|, # setpriority() fails under valgrind qr|Failed to setup SSL|, qr|SSL error: Failed to set ciphers to use|, + qr/Plugin 'InnoDB' will be forced to shutdown/, ); my $matched_lines= []; diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result index 2d482aa3365..2c2275462cc 100644 --- a/mysql-test/r/alter_table.result +++ b/mysql-test/r/alter_table.result @@ -1782,8 +1782,8 @@ ALTER TABLE tm1 DROP INDEX im3; affected rows: 2 info: Records: 2 Duplicates: 0 Warnings: 0 ALTER TABLE ti1 DROP COLUMN d2; -affected rows: 2 -info: Records: 2 Duplicates: 0 Warnings: 0 +affected rows: 0 +info: Records: 0 Duplicates: 0 Warnings: 0 ALTER TABLE tm1 DROP COLUMN d2; affected rows: 2 info: Records: 2 Duplicates: 0 Warnings: 0 diff --git a/mysql-test/r/blackhole_plugin.result b/mysql-test/r/blackhole_plugin.result index 4ef9fa0fa47..dd1b95ab0d9 100644 --- a/mysql-test/r/blackhole_plugin.result +++ b/mysql-test/r/blackhole_plugin.result @@ -5,7 +5,7 @@ Warning 1266 Using storage engine MyISAM for table 't1' DROP TABLE t1; INSTALL PLUGIN blackhole SONAME 'ha_blackhole.so'; INSTALL PLUGIN BLACKHOLE SONAME 'ha_blackhole.so'; -ERROR HY000: Function 'BLACKHOLE' already exists +ERROR HY000: Plugin 'BLACKHOLE' already installed UNINSTALL PLUGIN blackhole; INSTALL PLUGIN blackhole SONAME 'ha_blackhole.so'; CREATE TABLE t1(a int) ENGINE=BLACKHOLE; diff --git a/mysql-test/r/create_drop_binlog.result b/mysql-test/r/create_drop_binlog.result index 4a6fa7a8d14..8f6b35a7c8c 100644 --- a/mysql-test/r/create_drop_binlog.result +++ b/mysql-test/r/create_drop_binlog.result @@ -187,11 +187,11 @@ DROP ROLE r1; CREATE ROLE IF NOT EXISTS r1; CREATE ROLE IF NOT EXISTS r1; Warnings: -Note 1974 Can't create role 'r1'; it already exists +Note 1975 Can't create role 'r1'; it already exists DROP ROLE IF EXISTS r1; DROP ROLE IF EXISTS r1; Warnings: -Note 1975 Can't drop role 'r1'; it doesn't exist +Note 1976 Can't drop role 'r1'; it doesn't exist SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info # # Format_desc 1 # VER @@ -218,11 +218,11 @@ DROP USER u1@localhost; CREATE USER IF NOT EXISTS u1@localhost; CREATE USER IF NOT EXISTS u1@localhost; Warnings: -Note 1972 Can't create user 'u1'@'localhost'; it already exists +Note 1973 Can't create user 'u1'@'localhost'; it already exists DROP USER IF EXISTS u1@localhost; DROP USER IF EXISTS u1@localhost; Warnings: -Note 1973 Can't drop user 'u1'@'localhost'; it doesn't exist +Note 1974 Can't drop user 'u1'@'localhost'; it doesn't exist SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info # # Format_desc 1 # VER diff --git a/mysql-test/r/create_drop_role.result b/mysql-test/r/create_drop_role.result index 7fc969cbe5a..6e05900264d 100644 --- a/mysql-test/r/create_drop_role.result +++ b/mysql-test/r/create_drop_role.result @@ -20,7 +20,7 @@ Host User Role Admin_option CREATE ROLE IF NOT EXISTS role1 WITH ADMIN user4; Warnings: Note 1449 The user specified as a definer ('user4'@'%') does not exist -Note 1974 Can't create role 'role1'; it already exists +Note 1975 Can't create role 'role1'; it already exists SELECT * FROM mysql.roles_mapping WHERE Role='role1'; Host User Role Admin_option % user3 role1 Y @@ -29,11 +29,11 @@ SELECT * FROM mysql.roles_mapping WHERE Role='role1'; Host User Role Admin_option DROP ROLE IF EXISTS role1; Warnings: -Note 1975 Can't drop role 'role1'; it doesn't exist +Note 1976 Can't drop role 'role1'; it doesn't exist CREATE ROLE role_1; CREATE ROLE IF NOT EXISTS role_1; Warnings: -Note 1974 Can't create role 'role_1'; it already exists +Note 1975 Can't create role 'role_1'; it already exists CREATE OR REPLACE ROLE role_1; CREATE OR REPLACE ROLE IF NOT EXISTS role_1; ERROR HY000: Incorrect usage of OR REPLACE and IF NOT EXISTS @@ -69,7 +69,7 @@ SET ROLE NONE; DROP ROLE role_1; DROP ROLE IF EXISTS role_1; Warnings: -Note 1975 Can't drop role 'role_1'; it doesn't exist +Note 1976 Can't drop role 'role_1'; it doesn't exist DROP ROLE role_1; ERROR HY000: Operation DROP ROLE failed for 'role_1' DROP USER u1@localhost; diff --git a/mysql-test/r/create_drop_user.result b/mysql-test/r/create_drop_user.result index 3c388545199..dd75d1c257a 100644 --- a/mysql-test/r/create_drop_user.result +++ b/mysql-test/r/create_drop_user.result @@ -4,7 +4,7 @@ password *2B602296A79E0A8784ACC5C88D92E46588CCA3C3 CREATE USER IF NOT EXISTS u1@localhost IDENTIFIED BY 'pw2'; Warnings: -Note 1972 Can't create user 'u1'@'localhost'; it already exists +Note 1973 Can't create user 'u1'@'localhost'; it already exists SELECT password FROM mysql.user WHERE user='u1'; password *2B602296A79E0A8784ACC5C88D92E46588CCA3C3 @@ -20,7 +20,7 @@ password DROP USER IF EXISTS u1@localhost; DROP USER IF EXISTS u1@localhost; Warnings: -Note 1973 Can't drop user 'u1'@'localhost'; it doesn't exist +Note 1974 Can't drop user 'u1'@'localhost'; it doesn't exist DROP USER u1@localhost; ERROR HY000: Operation DROP USER failed for 'u1'@'localhost' CREATE OR REPLACE USER u1@localhost; @@ -38,6 +38,6 @@ CREATE OR REPLACE USER u1 IDENTIFIED BY PASSWORD 'abcdefghijklmnop', u2; DROP USER u1; DROP USER IF EXISTS u1, u2; Warnings: -Note 1973 Can't drop user 'u1'@'%'; it doesn't exist +Note 1974 Can't drop user 'u1'@'%'; it doesn't exist DROP USER u2; ERROR HY000: Operation DROP USER failed for 'u2'@'%' diff --git a/mysql-test/r/ctype_big5.result b/mysql-test/r/ctype_big5.result index a5e52106926..f97d060d26a 100644 --- a/mysql-test/r/ctype_big5.result +++ b/mysql-test/r/ctype_big5.result @@ -512,7 +512,7 @@ select hex(convert(_big5 0xC84041 using ucs2)); hex(convert(_big5 0xC84041 using ucs2)) 003F0041 Warnings: -Warning 1976 Cannot convert 'big5' character 0xC840 to 'ucs2' +Warning 1977 Cannot convert 'big5' character 0xC840 to 'ucs2' End of 4.1 tests set names big5; create table t1 (a blob); @@ -789,70 +789,70 @@ A2C0 Ⅷ A2C1 Ⅸ A2C2 Ⅹ Warnings: -Warning 1976 Cannot convert 'big5' character 0xA3C0 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C0 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C1 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C1 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C2 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C2 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C3 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C3 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C4 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C4 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C5 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C5 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C6 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C6 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C7 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C7 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C8 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C8 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C9 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C9 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CA to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CA to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CB to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CB to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CC to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CC to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CD to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CD to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CE to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CE to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CF to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CF to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D0 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D0 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D1 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D1 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D2 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D2 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D3 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D3 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D4 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D4 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D5 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D5 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D6 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D6 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D7 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D7 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D8 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D8 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D9 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D9 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DA to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DA to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DB to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DB to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DC to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DC to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DD to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DD to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DE to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DE to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DF to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DF to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C0 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C0 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C1 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C1 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C2 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C2 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C3 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C3 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C4 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C4 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C5 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C5 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C6 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C6 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C7 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C7 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C8 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C8 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C9 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C9 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CA to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CA to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CB to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CB to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CC to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CC to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CD to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CD to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CE to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CE to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CF to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CF to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D0 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D0 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D1 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D1 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D2 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D2 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D3 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D3 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D4 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D4 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D5 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D5 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D6 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D6 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D7 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D7 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D8 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D8 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D9 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D9 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DA to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DA to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DB to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DB to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DC to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DC to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DD to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DD to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DE to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DE to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DF to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DF to 'utf8' SELECT * FROM t1 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <> HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code; @@ -868,70 +868,70 @@ C7D9 р C7DA с C7DB т Warnings: -Warning 1976 Cannot convert 'big5' character 0xA3C0 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C0 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C1 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C1 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C2 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C2 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C3 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C3 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C4 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C4 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C5 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C5 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C6 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C6 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C7 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C7 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C8 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C8 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C9 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3C9 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CA to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CA to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CB to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CB to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CC to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CC to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CD to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CD to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CE to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CE to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CF to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3CF to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D0 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D0 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D1 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D1 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D2 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D2 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D3 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D3 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D4 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D4 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D5 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D5 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D6 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D6 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D7 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D7 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D8 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D8 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D9 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3D9 to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DA to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DA to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DB to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DB to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DC to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DC to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DD to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DD to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DE to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DE to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DF to 'utf8' -Warning 1976 Cannot convert 'big5' character 0xA3DF to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C0 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C0 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C1 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C1 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C2 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C2 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C3 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C3 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C4 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C4 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C5 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C5 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C6 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C6 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C7 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C7 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C8 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C8 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C9 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3C9 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CA to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CA to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CB to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CB to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CC to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CC to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CD to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CD to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CE to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CE to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CF to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3CF to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D0 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D0 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D1 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D1 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D2 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D2 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D3 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D3 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D4 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D4 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D5 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D5 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D6 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D6 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D7 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D7 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D8 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D8 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D9 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3D9 to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DA to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DA to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DB to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DB to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DC to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DC to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DD to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DD to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DE to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DE to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DF to 'utf8' +Warning 1977 Cannot convert 'big5' character 0xA3DF to 'utf8' DROP TABLE t1; # # End of 5.5 tests diff --git a/mysql-test/r/ctype_cp1251.result b/mysql-test/r/ctype_cp1251.result index 9d6185a9420..92678f200bd 100644 --- a/mysql-test/r/ctype_cp1251.result +++ b/mysql-test/r/ctype_cp1251.result @@ -386,7 +386,7 @@ FD FD FD D18D FD FE FE FE D18E FE FF FF FF D18F FF Warnings: -Warning 1976 Cannot convert 'cp1251' character 0x98 to 'utf8' +Warning 1977 Cannot convert 'cp1251' character 0x98 to 'utf8' DROP TABLE t1; set global LC_TIME_NAMES=convert((-8388608) using cp1251); ERROR HY000: Unknown locale: '-8388608' diff --git a/mysql-test/r/ctype_cp932_binlog_stm.result b/mysql-test/r/ctype_cp932_binlog_stm.result index 3916f427920..75d05aa9f0a 100644 --- a/mysql-test/r/ctype_cp932_binlog_stm.result +++ b/mysql-test/r/ctype_cp932_binlog_stm.result @@ -387,139 +387,139 @@ HEX(LOWER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code; code a 81F0 Å Warnings: -Warning 1976 Cannot convert 'cp932' character 0x81AD to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81AD to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81AE to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81AE to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81AF to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81AF to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B0 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B0 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B1 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B1 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B2 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B2 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B3 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B3 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B4 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B4 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B5 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B5 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B6 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B6 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B7 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B7 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C0 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C0 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C1 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C1 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C2 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C2 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C3 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C3 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C4 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C4 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C5 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C5 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C6 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C6 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C7 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C7 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81CF to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81CF to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D0 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D0 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D1 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D1 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D2 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D2 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D3 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D3 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D4 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D4 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D5 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D5 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D6 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D6 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D7 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D7 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D8 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D8 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D9 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D9 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81E9 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81E9 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81EA to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81EA to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81AD to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81AD to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81AE to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81AE to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81AF to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81AF to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B0 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B0 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B1 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B1 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B2 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B2 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B3 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B3 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B4 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B4 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B5 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B5 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B6 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B6 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B7 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B7 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C0 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C0 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C1 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C1 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C2 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C2 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C3 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C3 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C4 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C4 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C5 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C5 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C6 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C6 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C7 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C7 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81CF to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81CF to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D0 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D0 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D1 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D1 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D2 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D2 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D3 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D3 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D4 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D4 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D5 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D5 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D6 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D6 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D7 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D7 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D8 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D8 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D9 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D9 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81E9 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81E9 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81EA to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81EA to 'utf8' SELECT * FROM t1 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <> HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code; code a Warnings: -Warning 1976 Cannot convert 'cp932' character 0x81AD to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81AD to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81AE to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81AE to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81AF to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81AF to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B0 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B0 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B1 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B1 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B2 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B2 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B3 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B3 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B4 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B4 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B5 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B5 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B6 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B6 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B7 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B7 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C0 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C0 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C1 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C1 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C2 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C2 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C3 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C3 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C4 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C4 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C5 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C5 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C6 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C6 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C7 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C7 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81CF to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81CF to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D0 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D0 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D1 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D1 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D2 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D2 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D3 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D3 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D4 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D4 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D5 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D5 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D6 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D6 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D7 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D7 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D8 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D8 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D9 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D9 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81E9 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81E9 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81EA to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81EA to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81AD to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81AD to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81AE to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81AE to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81AF to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81AF to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B0 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B0 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B1 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B1 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B2 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B2 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B3 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B3 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B4 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B4 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B5 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B5 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B6 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B6 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B7 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B7 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C0 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C0 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C1 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C1 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C2 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C2 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C3 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C3 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C4 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C4 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C5 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C5 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C6 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C6 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C7 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C7 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81CF to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81CF to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D0 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D0 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D1 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D1 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D2 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D2 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D3 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D3 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D4 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D4 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D5 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D5 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D6 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D6 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D7 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D7 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D8 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D8 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D9 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D9 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81E9 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81E9 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81EA to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81EA to 'utf8' # # WL#3090 Japanese Character Set adjustments # Test cp932->Unicode conversion @@ -10195,70 +10195,70 @@ FC49 EFA8AD FC4A E9B899 FC4B E9BB91 Warnings: -Warning 1976 Cannot convert 'cp932' character 0x81AD to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81AE to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81AF to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B0 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B1 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B2 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B3 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B4 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B5 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B6 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81B7 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C0 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C1 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C2 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C3 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C4 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C5 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C6 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81C7 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81CF to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D0 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D1 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D2 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D3 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D4 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D5 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D6 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D7 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D8 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81D9 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81E9 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81EA to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81EB to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81EC to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81ED to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81EE to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81EF to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81F8 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81F9 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81FA to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x81FB to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x8240 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x8241 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x8242 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x8243 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x8244 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x8245 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x8246 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x8247 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x8248 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x8249 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x824A to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x824B to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x824C to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x824D to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x824E to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x8259 to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x825A to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x825B to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x825C to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x825D to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x825E to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x825F to 'utf8' -Warning 1976 Cannot convert 'cp932' character 0x827A to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81AD to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81AE to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81AF to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B0 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B1 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B2 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B3 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B4 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B5 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B6 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81B7 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C0 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C1 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C2 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C3 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C4 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C5 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C6 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81C7 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81CF to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D0 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D1 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D2 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D3 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D4 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D5 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D6 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D7 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D8 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81D9 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81E9 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81EA to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81EB to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81EC to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81ED to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81EE to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81EF to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81F8 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81F9 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81FA to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x81FB to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x8240 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x8241 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x8242 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x8243 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x8244 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x8245 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x8246 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x8247 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x8248 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x8249 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x824A to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x824B to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x824C to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x824D to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x824E to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x8259 to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x825A to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x825B to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x825C to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x825D to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x825E to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x825F to 'utf8' +Warning 1977 Cannot convert 'cp932' character 0x827A to 'utf8' DROP TABLE t1; # # WL#3090 Japanese Character Set adjustments diff --git a/mysql-test/r/ctype_eucjpms.result b/mysql-test/r/ctype_eucjpms.result index f791ef67671..f9cb4f1eecc 100644 --- a/mysql-test/r/ctype_eucjpms.result +++ b/mysql-test/r/ctype_eucjpms.result @@ -10017,12 +10017,12 @@ select hex(convert(_eucjpms 0xA5FE41 using ucs2)); hex(convert(_eucjpms 0xA5FE41 using ucs2)) 003F0041 Warnings: -Warning 1976 Cannot convert 'eucjpms' character 0xA5FE to 'ucs2' +Warning 1977 Cannot convert 'eucjpms' character 0xA5FE to 'ucs2' select hex(convert(_eucjpms 0x8FABF841 using ucs2)); hex(convert(_eucjpms 0x8FABF841 using ucs2)) 003F0041 Warnings: -Warning 1976 Cannot convert 'eucjpms' character 0x8FABF8 to 'ucs2' +Warning 1977 Cannot convert 'eucjpms' character 0x8FABF8 to 'ucs2' set global LC_TIME_NAMES=convert((convert((0x63) using eucjpms)) using utf8); ERROR HY000: Unknown locale: 'c' # @@ -10589,70 +10589,70 @@ HEX(LOWER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code; code a 8FAABC Ģ Warnings: -Warning 1976 Cannot convert 'eucjpms' character 0xA2AF to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2AF to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B0 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B0 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B1 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B1 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B2 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B2 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B3 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B3 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B4 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B4 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B5 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B5 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B6 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B6 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B7 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B7 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B8 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B8 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B9 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B9 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C2 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C2 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C3 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C3 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C4 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C4 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C5 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C5 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C6 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C6 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C7 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C7 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C8 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C8 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C9 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C9 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D1 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D1 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D2 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D2 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D3 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D3 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D4 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D4 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D5 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D5 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D6 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D6 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D7 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D7 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D8 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D8 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D9 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D9 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2DA to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2DA to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2DB to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2DB to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2EB to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2EB to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2EC to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2EC to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2AF to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2AF to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B0 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B0 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B1 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B1 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B2 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B2 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B3 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B3 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B4 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B4 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B5 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B5 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B6 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B6 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B7 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B7 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B8 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B8 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B9 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B9 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C2 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C2 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C3 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C3 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C4 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C4 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C5 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C5 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C6 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C6 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C7 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C7 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C8 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C8 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C9 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C9 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D1 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D1 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D2 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D2 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D3 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D3 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D4 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D4 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D5 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D5 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D6 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D6 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D7 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D7 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D8 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D8 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D9 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D9 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2DA to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2DA to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2DB to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2DB to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2EB to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2EB to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2EC to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2EC to 'utf8' SELECT * FROM t1 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <> HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code; @@ -10660,70 +10660,70 @@ code a 8FA9C3 ð 8FABB9 ǵ Warnings: -Warning 1976 Cannot convert 'eucjpms' character 0xA2AF to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2AF to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B0 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B0 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B1 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B1 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B2 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B2 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B3 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B3 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B4 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B4 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B5 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B5 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B6 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B6 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B7 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B7 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B8 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B8 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B9 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B9 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C2 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C2 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C3 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C3 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C4 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C4 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C5 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C5 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C6 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C6 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C7 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C7 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C8 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C8 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C9 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C9 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D1 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D1 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D2 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D2 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D3 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D3 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D4 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D4 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D5 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D5 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D6 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D6 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D7 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D7 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D8 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D8 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D9 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D9 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2DA to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2DA to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2DB to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2DB to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2EB to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2EB to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2EC to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2EC to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2AF to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2AF to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B0 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B0 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B1 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B1 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B2 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B2 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B3 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B3 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B4 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B4 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B5 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B5 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B6 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B6 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B7 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B7 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B8 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B8 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B9 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B9 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C2 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C2 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C3 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C3 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C4 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C4 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C5 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C5 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C6 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C6 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C7 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C7 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C8 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C8 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C9 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C9 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D1 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D1 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D2 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D2 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D3 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D3 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D4 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D4 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D5 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D5 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D6 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D6 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D7 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D7 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D8 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D8 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D9 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D9 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2DA to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2DA to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2DB to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2DB to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2EB to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2EB to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2EC to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2EC to 'utf8' # # WL#3090 Japanese Character Set adjustments # Test sjis->Unicode conversion @@ -25810,70 +25810,70 @@ FEFC EE8EA9 FEFD EE8EAA FEFE EE8EAB Warnings: -Warning 1976 Cannot convert 'eucjpms' character 0xA2AF to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B0 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B1 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B2 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B3 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B4 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B5 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B6 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B7 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B8 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2B9 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C2 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C3 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C4 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C5 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C6 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C7 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C8 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2C9 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D1 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D2 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D3 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D4 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D5 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D6 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D7 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D8 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2D9 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2DA to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2DB to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2EB to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2EC to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2ED to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2EE to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2EF to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2F0 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2F1 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2FA to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2FB to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2FC to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA2FD to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3A1 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3A2 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3A3 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3A4 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3A5 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3A6 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3A7 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3A8 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3A9 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3AA to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3AB to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3AC to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3AD to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3AE to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3AF to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3BA to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3BB to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3BC to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3BD to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3BE to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3BF to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3C0 to 'utf8' -Warning 1976 Cannot convert 'eucjpms' character 0xA3DB to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2AF to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B0 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B1 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B2 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B3 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B4 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B5 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B6 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B7 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B8 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2B9 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C2 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C3 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C4 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C5 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C6 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C7 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C8 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2C9 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D1 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D2 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D3 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D4 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D5 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D6 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D7 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D8 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2D9 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2DA to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2DB to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2EB to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2EC to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2ED to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2EE to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2EF to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2F0 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2F1 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2FA to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2FB to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2FC to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA2FD to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3A1 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3A2 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3A3 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3A4 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3A5 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3A6 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3A7 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3A8 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3A9 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3AA to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3AB to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3AC to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3AD to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3AE to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3AF to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3BA to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3BB to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3BC to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3BD to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3BE to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3BF to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3C0 to 'utf8' +Warning 1977 Cannot convert 'eucjpms' character 0xA3DB to 'utf8' DROP TABLE t1; # # WL#3090 Japanese Character Set adjustments diff --git a/mysql-test/r/ctype_euckr.result b/mysql-test/r/ctype_euckr.result index 847ce5a7e46..90353c6af2a 100644 --- a/mysql-test/r/ctype_euckr.result +++ b/mysql-test/r/ctype_euckr.result @@ -24737,70 +24737,70 @@ HEX(LOWER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code; code a A1CA Å Warnings: -Warning 1976 Cannot convert 'euckr' character 0xA2E8 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2E8 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2E9 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2E9 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2EA to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2EA to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2EB to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2EB to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2EC to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2EC to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2ED to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2ED to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2EE to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2EE to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2EF to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2EF to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F0 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F0 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F1 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F1 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F2 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F2 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F3 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F3 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F4 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F4 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F5 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F5 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F6 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F6 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F7 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F7 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F8 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F8 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F9 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F9 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2FA to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2FA to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2FB to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2FB to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2FC to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2FC to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2FD to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2FD to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2FE to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2FE to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5AB to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5AB to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5AC to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5AC to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5AD to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5AD to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5AE to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5AE to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5AF to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5AF to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5BA to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5BA to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5BB to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5BB to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5BC to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5BC to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5BD to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5BD to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2E8 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2E8 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2E9 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2E9 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2EA to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2EA to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2EB to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2EB to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2EC to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2EC to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2ED to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2ED to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2EE to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2EE to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2EF to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2EF to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F0 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F0 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F1 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F1 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F2 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F2 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F3 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F3 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F4 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F4 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F5 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F5 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F6 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F6 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F7 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F7 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F8 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F8 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F9 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F9 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2FA to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2FA to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2FB to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2FB to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2FC to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2FC to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2FD to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2FD to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2FE to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2FE to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5AB to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5AB to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5AC to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5AC to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5AD to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5AD to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5AE to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5AE to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5AF to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5AF to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5BA to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5BA to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5BB to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5BB to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5BC to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5BC to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5BD to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5BD to 'utf8' SELECT * FROM t1 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <> HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code; @@ -24833,70 +24833,70 @@ A8E5 ⓨ A8E6 ⓩ A9A2 đ Warnings: -Warning 1976 Cannot convert 'euckr' character 0xA2E8 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2E8 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2E9 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2E9 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2EA to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2EA to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2EB to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2EB to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2EC to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2EC to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2ED to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2ED to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2EE to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2EE to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2EF to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2EF to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F0 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F0 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F1 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F1 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F2 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F2 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F3 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F3 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F4 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F4 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F5 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F5 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F6 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F6 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F7 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F7 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F8 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F8 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F9 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2F9 to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2FA to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2FA to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2FB to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2FB to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2FC to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2FC to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2FD to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2FD to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2FE to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA2FE to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5AB to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5AB to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5AC to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5AC to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5AD to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5AD to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5AE to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5AE to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5AF to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5AF to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5BA to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5BA to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5BB to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5BB to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5BC to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5BC to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5BD to 'utf8' -Warning 1976 Cannot convert 'euckr' character 0xA5BD to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2E8 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2E8 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2E9 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2E9 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2EA to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2EA to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2EB to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2EB to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2EC to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2EC to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2ED to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2ED to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2EE to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2EE to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2EF to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2EF to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F0 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F0 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F1 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F1 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F2 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F2 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F3 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F3 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F4 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F4 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F5 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F5 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F6 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F6 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F7 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F7 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F8 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F8 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F9 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2F9 to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2FA to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2FA to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2FB to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2FB to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2FC to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2FC to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2FD to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2FD to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2FE to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA2FE to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5AB to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5AB to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5AC to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5AC to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5AD to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5AD to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5AE to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5AE to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5AF to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5AF to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5BA to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5BA to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5BB to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5BB to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5BC to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5BC to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5BD to 'utf8' +Warning 1977 Cannot convert 'euckr' character 0xA5BD to 'utf8' DROP TABLE t1; # # End of 5.5 tests diff --git a/mysql-test/r/ctype_gb2312.result b/mysql-test/r/ctype_gb2312.result index 656d3e357d0..f9f37c00a79 100644 --- a/mysql-test/r/ctype_gb2312.result +++ b/mysql-test/r/ctype_gb2312.result @@ -765,70 +765,70 @@ A2FA Ⅹ A2FB Ⅺ A2FC Ⅻ Warnings: -Warning 1976 Cannot convert 'gb2312' character 0xA2A1 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A1 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A2 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A2 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A3 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A3 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A4 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A4 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A5 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A5 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A6 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A6 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A7 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A7 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A8 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A8 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A9 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A9 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AA to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AA to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AB to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AB to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AC to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AC to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AD to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AD to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AE to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AE to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AF to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AF to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2B0 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2B0 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2E3 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2E3 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2E4 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2E4 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2EF to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2EF to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2F0 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2F0 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2FD to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2FD to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2FE to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2FE to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F4 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F4 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F5 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F5 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F6 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F6 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F7 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F7 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F8 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F8 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F9 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F9 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4FA to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4FA to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4FB to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4FB to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4FC to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4FC to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4FD to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4FD to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A1 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A1 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A2 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A2 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A3 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A3 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A4 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A4 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A5 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A5 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A6 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A6 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A7 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A7 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A8 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A8 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A9 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A9 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AA to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AA to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AB to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AB to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AC to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AC to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AD to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AD to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AE to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AE to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AF to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AF to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2B0 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2B0 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2E3 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2E3 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2E4 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2E4 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2EF to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2EF to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2F0 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2F0 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2FD to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2FD to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2FE to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2FE to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F4 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F4 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F5 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F5 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F6 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F6 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F7 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F7 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F8 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F8 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F9 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F9 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4FA to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4FA to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4FB to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4FB to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4FC to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4FC to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4FD to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4FD to 'utf8' SELECT * FROM t1 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <> HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code; @@ -860,70 +860,70 @@ A8B8 ǜ A8B9 ü A8BA ê Warnings: -Warning 1976 Cannot convert 'gb2312' character 0xA2A1 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A1 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A2 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A2 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A3 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A3 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A4 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A4 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A5 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A5 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A6 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A6 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A7 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A7 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A8 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A8 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A9 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2A9 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AA to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AA to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AB to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AB to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AC to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AC to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AD to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AD to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AE to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AE to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AF to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2AF to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2B0 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2B0 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2E3 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2E3 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2E4 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2E4 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2EF to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2EF to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2F0 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2F0 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2FD to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2FD to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2FE to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA2FE to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F4 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F4 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F5 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F5 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F6 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F6 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F7 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F7 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F8 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F8 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F9 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4F9 to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4FA to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4FA to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4FB to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4FB to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4FC to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4FC to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4FD to 'utf8' -Warning 1976 Cannot convert 'gb2312' character 0xA4FD to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A1 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A1 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A2 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A2 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A3 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A3 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A4 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A4 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A5 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A5 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A6 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A6 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A7 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A7 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A8 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A8 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A9 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2A9 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AA to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AA to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AB to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AB to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AC to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AC to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AD to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AD to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AE to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AE to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AF to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2AF to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2B0 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2B0 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2E3 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2E3 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2E4 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2E4 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2EF to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2EF to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2F0 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2F0 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2FD to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2FD to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2FE to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA2FE to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F4 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F4 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F5 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F5 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F6 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F6 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F7 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F7 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F8 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F8 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F9 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4F9 to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4FA to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4FA to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4FB to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4FB to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4FC to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4FC to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4FD to 'utf8' +Warning 1977 Cannot convert 'gb2312' character 0xA4FD to 'utf8' DROP TABLE t1; # # End of 5.5 tests diff --git a/mysql-test/r/ctype_gbk.result b/mysql-test/r/ctype_gbk.result index e0c9d60c059..b5774548d85 100644 --- a/mysql-test/r/ctype_gbk.result +++ b/mysql-test/r/ctype_gbk.result @@ -489,7 +489,7 @@ select hex(convert(_gbk 0xA14041 using ucs2)); hex(convert(_gbk 0xA14041 using ucs2)) 003F0041 Warnings: -Warning 1976 Cannot convert 'gbk' character 0xA140 to 'ucs2' +Warning 1977 Cannot convert 'gbk' character 0xA140 to 'ucs2' create table t1 (c1 text not null, c2 text not null) character set gbk; alter table t1 change c1 c1 mediumtext character set gbk not null; show create table t1; @@ -797,70 +797,70 @@ code a A2FB Ⅺ A2FC Ⅻ Warnings: -Warning 1976 Cannot convert 'gbk' character 0xA140 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA140 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA141 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA141 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA142 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA142 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA143 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA143 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA144 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA144 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA145 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA145 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA146 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA146 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA147 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA147 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA148 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA148 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA149 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA149 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14A to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14A to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14B to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14B to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14C to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14C to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14D to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14D to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14E to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14E to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14F to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14F to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA150 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA150 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA151 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA151 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA152 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA152 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA153 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA153 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA154 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA154 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA155 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA155 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA156 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA156 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA157 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA157 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA158 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA158 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA159 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA159 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15A to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15A to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15B to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15B to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15C to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15C to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15D to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15D to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15E to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15E to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15F to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15F to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA140 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA140 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA141 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA141 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA142 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA142 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA143 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA143 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA144 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA144 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA145 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA145 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA146 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA146 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA147 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA147 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA148 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA148 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA149 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA149 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14A to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14A to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14B to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14B to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14C to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14C to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14D to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14D to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14E to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14E to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14F to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14F to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA150 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA150 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA151 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA151 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA152 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA152 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA153 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA153 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA154 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA154 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA155 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA155 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA156 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA156 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA157 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA157 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA158 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA158 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA159 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA159 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15A to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15A to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15B to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15B to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15C to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15C to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15D to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15D to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15E to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15E to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15F to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15F to 'utf8' SELECT * FROM t1 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <> HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code; @@ -894,70 +894,70 @@ A8BA ê A8BD ń A8BE ň Warnings: -Warning 1976 Cannot convert 'gbk' character 0xA140 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA140 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA141 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA141 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA142 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA142 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA143 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA143 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA144 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA144 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA145 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA145 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA146 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA146 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA147 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA147 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA148 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA148 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA149 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA149 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14A to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14A to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14B to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14B to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14C to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14C to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14D to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14D to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14E to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14E to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14F to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA14F to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA150 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA150 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA151 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA151 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA152 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA152 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA153 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA153 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA154 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA154 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA155 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA155 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA156 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA156 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA157 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA157 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA158 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA158 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA159 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA159 to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15A to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15A to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15B to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15B to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15C to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15C to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15D to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15D to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15E to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15E to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15F to 'utf8' -Warning 1976 Cannot convert 'gbk' character 0xA15F to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA140 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA140 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA141 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA141 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA142 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA142 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA143 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA143 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA144 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA144 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA145 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA145 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA146 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA146 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA147 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA147 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA148 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA148 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA149 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA149 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14A to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14A to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14B to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14B to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14C to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14C to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14D to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14D to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14E to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14E to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14F to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA14F to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA150 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA150 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA151 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA151 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA152 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA152 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA153 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA153 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA154 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA154 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA155 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA155 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA156 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA156 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA157 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA157 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA158 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA158 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA159 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA159 to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15A to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15A to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15B to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15B to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15C to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15C to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15D to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15D to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15E to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15E to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15F to 'utf8' +Warning 1977 Cannot convert 'gbk' character 0xA15F to 'utf8' DROP TABLE t1; # # End of 5.5 tests diff --git a/mysql-test/r/ctype_sjis.result b/mysql-test/r/ctype_sjis.result index cde7493789a..46686933298 100644 --- a/mysql-test/r/ctype_sjis.result +++ b/mysql-test/r/ctype_sjis.result @@ -686,139 +686,139 @@ HEX(LOWER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code; code a 81F0 Å Warnings: -Warning 1976 Cannot convert 'sjis' character 0x81AD to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81AD to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81AE to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81AE to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81AF to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81AF to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B0 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B0 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B1 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B1 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B2 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B2 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B3 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B3 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B4 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B4 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B5 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B5 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B6 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B6 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B7 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B7 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C0 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C0 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C1 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C1 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C2 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C2 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C3 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C3 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C4 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C4 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C5 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C5 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C6 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C6 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C7 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C7 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81CF to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81CF to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D0 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D0 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D1 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D1 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D2 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D2 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D3 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D3 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D4 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D4 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D5 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D5 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D6 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D6 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D7 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D7 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D8 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D8 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D9 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D9 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81E9 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81E9 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81EA to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81EA to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81AD to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81AD to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81AE to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81AE to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81AF to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81AF to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B0 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B0 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B1 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B1 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B2 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B2 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B3 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B3 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B4 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B4 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B5 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B5 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B6 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B6 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B7 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B7 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C0 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C0 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C1 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C1 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C2 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C2 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C3 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C3 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C4 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C4 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C5 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C5 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C6 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C6 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C7 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C7 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81CF to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81CF to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D0 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D0 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D1 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D1 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D2 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D2 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D3 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D3 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D4 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D4 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D5 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D5 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D6 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D6 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D7 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D7 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D8 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D8 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D9 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D9 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81E9 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81E9 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81EA to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81EA to 'utf8' SELECT * FROM t1 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <> HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code; code a Warnings: -Warning 1976 Cannot convert 'sjis' character 0x81AD to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81AD to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81AE to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81AE to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81AF to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81AF to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B0 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B0 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B1 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B1 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B2 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B2 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B3 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B3 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B4 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B4 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B5 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B5 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B6 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B6 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B7 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B7 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C0 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C0 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C1 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C1 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C2 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C2 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C3 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C3 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C4 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C4 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C5 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C5 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C6 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C6 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C7 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C7 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81CF to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81CF to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D0 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D0 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D1 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D1 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D2 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D2 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D3 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D3 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D4 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D4 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D5 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D5 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D6 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D6 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D7 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D7 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D8 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D8 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D9 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D9 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81E9 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81E9 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81EA to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81EA to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81AD to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81AD to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81AE to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81AE to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81AF to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81AF to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B0 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B0 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B1 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B1 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B2 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B2 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B3 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B3 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B4 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B4 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B5 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B5 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B6 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B6 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B7 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B7 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C0 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C0 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C1 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C1 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C2 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C2 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C3 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C3 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C4 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C4 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C5 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C5 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C6 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C6 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C7 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C7 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81CF to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81CF to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D0 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D0 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D1 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D1 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D2 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D2 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D3 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D3 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D4 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D4 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D5 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D5 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D6 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D6 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D7 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D7 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D8 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D8 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D9 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D9 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81E9 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81E9 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81EA to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81EA to 'utf8' # # WL#3090 Japanese Character Set adjustments # Test sjis->Unicode conversion @@ -7769,70 +7769,70 @@ EAA2 E791A4 EAA3 E5879C EAA4 E78699 Warnings: -Warning 1976 Cannot convert 'sjis' character 0x81AD to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81AE to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81AF to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B0 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B1 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B2 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B3 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B4 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B5 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B6 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81B7 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C0 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C1 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C2 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C3 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C4 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C5 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C6 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81C7 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81CF to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D0 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D1 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D2 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D3 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D4 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D5 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D6 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D7 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D8 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81D9 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81E9 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81EA to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81EB to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81EC to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81ED to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81EE to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81EF to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81F8 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81F9 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81FA to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x81FB to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x8240 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x8241 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x8242 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x8243 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x8244 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x8245 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x8246 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x8247 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x8248 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x8249 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x824A to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x824B to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x824C to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x824D to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x824E to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x8259 to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x825A to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x825B to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x825C to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x825D to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x825E to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x825F to 'utf8' -Warning 1976 Cannot convert 'sjis' character 0x827A to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81AD to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81AE to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81AF to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B0 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B1 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B2 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B3 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B4 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B5 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B6 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81B7 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C0 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C1 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C2 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C3 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C4 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C5 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C6 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81C7 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81CF to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D0 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D1 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D2 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D3 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D4 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D5 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D6 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D7 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D8 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81D9 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81E9 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81EA to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81EB to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81EC to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81ED to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81EE to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81EF to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81F8 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81F9 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81FA to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x81FB to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x8240 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x8241 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x8242 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x8243 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x8244 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x8245 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x8246 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x8247 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x8248 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x8249 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x824A to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x824B to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x824C to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x824D to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x824E to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x8259 to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x825A to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x825B to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x825C to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x825D to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x825E to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x825F to 'utf8' +Warning 1977 Cannot convert 'sjis' character 0x827A to 'utf8' DROP TABLE t1; # # WL#3090 Japanese Character Set adjustments diff --git a/mysql-test/r/ctype_ujis.result b/mysql-test/r/ctype_ujis.result index d70f0d59f12..4deabb7513f 100644 --- a/mysql-test/r/ctype_ujis.result +++ b/mysql-test/r/ctype_ujis.result @@ -2505,12 +2505,12 @@ select hex(convert(_ujis 0xA5FE41 using ucs2)); hex(convert(_ujis 0xA5FE41 using ucs2)) 003F0041 Warnings: -Warning 1976 Cannot convert 'ujis' character 0xA5FE to 'ucs2' +Warning 1977 Cannot convert 'ujis' character 0xA5FE to 'ucs2' select hex(convert(_ujis 0x8FABF841 using ucs2)); hex(convert(_ujis 0x8FABF841 using ucs2)) 003F0041 Warnings: -Warning 1976 Cannot convert 'ujis' character 0x8FABF8 to 'ucs2' +Warning 1977 Cannot convert 'ujis' character 0x8FABF8 to 'ucs2' DROP TABLE IF EXISTS t1, t2; DROP PROCEDURE IF EXISTS sp1; set names ujis; @@ -3081,70 +3081,70 @@ HEX(LOWER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code; code a 8FAABC Ģ Warnings: -Warning 1976 Cannot convert 'ujis' character 0xA2AF to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2AF to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B0 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B0 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B1 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B1 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B2 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B2 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B3 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B3 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B4 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B4 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B5 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B5 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B6 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B6 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B7 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B7 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B8 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B8 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B9 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B9 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C2 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C2 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C3 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C3 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C4 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C4 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C5 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C5 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C6 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C6 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C7 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C7 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C8 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C8 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C9 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C9 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D1 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D1 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D2 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D2 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D3 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D3 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D4 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D4 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D5 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D5 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D6 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D6 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D7 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D7 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D8 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D8 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D9 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D9 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2DA to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2DA to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2DB to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2DB to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2EB to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2EB to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2EC to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2EC to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2AF to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2AF to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B0 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B0 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B1 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B1 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B2 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B2 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B3 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B3 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B4 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B4 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B5 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B5 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B6 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B6 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B7 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B7 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B8 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B8 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B9 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B9 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C2 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C2 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C3 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C3 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C4 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C4 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C5 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C5 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C6 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C6 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C7 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C7 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C8 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C8 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C9 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C9 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D1 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D1 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D2 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D2 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D3 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D3 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D4 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D4 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D5 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D5 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D6 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D6 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D7 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D7 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D8 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D8 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D9 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D9 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2DA to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2DA to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2DB to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2DB to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2EB to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2EB to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2EC to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2EC to 'utf8' SELECT * FROM t1 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <> HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code; @@ -3152,70 +3152,70 @@ code a 8FA9C3 ð 8FABB9 ǵ Warnings: -Warning 1976 Cannot convert 'ujis' character 0xA2AF to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2AF to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B0 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B0 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B1 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B1 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B2 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B2 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B3 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B3 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B4 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B4 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B5 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B5 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B6 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B6 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B7 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B7 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B8 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B8 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B9 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B9 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C2 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C2 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C3 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C3 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C4 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C4 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C5 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C5 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C6 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C6 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C7 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C7 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C8 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C8 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C9 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C9 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D1 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D1 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D2 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D2 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D3 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D3 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D4 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D4 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D5 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D5 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D6 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D6 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D7 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D7 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D8 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D8 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D9 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D9 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2DA to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2DA to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2DB to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2DB to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2EB to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2EB to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2EC to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2EC to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2AF to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2AF to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B0 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B0 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B1 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B1 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B2 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B2 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B3 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B3 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B4 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B4 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B5 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B5 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B6 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B6 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B7 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B7 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B8 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B8 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B9 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B9 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C2 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C2 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C3 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C3 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C4 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C4 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C5 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C5 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C6 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C6 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C7 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C7 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C8 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C8 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C9 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C9 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D1 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D1 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D2 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D2 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D3 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D3 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D4 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D4 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D5 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D5 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D6 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D6 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D7 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D7 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D8 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D8 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D9 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D9 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2DA to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2DA to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2DB to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2DB to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2EB to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2EB to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2EC to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2EC to 'utf8' # # WL#3090 Japanese Character Set adjustments # Test sjis->Unicode conversion @@ -18113,70 +18113,70 @@ FEFC EE8EA9 FEFD EE8EAA FEFE EE8EAB Warnings: -Warning 1976 Cannot convert 'ujis' character 0xA2AF to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B0 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B1 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B2 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B3 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B4 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B5 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B6 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B7 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B8 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2B9 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C2 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C3 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C4 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C5 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C6 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C7 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C8 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2C9 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D1 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D2 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D3 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D4 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D5 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D6 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D7 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D8 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2D9 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2DA to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2DB to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2EB to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2EC to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2ED to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2EE to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2EF to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2F0 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2F1 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2FA to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2FB to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2FC to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA2FD to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3A1 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3A2 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3A3 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3A4 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3A5 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3A6 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3A7 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3A8 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3A9 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3AA to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3AB to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3AC to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3AD to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3AE to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3AF to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3BA to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3BB to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3BC to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3BD to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3BE to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3BF to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3C0 to 'utf8' -Warning 1976 Cannot convert 'ujis' character 0xA3DB to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2AF to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B0 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B1 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B2 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B3 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B4 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B5 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B6 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B7 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B8 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2B9 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C2 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C3 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C4 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C5 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C6 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C7 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C8 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2C9 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D1 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D2 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D3 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D4 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D5 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D6 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D7 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D8 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2D9 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2DA to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2DB to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2EB to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2EC to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2ED to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2EE to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2EF to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2F0 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2F1 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2FA to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2FB to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2FC to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA2FD to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3A1 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3A2 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3A3 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3A4 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3A5 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3A6 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3A7 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3A8 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3A9 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3AA to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3AB to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3AC to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3AD to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3AE to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3AF to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3BA to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3BB to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3BC to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3BD to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3BE to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3BF to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3C0 to 'utf8' +Warning 1977 Cannot convert 'ujis' character 0xA3DB to 'utf8' DROP TABLE t1; # # WL#3090 Japanese Character Set adjustments diff --git a/mysql-test/r/derived.result b/mysql-test/r/derived.result index b34415a7822..bb1e4d51dd6 100644 --- a/mysql-test/r/derived.result +++ b/mysql-test/r/derived.result @@ -566,7 +566,31 @@ insert into t1 (accountId,balance) values update t1 set balance=(select sum(balance) from (SELECT balance FROM t1 where accountId like 'dealer%') AS copied) where accountId = 'OPERATOR'; set optimizer_switch=@save_derived_optimizer_switch_bug; drop table t1; -set optimizer_switch=@save_derived_optimizer_switch; +# +# MDEV-6219:Server crashes in Bitmap<64u>::merge +# (this=0x180, map2=...) on 2nd execution of PS with INSERT .. SELECT, +# derived_merge +# +CREATE TABLE t1 (a VARCHAR(8)) ENGINE=MyISAM; +INSERT INTO t1 VALUES ('foo'),('bar'); +create procedure p1() +INSERT INTO t1 SELECT * FROM ( +SELECT * FROM t1 +) AS sq +WHERE sq.a IN ( SELECT 'baz' FROM DUAL ); +call p1(); +call p1(); +drop procedure p1; +PREPARE stmt FROM " + INSERT INTO t1 SELECT * FROM ( + SELECT * FROM t1 + ) AS sq + WHERE sq.a IN ( SELECT 'baz' FROM DUAL ) +"; +EXECUTE stmt; +EXECUTE stmt; +deallocate prepare stmt; +drop table t1; # # MDEV-6892: WHERE does not apply # @@ -579,3 +603,4 @@ select x.id, message from (select id from t1) x left join where coalesce(message,0) <> 0; id message drop table t1,t2; +set optimizer_switch=@save_derived_optimizer_switch; diff --git a/mysql-test/r/empty_server_name-8224.result b/mysql-test/r/empty_server_name-8224.result index 6423114470d..4bf592c8932 100644 --- a/mysql-test/r/empty_server_name-8224.result +++ b/mysql-test/r/empty_server_name-8224.result @@ -1 +1,2 @@ create server '' foreign data wrapper w2 options (host '127.0.0.1'); +drop server ''; diff --git a/mysql-test/r/func_gconcat.result b/mysql-test/r/func_gconcat.result index f12a0c1127a..0bc31a5e85b 100644 --- a/mysql-test/r/func_gconcat.result +++ b/mysql-test/r/func_gconcat.result @@ -1103,3 +1103,19 @@ ORDER BY field; field c,c drop table t3, t2, t1; +# +# MDEV-7821 - Server crashes in Item_func_group_concat::fix_fields on 2nd +# execution of PS +# +CREATE TABLE t1(a INT); +INSERT INTO t1 VALUES(1),(2); +PREPARE stmt FROM "SELECT GROUP_CONCAT(t1a.a ORDER BY 1, t1a.a=0) FROM t1 AS t1a, t1 AS t1b GROUP BY t1a.a"; +EXECUTE stmt; +GROUP_CONCAT(t1a.a ORDER BY 1, t1a.a=0) +1,1 +2,2 +EXECUTE stmt; +GROUP_CONCAT(t1a.a ORDER BY 1, t1a.a=0) +1,1 +2,2 +DROP TABLE t1; diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result index ceec5df148b..62138819b0a 100644 --- a/mysql-test/r/func_misc.result +++ b/mysql-test/r/func_misc.result @@ -361,6 +361,19 @@ set optimizer_switch=@optimizer_switch_save; drop view v_merge, vm; drop table t1,tv; # +# MDEV-4017 - GET_LOCK() with negative timeouts has strange behavior +# +SELECT GET_LOCK('ul1', NULL); +GET_LOCK('ul1', NULL) +NULL +Warnings: +Warning 1411 Incorrect timeout value: 'NULL' for function get_lock +SELECT GET_LOCK('ul1', -1); +GET_LOCK('ul1', -1) +NULL +Warnings: +Warning 1411 Incorrect timeout value: '-1' for function get_lock +# # GET_LOCK, RELEASE_LOCK, IS_USED_LOCK functions test # # IS_USED_LOCK, IS_FREE_LOCK: the lock is not acquired diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result index 6c769e60780..499251ec3fc 100644 --- a/mysql-test/r/grant.result +++ b/mysql-test/r/grant.result @@ -1695,6 +1695,7 @@ Assigning privileges without procs_priv table. CREATE DATABASE mysqltest1; CREATE PROCEDURE mysqltest1.test() SQL SECURITY DEFINER SELECT 1; +CREATE FUNCTION mysqltest1.test() RETURNS INT RETURN 1; GRANT EXECUTE ON FUNCTION mysqltest1.test TO mysqltest_1@localhost; ERROR 42S02: Table 'mysql.procs_priv' doesn't exist GRANT ALL PRIVILEGES ON test.* TO mysqltest_1@localhost; @@ -2557,3 +2558,25 @@ ERROR 42000: Access denied for user 'untrusted'@'localhost' to database 'secret' # Connection default DROP USER untrusted@localhost; DROP DATABASE secret; +# +# BUG#11759114 - '51401: GRANT TREATS NONEXISTENT FUNCTIONS/PRIVILEGES +# DIFFERENTLY'. +# +drop database if exists mysqltest_db1; +create database mysqltest_db1; +create user mysqltest_u1; +# Both GRANT statements below should fail with the same error. +grant execute on function mysqltest_db1.f1 to mysqltest_u1; +ERROR 42000: FUNCTION or PROCEDURE f1 does not exist +grant execute on procedure mysqltest_db1.p1 to mysqltest_u1; +ERROR 42000: FUNCTION or PROCEDURE p1 does not exist +# Let us show that GRANT behaviour for routines is consistent +# with GRANT behaviour for tables. Attempt to grant privilege +# on non-existent table also results in an error. +grant select on mysqltest_db1.t1 to mysqltest_u1; +ERROR 42S02: Table 'mysqltest_db1.t1' doesn't exist +show grants for mysqltest_u1; +Grants for mysqltest_u1@% +GRANT USAGE ON *.* TO 'mysqltest_u1'@'%' +drop database mysqltest_db1; +drop user mysqltest_u1; diff --git a/mysql-test/r/innodb_load_xa.result b/mysql-test/r/innodb_load_xa.result index bcf1dad6806..515c820b40c 100644 --- a/mysql-test/r/innodb_load_xa.result +++ b/mysql-test/r/innodb_load_xa.result @@ -14,3 +14,5 @@ Variable_name Value Handler_prepare 0 drop table t1; uninstall plugin innodb; +Warnings: +Warning 1620 Plugin is busy and will be uninstalled on shutdown diff --git a/mysql-test/r/max_statement_time.result b/mysql-test/r/max_statement_time.result index 30060e78aff..1ad2de7f7e3 100644 --- a/mysql-test/r/max_statement_time.result +++ b/mysql-test/r/max_statement_time.result @@ -114,7 +114,7 @@ UPDATE t1 SET a = 2; ERROR 70100: Query execution was interrupted (max_statement_time exceeded) SHOW WARNINGS; Level Code Message -Error 1968 Query execution was interrupted (max_statement_time exceeded) +Error 1969 Query execution was interrupted (max_statement_time exceeded) ROLLBACK; DROP TABLE t1; diff --git a/mysql-test/r/mdev-504.result b/mysql-test/r/mdev-504.result index e178127cf2a..4d93e77c6e8 100644 --- a/mysql-test/r/mdev-504.result +++ b/mysql-test/r/mdev-504.result @@ -1,3 +1,4 @@ +SET GLOBAL net_write_timeout = 900; CREATE TABLE A ( pk INTEGER AUTO_INCREMENT PRIMARY KEY, fdate DATE @@ -19,3 +20,4 @@ DROP TABLE A; DROP PROCEDURE p_analyze; DROP FUNCTION rnd3; SET GLOBAL use_stat_tables = DEFAULT; +SET GLOBAL net_write_timeout = DEFAULT; diff --git a/mysql-test/r/merge_recover.result b/mysql-test/r/myisam_recover.result index 871c12ca4c0..0829c1e8b82 100644 --- a/mysql-test/r/merge_recover.result +++ b/mysql-test/r/myisam_recover.result @@ -1,5 +1,7 @@ # -# Test of MyISAM MRG tables with corrupted children. +# Tests for corrupted MyISAM tables and MyISAMMRG tables with corrupted +# children.. +# # Run with --myisam-recover=force option. # # Preparation: we need to make sure that the merge parent @@ -44,20 +46,20 @@ drop procedure p_create; # Switching to connection 'default' # # -# We have to disable the ps-protocol, to avoid +# We have to disable the ps-protocol, to avoid # "Prepared statement needs to be re-prepared" errors # -- table def versions change all the time with full table cache. -# +# drop table if exists t1, t1_mrg, t1_copy; # # Prepare a MERGE engine table, that refers to a corrupted # child. -# +# create table t1 (a int, key(a)) engine=myisam; create table t1_mrg (a int) union (t1) engine=merge; # # Create a table with a corrupted index file: -# save an old index file, insert more rows, +# save an old index file, insert more rows, # overwrite the new index file with the old one. # insert into t1 (a) values (1), (2), (3); @@ -101,3 +103,48 @@ execute stmt; deallocate prepare stmt; set @@global.table_definition_cache=default; set @@global.table_open_cache=default; +# +# 18075170 - sql node restart required to avoid deadlock after +# restore +# +# Check that auto-repair for MyISAM tables can now happen in the +# middle of transaction, without aborting it. +create table t1 (a int, key(a)) engine=myisam; +create table t2 (a int); +insert into t2 values (1); +# Create a table with a corrupted index file: +# save an old index file, insert more rows, +# overwrite the new index file with the old one. +insert into t1 (a) values (1); +flush table t1; +insert into t1 (a) values (4); +flush table t1; +# Check table is needed to mark the table as crashed. +check table t1; +Table Op Msg_type Msg_text +test.t1 check warning Size of datafile is: 14 Should be: 7 +test.t1 check error Record-count is not ok; is 2 Should be: 1 +test.t1 check warning Found 2 key parts. Should be: 1 +test.t1 check error Corrupt +# At this point we have a corrupt t1 +set autocommit = 0; +select * from t2; +a +1 +# Without fix select from t1 will break the transaction. After the fix +# transaction should be active and should hold lock on table t2. Alter +# table from con2 will wait only if the transaction is not broken. +select * from t1; +a +1 +4 +Warnings: +Error 145 Table 't1' is marked as crashed and should be repaired +Error 1194 Table 't1' is marked as crashed and should be repaired +Error 1034 Number of rows changed from 1 to 2 +ALTER TABLE t2 ADD val INT; +# With fix we should have alter table waiting for t2 lock here. +ROLLBACK; +SET autocommit = 1; +# Cleanup +drop table t1, t2; diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index fc22af6b9be..65a0fad4a84 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -667,6 +667,9 @@ The following options may be given as the first argument: --performance-schema-max-cond-instances=# Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing. + --performance-schema-max-digest-length=# + Maximum length considered for digest text, when stored in + performance_schema tables. --performance-schema-max-file-classes=# Maximum number of file instruments. --performance-schema-max-file-handles=# @@ -1316,6 +1319,7 @@ performance-schema-hosts-size -1 performance-schema-instrument performance-schema-max-cond-classes 80 performance-schema-max-cond-instances -1 +performance-schema-max-digest-length 1024 performance-schema-max-file-classes 50 performance-schema-max-file-handles 32768 performance-schema-max-file-instances -1 diff --git a/mysql-test/r/plugin.result b/mysql-test/r/plugin.result index 74b312359a8..b92881ae7bc 100644 --- a/mysql-test/r/plugin.result +++ b/mysql-test/r/plugin.result @@ -5,7 +5,7 @@ Warning 1266 Using storage engine MyISAM for table 't1' DROP TABLE t1; INSTALL PLUGIN example SONAME 'ha_example'; INSTALL PLUGIN EXAMPLE SONAME 'ha_example'; -ERROR HY000: Function 'EXAMPLE' already exists +ERROR HY000: Plugin 'EXAMPLE' already installed UNINSTALL PLUGIN example; INSTALL SONAME 'ha_example'; select * from information_schema.plugins where plugin_library like 'ha_example%'; diff --git a/mysql-test/r/sp-group.result b/mysql-test/r/sp-group.result new file mode 100644 index 00000000000..2e30b697103 --- /dev/null +++ b/mysql-test/r/sp-group.result @@ -0,0 +1,156 @@ +drop table if exists t1; +Warnings: +Note 1051 Unknown table 'test.t1' +drop view if exists view_t1; +Warnings: +Note 1051 Unknown table 'test.view_t1' +SET sql_mode=ONLY_FULL_GROUP_BY; +CREATE TABLE t1 ( +pk INT, +f0 INT, f1 INT, f2 INT, f3 INT, f4 INT, +f5 INT, f6 INT, f7 INT, f8 INT, f9 INT, +PRIMARY KEY (pk) +); +CREATE VIEW view_t1 AS SELECT * FROM t1; +CREATE PROCEDURE s1() +SELECT * FROM ( +INFORMATION_SCHEMA.`INNODB_BUFFER_PAGE_LRU` AS table1 +LEFT JOIN test.view_t1 AS table2 +ON ( table2.`f6` = table1.FREE_PAGE_CLOCK) +) +ORDER BY table1.NUMBER_RECORDS +LIMIT 0 +; +CALL s1; +POOL_ID LRU_POSITION SPACE PAGE_NUMBER PAGE_TYPE FLUSH_TYPE FIX_COUNT IS_HASHED NEWEST_MODIFICATION OLDEST_MODIFICATION ACCESS_TIME TABLE_NAME INDEX_NAME NUMBER_RECORDS DATA_SIZE COMPRESSED_SIZE COMPRESSED IO_FIX IS_OLD FREE_PAGE_CLOCK pk f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 +CALL s1; +POOL_ID LRU_POSITION SPACE PAGE_NUMBER PAGE_TYPE FLUSH_TYPE FIX_COUNT IS_HASHED NEWEST_MODIFICATION OLDEST_MODIFICATION ACCESS_TIME TABLE_NAME INDEX_NAME NUMBER_RECORDS DATA_SIZE COMPRESSED_SIZE COMPRESSED IO_FIX IS_OLD FREE_PAGE_CLOCK pk f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 +drop table t1; +drop view view_t1; +drop procedure s1; +CREATE TABLE A ( +pk INTEGER AUTO_INCREMENT, +col_int_key INTEGER, +col_varchar_key VARCHAR(1), +PRIMARY KEY (pk) +) ENGINE=MyISAM; +CREATE VIEW view_A AS SELECT * FROM A; +CREATE TABLE C ( +pk INTEGER AUTO_INCREMENT, +col_int_nokey INTEGER, +col_int_key INTEGER, +col_date_key DATE, +col_date_nokey DATE, +col_time_key TIME, +col_time_nokey TIME, +col_datetime_key DATETIME, +col_datetime_nokey DATETIME, +col_varchar_key VARCHAR(1), +col_varchar_nokey VARCHAR(1), +PRIMARY KEY (pk) +) ENGINE=MyISAM; +CREATE VIEW view_C AS SELECT * FROM C; +CREATE TABLE AA ( +pk INTEGER AUTO_INCREMENT, +col_int_nokey INTEGER, +col_int_key INTEGER, +col_date_key DATE, +col_date_nokey DATE, +col_time_key TIME, +col_time_nokey TIME, +col_datetime_key DATETIME, +col_datetime_nokey DATETIME, +col_varchar_key VARCHAR(1), +col_varchar_nokey VARCHAR(1), +PRIMARY KEY (pk), +KEY (col_varchar_key, col_int_key) +) ENGINE=MyISAM; +CREATE VIEW view_AA AS SELECT * FROM AA; +CREATE TABLE BB ( +pk INTEGER AUTO_INCREMENT, +col_int_key INTEGER, +col_varchar_key VARCHAR(1), +col_varchar_nokey VARCHAR(1), +PRIMARY KEY (pk), +KEY (col_varchar_key, col_int_key) +) ENGINE=MyISAM; +CREATE VIEW view_BB AS SELECT * FROM BB; +CREATE TABLE DD ( +pk INTEGER AUTO_INCREMENT, +col_int_key INTEGER, +col_date_key DATE, +col_time_key TIME, +col_datetime_key DATETIME, +col_varchar_key VARCHAR(1), +PRIMARY KEY (pk), +KEY (col_varchar_key, col_int_key) +) ENGINE=MyISAM; +CREATE VIEW view_DD AS SELECT * FROM DD; +CREATE TRIGGER k BEFORE INSERT ON `DD` FOR EACH ROW INSERT INTO `view_BB` SELECT * FROM `view_A` LIMIT 0 ; +CREATE TRIGGER r BEFORE INSERT ON `A` FOR EACH ROW INSERT INTO `view_AA` SELECT * FROM `view_C` LIMIT 0 ; +ALTER TABLE `DD` DROP PRIMARY KEY; +ERROR 42000: Incorrect table definition; there can be only one auto column and it must be defined as a key +INSERT INTO `view_A` ( `pk` ) VALUES (NULL); +INSERT INTO `DD` ( `pk` ) VALUES (NULL); +INSERT INTO `A` ( `pk` ) VALUES (NULL); +INSERT INTO `view_DD` ( `pk` ) VALUES (NULL); +drop trigger r; +drop trigger k; +drop view view_A,view_AA,view_C,view_BB,view_DD; +drop table A,C,AA,BB,DD; +CREATE TABLE A ( +i INT, +i1 INT, +i2 INT, +d1 DATE, +d2 DATE, +col_time_nokey1 TIME, +col_time_nokey2 TIME, +col_datetime_nokey1 DATETIME, +col_datetime_nokey2 DATETIME, +col_varchar_nokey1 VARCHAR(1), +col_varchar_nokey2 VARCHAR(1) +) ENGINE=MyISAM; +CREATE VIEW view_A AS SELECT * FROM A; +CREATE TABLE B ( +col_varchar_nokey VARCHAR(1) +) ENGINE=MyISAM; +CREATE TABLE AA ( +i INT, +i1 INT, +i2 INT, +d1 DATE, +d2 DATE, +col_time_nokey1 TIME, +col_time_nokey2 TIME, +col_datetime_nokey1 DATETIME, +col_datetime_nokey2 DATETIME, +col_varchar_nokey1 VARCHAR(1), +col_varchar_nokey2 VARCHAR(1) +) ENGINE=MyISAM; +CREATE VIEW view_AA AS SELECT * FROM AA; +CREATE TABLE DD ( +i INT, +i1 INT, +i2 INT, +d1 DATE, +d2 DATE, +col_time_nokey1 TIME, +col_time_nokey2 TIME, +col_datetime_nokey1 DATETIME, +col_datetime_nokey2 DATETIME, +col_varchar_nokey1 VARCHAR(1), +col_varchar_nokey2 VARCHAR(1) +) ENGINE=MyISAM; +CREATE VIEW view_DD AS SELECT * FROM DD; +CREATE TRIGGER tr1 BEFORE INSERT ON `AA` FOR EACH ROW INSERT INTO `view_A` SELECT * FROM `view_AA` LIMIT 0 ; +CREATE TRIGGER tr2 BEFORE INSERT ON `B` FOR EACH ROW INSERT INTO `D` SELECT * FROM `A` LIMIT 0 ; +INSERT INTO `view_AA` ( `i` ) VALUES (1); +INSERT INTO `AA` ( `i` ) VALUES (2); +DELETE FROM `B`; +INSERT INTO `view_DD` ( `i` ) VALUES (1); +INSERT INTO `view_AA` ( `i` ) VALUES (3); +drop trigger tr1; +drop trigger tr2; +drop view view_A, view_AA,view_DD; +drop table A,B,AA,DD; diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index c8b7e8ebb00..27a21e190fd 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -7861,6 +7861,60 @@ v1 DROP PROCEDURE p1; DROP TABLE t1; # End of 5.5 test +# +# MDEV-7040: Crash in field_conv, memcpy_field_possible, part#2 +# +create table t1 ( +col1 bigint(20), +col2 char(1), +col3 char(2) +); +insert into t1 values (1,'a','a'), (2,'b','b'); +create table t2 as select * from t1; +create table t3 as select * from t1; +create table t4 as select * from t1; +create table t5 as select * from t1; +create table t6 as select * from t1; +flush tables; +CREATE PROCEDURE p1() +begin +DECLARE _var1 bigint(20) UNSIGNED; +DECLARE _var2 CHAR(1) DEFAULT NULL; +DECLARE _var3 CHAR(1) DEFAULT NULL; +DECLARE _done BOOLEAN DEFAULT 0; +declare cur1 cursor for +select col1, col2, col3 +from t1 +where +col1 in (select t2.col1 from t2 where t2.col2=t1.col2) or +col2 in (select t3.col3 from t3 where t3.col3=t1.col2) ; +DECLARE CONTINUE HANDLER FOR NOT FOUND SET _done = 1; +OPEN cur1; +set _var1 = (select _var1 from t4 limit 1); +set _var1 = (select _var1 from t5 limit 1); +set _var1 = (select _var1 from t6 limit 1); +label1: +LOOP +SET _done = 0; +FETCH cur1 INTO _var1, _var2, _var3; +IF _done THEN +LEAVE label1; +END IF; +END LOOP label1; +CLOSE cur1; +end| +set @tmp_toc= @@table_open_cache; +set @tmp_tdc= @@table_definition_cache; +set global table_open_cache=1; +set global table_definition_cache=1; +Warnings: +Warning 1292 Truncated incorrect table_definition_cache value: '1' +call p1(); +set global table_open_cache= @tmp_toc; +set global table_definition_cache= @tmp_tdc; +drop procedure p1; +drop table t1,t2,t3,t4,t5,t6; +# End of 10.0 test CREATE FUNCTION f(f1 VARCHAR(64) COLLATE latin1_german2_ci) RETURNS VARCHAR(64) BEGIN diff --git a/mysql-test/r/subselect_mat.result b/mysql-test/r/subselect_mat.result index 40c0c21ae40..b201ac6a44c 100644 --- a/mysql-test/r/subselect_mat.result +++ b/mysql-test/r/subselect_mat.result @@ -2145,6 +2145,24 @@ drop database mysqltest1; drop database mysqltest2; drop database mysqltest3; drop database mysqltest4; +# +# MDEV-7810 Wrong result on execution of a query as a PS +# (both 1st and further executions) +CREATE TABLE t1 (a INT NOT NULL) ENGINE=MyISAM; +INSERT INTO t1 VALUES (0),(8); +SELECT a FROM (SELECT DISTINCT * FROM t1) AS sq WHERE a IN (SELECT MIN(t2.a) FROM (t1 AS t2)); +a +0 +PREPARE stmt FROM " +SELECT a FROM (SELECT DISTINCT * FROM t1) AS sq WHERE a IN (SELECT MIN(t2.a) FROM (t1 AS t2)) +"; +execute stmt; +a +0 +execute stmt; +a +0 +drop table t1; # End of 5.5 tests # # MDEV-7220: Materialization strategy is not used for REPLACE ... SELECT @@ -2197,6 +2215,24 @@ Handler_read_rnd_next 6003 Handler_tmp_write 2000 Handler_write 1000 drop table t0,t1,t2,t3; +# +# MDEV-7971: Assertion `name != __null' failed in ACL_internal_schema_registry::lookup +# on 2nd execution os PS with multi-table update +# +CREATE TABLE t1 (f1 INT); +INSERT INTO t1 VALUES (1),(2); +CREATE TABLE t2 (f2 INT); +INSERT INTO t2 VALUES (3),(4); +CREATE TABLE t3 (f3 INT); +INSERT INTO t3 VALUES (5),(6); +PREPARE stmt FROM ' + UPDATE t1, t2 + SET f1 = 5 + WHERE 8 IN ( SELECT MIN(f3) FROM t3 ) +'; +EXECUTE stmt; +EXECUTE stmt; +DROP TABLE t1,t2,t3; set @subselect_mat_test_optimizer_switch_value=null; set @@optimizer_switch='materialization=on,in_to_exists=off,semijoin=off'; set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on'; diff --git a/mysql-test/r/subselect_sj2.result b/mysql-test/r/subselect_sj2.result index 1cef7f5a46f..21d97b3faea 100644 --- a/mysql-test/r/subselect_sj2.result +++ b/mysql-test/r/subselect_sj2.result @@ -1283,5 +1283,38 @@ id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY T2_0_ ref FK_T2_T1Id FK_T2_T1Id 8 test.T2_1_.t1idref 1 Using index; End temporary drop table t3,t2,t1; set optimizer_search_depth=@tmp7474; +# +# +# +CREATE TABLE t1 ( +id int(16) NOT NULL AUTO_INCREMENT, +PRIMARY KEY (id) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +CREATE TABLE t2 ( +id int(16) NOT NULL AUTO_INCREMENT, +t3_id int(16) NOT NULL DEFAULT '0', +t1_id int(16) NOT NULL DEFAULT '0', +PRIMARY KEY (id), +KEY t3_idx (t3_id), +KEY t1_idx (t1_id) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE t3 ( +id int(16) NOT NULL AUTO_INCREMENT, +PRIMARY KEY (id) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +INSERT INTO t3 VALUES (1); +INSERT INTO t2 VALUES (1, 1, 1); +INSERT INTO t2 VALUES (2, 1, 2); +INSERT INTO t2 VALUES (3, 1, 2); +INSERT INTO t2 VALUES (4, 1, 1); +INSERT INTO t1 VALUES (1); +INSERT INTO t1 VALUES (2); +SELECT * FROM t1 WHERE t1.id IN ( +SELECT t2.t1_id FROM t3 JOIN t2 ON t3.id = t2.t3_id WHERE t3.id = 1 +); +id +1 +2 +drop table t1,t2,t3; # This must be the last in the file: set optimizer_switch=@subselect_sj2_tmp; diff --git a/mysql-test/r/subselect_sj2_jcl6.result b/mysql-test/r/subselect_sj2_jcl6.result index b7c9fc8f28c..eb91fe6d61b 100644 --- a/mysql-test/r/subselect_sj2_jcl6.result +++ b/mysql-test/r/subselect_sj2_jcl6.result @@ -1298,6 +1298,39 @@ id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY T2_0_ ref FK_T2_T1Id FK_T2_T1Id 8 test.T2_1_.t1idref 1 Using index; End temporary drop table t3,t2,t1; set optimizer_search_depth=@tmp7474; +# +# +# +CREATE TABLE t1 ( +id int(16) NOT NULL AUTO_INCREMENT, +PRIMARY KEY (id) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +CREATE TABLE t2 ( +id int(16) NOT NULL AUTO_INCREMENT, +t3_id int(16) NOT NULL DEFAULT '0', +t1_id int(16) NOT NULL DEFAULT '0', +PRIMARY KEY (id), +KEY t3_idx (t3_id), +KEY t1_idx (t1_id) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE t3 ( +id int(16) NOT NULL AUTO_INCREMENT, +PRIMARY KEY (id) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +INSERT INTO t3 VALUES (1); +INSERT INTO t2 VALUES (1, 1, 1); +INSERT INTO t2 VALUES (2, 1, 2); +INSERT INTO t2 VALUES (3, 1, 2); +INSERT INTO t2 VALUES (4, 1, 1); +INSERT INTO t1 VALUES (1); +INSERT INTO t1 VALUES (2); +SELECT * FROM t1 WHERE t1.id IN ( +SELECT t2.t1_id FROM t3 JOIN t2 ON t3.id = t2.t3_id WHERE t3.id = 1 +); +id +1 +2 +drop table t1,t2,t3; # This must be the last in the file: set optimizer_switch=@subselect_sj2_tmp; # diff --git a/mysql-test/r/subselect_sj2_mat.result b/mysql-test/r/subselect_sj2_mat.result index 0edfe08213e..16e8f88168d 100644 --- a/mysql-test/r/subselect_sj2_mat.result +++ b/mysql-test/r/subselect_sj2_mat.result @@ -1285,6 +1285,39 @@ id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY T2_0_ ref FK_T2_T1Id FK_T2_T1Id 8 test.T2_1_.t1idref 1 Using index; End temporary drop table t3,t2,t1; set optimizer_search_depth=@tmp7474; +# +# +# +CREATE TABLE t1 ( +id int(16) NOT NULL AUTO_INCREMENT, +PRIMARY KEY (id) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +CREATE TABLE t2 ( +id int(16) NOT NULL AUTO_INCREMENT, +t3_id int(16) NOT NULL DEFAULT '0', +t1_id int(16) NOT NULL DEFAULT '0', +PRIMARY KEY (id), +KEY t3_idx (t3_id), +KEY t1_idx (t1_id) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE t3 ( +id int(16) NOT NULL AUTO_INCREMENT, +PRIMARY KEY (id) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +INSERT INTO t3 VALUES (1); +INSERT INTO t2 VALUES (1, 1, 1); +INSERT INTO t2 VALUES (2, 1, 2); +INSERT INTO t2 VALUES (3, 1, 2); +INSERT INTO t2 VALUES (4, 1, 1); +INSERT INTO t1 VALUES (1); +INSERT INTO t1 VALUES (2); +SELECT * FROM t1 WHERE t1.id IN ( +SELECT t2.t1_id FROM t3 JOIN t2 ON t3.id = t2.t3_id WHERE t3.id = 1 +); +id +1 +2 +drop table t1,t2,t3; # This must be the last in the file: set optimizer_switch=@subselect_sj2_tmp; set optimizer_switch=default; diff --git a/mysql-test/r/subselect_sj_mat.result b/mysql-test/r/subselect_sj_mat.result index d5150f047d7..2dce6569d67 100644 --- a/mysql-test/r/subselect_sj_mat.result +++ b/mysql-test/r/subselect_sj_mat.result @@ -2185,6 +2185,24 @@ drop database mysqltest1; drop database mysqltest2; drop database mysqltest3; drop database mysqltest4; +# +# MDEV-7810 Wrong result on execution of a query as a PS +# (both 1st and further executions) +CREATE TABLE t1 (a INT NOT NULL) ENGINE=MyISAM; +INSERT INTO t1 VALUES (0),(8); +SELECT a FROM (SELECT DISTINCT * FROM t1) AS sq WHERE a IN (SELECT MIN(t2.a) FROM (t1 AS t2)); +a +0 +PREPARE stmt FROM " +SELECT a FROM (SELECT DISTINCT * FROM t1) AS sq WHERE a IN (SELECT MIN(t2.a) FROM (t1 AS t2)) +"; +execute stmt; +a +0 +execute stmt; +a +0 +drop table t1; # End of 5.5 tests # # MDEV-7220: Materialization strategy is not used for REPLACE ... SELECT @@ -2237,3 +2255,21 @@ Handler_read_rnd_next 6003 Handler_tmp_write 2000 Handler_write 1000 drop table t0,t1,t2,t3; +# +# MDEV-7971: Assertion `name != __null' failed in ACL_internal_schema_registry::lookup +# on 2nd execution os PS with multi-table update +# +CREATE TABLE t1 (f1 INT); +INSERT INTO t1 VALUES (1),(2); +CREATE TABLE t2 (f2 INT); +INSERT INTO t2 VALUES (3),(4); +CREATE TABLE t3 (f3 INT); +INSERT INTO t3 VALUES (5),(6); +PREPARE stmt FROM ' + UPDATE t1, t2 + SET f1 = 5 + WHERE 8 IN ( SELECT MIN(f3) FROM t3 ) +'; +EXECUTE stmt; +EXECUTE stmt; +DROP TABLE t1,t2,t3; diff --git a/mysql-test/r/type_binary.result b/mysql-test/r/type_binary.result index b00d1585b29..9d44d718a02 100644 --- a/mysql-test/r/type_binary.result +++ b/mysql-test/r/type_binary.result @@ -146,3 +146,37 @@ hex(f2) hex(f3) 0000 drop table t1; End of 5.0 tests +# +# Start of 10.0 tests +# +# +# MDEV-8472 BINARY, VARBINARY and BLOB return different warnings on CAST to DECIMAL +# +SET NAMES utf8; +CREATE TABLE t1 (a BINARY(30)); +INSERT INTO t1 VALUES ('1äÖüß@µ*$'); +SELECT CAST(a AS DECIMAL) FROM t1; +CAST(a AS DECIMAL) +1 +Warnings: +Warning 1292 Truncated incorrect DECIMAL value: '1\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +DROP TABLE t1; +CREATE TABLE t1 (a VARBINARY(30)); +INSERT INTO t1 VALUES ('1äÖüß@µ*$'); +SELECT CAST(a AS DECIMAL) FROM t1; +CAST(a AS DECIMAL) +1 +Warnings: +Warning 1292 Truncated incorrect DECIMAL value: '1\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$' +DROP TABLE t1; +CREATE TABLE t1 (a BLOB); +INSERT INTO t1 VALUES ('1äÖüß@µ*$'); +SELECT CAST(a AS DECIMAL) FROM t1; +CAST(a AS DECIMAL) +1 +Warnings: +Warning 1292 Truncated incorrect DECIMAL value: '1\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$' +DROP TABLE t1; +# +# End of 10.0 tests +# diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index d8b71fb119c..4a39eb9d57a 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -5428,6 +5428,21 @@ View Create View character_set_client collation_connection v2 CREATE ALGORITHM=MERGE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select (`t1`.`b` + 1) AS `c` from `t1` latin1 latin1_swedish_ci drop view v2; drop table t1; +# +# MDEV-8554: Server crashes in base_list_iterator::next_fast on 1st execution of PS with a multi-table update +# +CREATE TABLE t1 (a INT) ENGINE=MyISAM; +INSERT INTO t1 VALUES (1),(2); +CREATE TABLE t2 (b INT) ENGINE=MyISAM; +INSERT INTO t2 VALUES (3),(4); +CREATE TABLE t3 (c INT) ENGINE=MyISAM; +INSERT INTO t3 VALUES (5),(6); +CREATE OR REPLACE ALGORITHM=MERGE VIEW v3 AS SELECT * FROM t3; +PREPARE stmt FROM 'UPDATE t1, t2 SET a = 1 WHERE a IN ( SELECT 0 FROM t3 )'; +UPDATE t1, t2 SET a = 1 WHERE a IN ( SELECT 0 FROM v3 ); +EXECUTE stmt; +DROP TABLE t1, t2, t3; +DROP VIEW v3; # ----------------------------------------------------------------- # -- End of 5.5 tests. # ----------------------------------------------------------------- diff --git a/mysql-test/suite/archive/archive_plugin.result b/mysql-test/suite/archive/archive_plugin.result index 90c1f10bf19..feb825f20ee 100644 --- a/mysql-test/suite/archive/archive_plugin.result +++ b/mysql-test/suite/archive/archive_plugin.result @@ -5,7 +5,7 @@ Warning 1266 Using storage engine MyISAM for table 't1' DROP TABLE t1; INSTALL PLUGIN archive SONAME 'ha_archive.so'; INSTALL PLUGIN ARCHIVE SONAME 'ha_archive.so'; -ERROR HY000: Function 'ARCHIVE' already exists +ERROR HY000: Plugin 'ARCHIVE' already installed UNINSTALL PLUGIN archive; INSTALL PLUGIN archive SONAME 'ha_archive.so'; CREATE TABLE t1(a int) ENGINE=ARCHIVE; diff --git a/mysql-test/suite/archive/archive_plugin.test b/mysql-test/suite/archive/archive_plugin.test index ba80652fb02..8ea40114cca 100644 --- a/mysql-test/suite/archive/archive_plugin.test +++ b/mysql-test/suite/archive/archive_plugin.test @@ -7,7 +7,7 @@ DROP TABLE t1; --replace_regex /\.dll/.so/ eval INSTALL PLUGIN archive SONAME '$HA_ARCHIVE_SO'; --replace_regex /\.dll/.so/ ---error 1125 +--error ER_PLUGIN_INSTALLED eval INSTALL PLUGIN ARCHIVE SONAME '$HA_ARCHIVE_SO'; UNINSTALL PLUGIN archive; diff --git a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result index 22434790686..35607ea7f95 100644 --- a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result +++ b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result @@ -259,7 +259,7 @@ Warning 1196 Some non-transactional changed tables couldn't be rolled back create table t0 (n int); insert t0 select * from t1; set autocommit=1; -insert into t0 select GET_LOCK("lock1",null); +insert into t0 select GET_LOCK("lock1",0); set autocommit=0; create table t2 (n int) engine=innodb; insert into t2 values (3); diff --git a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result index 10f3f5ddf2a..0ac4716f383 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result +++ b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result @@ -243,7 +243,7 @@ Warning 1196 Some non-transactional changed tables couldn't be rolled back create table t0 (n int); insert t0 select * from t1; set autocommit=1; -insert into t0 select GET_LOCK("lock1",null); +insert into t0 select GET_LOCK("lock1",0); Warnings: Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave. set autocommit=0; @@ -293,7 +293,7 @@ master-bin.000001 # Gtid # # BEGIN GTID #-#-# master-bin.000001 # Query # # use `test`; insert t0 select * from t1 master-bin.000001 # Query # # COMMIT master-bin.000001 # Gtid # # BEGIN GTID #-#-# -master-bin.000001 # Query # # use `test`; insert into t0 select GET_LOCK("lock1",null) +master-bin.000001 # Query # # use `test`; insert into t0 select GET_LOCK("lock1",0) master-bin.000001 # Query # # COMMIT master-bin.000001 # Gtid # # GTID #-#-# master-bin.000001 # Query # # use `test`; create table t2 (n int) engine=innodb diff --git a/mysql-test/suite/funcs_1/r/innodb_func_view.result b/mysql-test/suite/funcs_1/r/innodb_func_view.result index 38ad472575b..fc50c596752 100644 --- a/mysql-test/suite/funcs_1/r/innodb_func_view.result +++ b/mysql-test/suite/funcs_1/r/innodb_func_view.result @@ -2282,7 +2282,7 @@ NULL NULL 1 ---????????@??*$-- ---äÖüß@µ*$-- 4 -1 -1 5 Warnings: -Warning 1976 Cannot convert 'latin1' character 0xC3 to 'koi8r' +Warning 1977 Cannot convert 'latin1' character 0xC3 to 'koi8r' SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using koi8r) AS `CONVERT(my_varchar_1000 USING koi8r)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2296,7 +2296,7 @@ NULL NULL 1 ---????????@??*$-- ---äÖüß@µ*$-- 4 -1 -1 5 Warnings: -Warning 1976 Cannot convert 'latin1' character 0xC3 to 'koi8r' +Warning 1977 Cannot convert 'latin1' character 0xC3 to 'koi8r' DROP VIEW v1; @@ -2312,7 +2312,7 @@ NULL NULL 1 ---????????@??*$-- ---äÖüß@µ*$-- 4 -1 -1 5 Warnings: -Warning 1976 Cannot convert 'latin1' character 0xC3 to 'koi8r' +Warning 1977 Cannot convert 'latin1' character 0xC3 to 'koi8r' SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using koi8r) AS `CONVERT(my_char_30 USING koi8r)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2326,7 +2326,7 @@ NULL NULL 1 ---????????@??*$-- ---äÖüß@µ*$-- 4 -1 -1 5 Warnings: -Warning 1976 Cannot convert 'latin1' character 0xC3 to 'koi8r' +Warning 1977 Cannot convert 'latin1' character 0xC3 to 'koi8r' DROP VIEW v1; @@ -3412,7 +3412,7 @@ Warning 1292 Truncated incorrect DECIMAL value: '' Warning 1918 Encountered illegal value '' when converting to DECIMAL Warning 1292 Truncated incorrect DECIMAL value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1918 Encountered illegal value '' when converting to DECIMAL -Warning 1292 Truncated incorrect DECIMAL value: ' ---@*$-- ' +Warning 1292 Truncated incorrect DECIMAL value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- ' SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal(37,2)) AS `CAST(my_varbinary_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -3432,7 +3432,7 @@ Warning 1292 Truncated incorrect DECIMAL value: '' Warning 1918 Encountered illegal value '' when converting to DECIMAL Warning 1292 Truncated incorrect DECIMAL value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1918 Encountered illegal value '' when converting to DECIMAL -Warning 1292 Truncated incorrect DECIMAL value: ' ---@*$-- ' +Warning 1292 Truncated incorrect DECIMAL value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- ' DROP VIEW v1; @@ -3500,7 +3500,7 @@ Warning 1292 Truncated incorrect DECIMAL value: '' Warning 1918 Encountered illegal value '' when converting to DECIMAL Warning 1292 Truncated incorrect DECIMAL value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1918 Encountered illegal value '' when converting to DECIMAL -Warning 1292 Truncated incorrect DECIMAL value: ' ---@*$-- ' +Warning 1292 Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$-- ' SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal(37,2)) AS `CAST(my_varchar_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -3520,7 +3520,7 @@ Warning 1292 Truncated incorrect DECIMAL value: '' Warning 1918 Encountered illegal value '' when converting to DECIMAL Warning 1292 Truncated incorrect DECIMAL value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1918 Encountered illegal value '' when converting to DECIMAL -Warning 1292 Truncated incorrect DECIMAL value: ' ---@*$-- ' +Warning 1292 Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$-- ' DROP VIEW v1; diff --git a/mysql-test/suite/funcs_1/r/memory_func_view.result b/mysql-test/suite/funcs_1/r/memory_func_view.result index f3eb50c2e09..fe67cf0c3d6 100644 --- a/mysql-test/suite/funcs_1/r/memory_func_view.result +++ b/mysql-test/suite/funcs_1/r/memory_func_view.result @@ -2283,7 +2283,7 @@ NULL NULL 1 ---????????@??*$-- ---äÖüß@µ*$-- 4 -1 -1 5 Warnings: -Warning 1976 Cannot convert 'latin1' character 0xC3 to 'koi8r' +Warning 1977 Cannot convert 'latin1' character 0xC3 to 'koi8r' SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using koi8r) AS `CONVERT(my_varchar_1000 USING koi8r)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2297,7 +2297,7 @@ NULL NULL 1 ---????????@??*$-- ---äÖüß@µ*$-- 4 -1 -1 5 Warnings: -Warning 1976 Cannot convert 'latin1' character 0xC3 to 'koi8r' +Warning 1977 Cannot convert 'latin1' character 0xC3 to 'koi8r' DROP VIEW v1; @@ -2313,7 +2313,7 @@ NULL NULL 1 ---????????@??*$-- ---äÖüß@µ*$-- 4 -1 -1 5 Warnings: -Warning 1976 Cannot convert 'latin1' character 0xC3 to 'koi8r' +Warning 1977 Cannot convert 'latin1' character 0xC3 to 'koi8r' SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using koi8r) AS `CONVERT(my_char_30 USING koi8r)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2327,7 +2327,7 @@ NULL NULL 1 ---????????@??*$-- ---äÖüß@µ*$-- 4 -1 -1 5 Warnings: -Warning 1976 Cannot convert 'latin1' character 0xC3 to 'koi8r' +Warning 1977 Cannot convert 'latin1' character 0xC3 to 'koi8r' DROP VIEW v1; @@ -3413,7 +3413,7 @@ Warning 1292 Truncated incorrect DECIMAL value: '' Warning 1918 Encountered illegal value '' when converting to DECIMAL Warning 1292 Truncated incorrect DECIMAL value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1918 Encountered illegal value '' when converting to DECIMAL -Warning 1292 Truncated incorrect DECIMAL value: ' ---@*$-- ' +Warning 1292 Truncated incorrect DECIMAL value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- ' SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal(37,2)) AS `CAST(my_varbinary_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -3433,7 +3433,7 @@ Warning 1292 Truncated incorrect DECIMAL value: '' Warning 1918 Encountered illegal value '' when converting to DECIMAL Warning 1292 Truncated incorrect DECIMAL value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1918 Encountered illegal value '' when converting to DECIMAL -Warning 1292 Truncated incorrect DECIMAL value: ' ---@*$-- ' +Warning 1292 Truncated incorrect DECIMAL value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- ' DROP VIEW v1; @@ -3501,7 +3501,7 @@ Warning 1292 Truncated incorrect DECIMAL value: '' Warning 1918 Encountered illegal value '' when converting to DECIMAL Warning 1292 Truncated incorrect DECIMAL value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1918 Encountered illegal value '' when converting to DECIMAL -Warning 1292 Truncated incorrect DECIMAL value: ' ---@*$-- ' +Warning 1292 Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$-- ' SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal(37,2)) AS `CAST(my_varchar_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -3521,7 +3521,7 @@ Warning 1292 Truncated incorrect DECIMAL value: '' Warning 1918 Encountered illegal value '' when converting to DECIMAL Warning 1292 Truncated incorrect DECIMAL value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1918 Encountered illegal value '' when converting to DECIMAL -Warning 1292 Truncated incorrect DECIMAL value: ' ---@*$-- ' +Warning 1292 Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$-- ' DROP VIEW v1; diff --git a/mysql-test/suite/funcs_1/r/myisam_func_view.result b/mysql-test/suite/funcs_1/r/myisam_func_view.result index f3eb50c2e09..fe67cf0c3d6 100644 --- a/mysql-test/suite/funcs_1/r/myisam_func_view.result +++ b/mysql-test/suite/funcs_1/r/myisam_func_view.result @@ -2283,7 +2283,7 @@ NULL NULL 1 ---????????@??*$-- ---äÖüß@µ*$-- 4 -1 -1 5 Warnings: -Warning 1976 Cannot convert 'latin1' character 0xC3 to 'koi8r' +Warning 1977 Cannot convert 'latin1' character 0xC3 to 'koi8r' SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using koi8r) AS `CONVERT(my_varchar_1000 USING koi8r)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2297,7 +2297,7 @@ NULL NULL 1 ---????????@??*$-- ---äÖüß@µ*$-- 4 -1 -1 5 Warnings: -Warning 1976 Cannot convert 'latin1' character 0xC3 to 'koi8r' +Warning 1977 Cannot convert 'latin1' character 0xC3 to 'koi8r' DROP VIEW v1; @@ -2313,7 +2313,7 @@ NULL NULL 1 ---????????@??*$-- ---äÖüß@µ*$-- 4 -1 -1 5 Warnings: -Warning 1976 Cannot convert 'latin1' character 0xC3 to 'koi8r' +Warning 1977 Cannot convert 'latin1' character 0xC3 to 'koi8r' SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using koi8r) AS `CONVERT(my_char_30 USING koi8r)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2327,7 +2327,7 @@ NULL NULL 1 ---????????@??*$-- ---äÖüß@µ*$-- 4 -1 -1 5 Warnings: -Warning 1976 Cannot convert 'latin1' character 0xC3 to 'koi8r' +Warning 1977 Cannot convert 'latin1' character 0xC3 to 'koi8r' DROP VIEW v1; @@ -3413,7 +3413,7 @@ Warning 1292 Truncated incorrect DECIMAL value: '' Warning 1918 Encountered illegal value '' when converting to DECIMAL Warning 1292 Truncated incorrect DECIMAL value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1918 Encountered illegal value '' when converting to DECIMAL -Warning 1292 Truncated incorrect DECIMAL value: ' ---@*$-- ' +Warning 1292 Truncated incorrect DECIMAL value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- ' SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal(37,2)) AS `CAST(my_varbinary_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -3433,7 +3433,7 @@ Warning 1292 Truncated incorrect DECIMAL value: '' Warning 1918 Encountered illegal value '' when converting to DECIMAL Warning 1292 Truncated incorrect DECIMAL value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1918 Encountered illegal value '' when converting to DECIMAL -Warning 1292 Truncated incorrect DECIMAL value: ' ---@*$-- ' +Warning 1292 Truncated incorrect DECIMAL value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- ' DROP VIEW v1; @@ -3501,7 +3501,7 @@ Warning 1292 Truncated incorrect DECIMAL value: '' Warning 1918 Encountered illegal value '' when converting to DECIMAL Warning 1292 Truncated incorrect DECIMAL value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1918 Encountered illegal value '' when converting to DECIMAL -Warning 1292 Truncated incorrect DECIMAL value: ' ---@*$-- ' +Warning 1292 Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$-- ' SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal(37,2)) AS `CAST(my_varchar_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -3521,7 +3521,7 @@ Warning 1292 Truncated incorrect DECIMAL value: '' Warning 1918 Encountered illegal value '' when converting to DECIMAL Warning 1292 Truncated incorrect DECIMAL value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1918 Encountered illegal value '' when converting to DECIMAL -Warning 1292 Truncated incorrect DECIMAL value: ' ---@*$-- ' +Warning 1292 Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$-- ' DROP VIEW v1; diff --git a/mysql-test/suite/innodb/r/add_constraint.result b/mysql-test/suite/innodb/r/add_constraint.result new file mode 100644 index 00000000000..798e87a3761 --- /dev/null +++ b/mysql-test/suite/innodb/r/add_constraint.result @@ -0,0 +1,13 @@ +# +# Bug #20762798 FK DDL: CRASH IN DICT_FOREIGN_REMOVE_FROM_CACHE +# +create table t1(a int, b int, key(a),key(b))engine=innodb; +create table t2(a int, b int, key(a),key(b))engine=innodb; +alter table t2 add constraint b foreign key (b) references t1(a); +alter table t1 add constraint b1 foreign key (b) references t2(a); +alter table t2 add constraint b1 foreign key (b) references t1(a); +ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 121 "Duplicate key on write or update") +alter table t2 drop foreign key b; +alter table t1 drop foreign key b1; +drop table t2; +drop table t1; diff --git a/mysql-test/suite/innodb/r/innodb-alter-table.result b/mysql-test/suite/innodb/r/innodb-alter-table.result new file mode 100644 index 00000000000..2c76a2640e0 --- /dev/null +++ b/mysql-test/suite/innodb/r/innodb-alter-table.result @@ -0,0 +1,45 @@ +drop database if exists moodle19; +Warnings: +Note 1008 Can't drop database 'moodle19'; database doesn't exist +create database moodle19; +use moodle19; +CREATE TABLE `mdl_course_modules` ( +`id` bigint(10) NOT NULL AUTO_INCREMENT, +`course` bigint(10) NOT NULL DEFAULT '0', +`module` bigint(10) NOT NULL DEFAULT '0', +`instance` bigint(10) NOT NULL DEFAULT '0', +`section` bigint(10) NOT NULL DEFAULT '0', +`idnumber` varchar(100) DEFAULT NULL, +`added` bigint(10) NOT NULL DEFAULT '0', +`delay` varchar(10) NOT NULL DEFAULT '0', +`score` smallint(4) NOT NULL DEFAULT '0', +`indent` mediumint(5) NOT NULL DEFAULT '0', +`visible` tinyint(1) NOT NULL DEFAULT '1', +`checkboxesforprereqs` tinyint(1) NOT NULL DEFAULT '0', +`stylewhencomplete` varchar(200) DEFAULT '', +`checkboxforcomplete` tinyint(1) NOT NULL DEFAULT '0', +`stylewhenlocked` varchar(200) DEFAULT 'locked', +`visiblewhenlocked` tinyint(1) NOT NULL DEFAULT '1', +`visibleold` tinyint(1) NOT NULL DEFAULT '1', +`groupmode` smallint(4) NOT NULL DEFAULT '0', +`groupingid` bigint(10) NOT NULL DEFAULT '0', +`groupmembersonly` smallint(4) NOT NULL DEFAULT '0', +`completion` tinyint(1) NOT NULL DEFAULT '0', +`completiongradeitemnumber` bigint(10) DEFAULT NULL, +`completionview` tinyint(1) NOT NULL DEFAULT '0', +`completionexpected` bigint(10) NOT NULL DEFAULT '0', +`availablefrom` bigint(10) NOT NULL DEFAULT '0', +`availableuntil` bigint(10) NOT NULL DEFAULT '0', +`showavailability` tinyint(1) NOT NULL DEFAULT '0', +`showdescription` tinyint(1) NOT NULL DEFAULT '0', +PRIMARY KEY (`id`), +KEY `mdl_courmodu_vis_ix` (`visible`), +KEY `mdl_courmodu_cou_ix` (`course`), +KEY `mdl_courmodu_mod_ix` (`module`), +KEY `mdl_courmodu_ins_ix` (`instance`), +KEY `mdl_courmodu_idncou_ix` (`idnumber`,`course`), +KEY `mdl_courmodu_gro_ix` (`groupingid`) +) ENGINE=InnoDB AUTO_INCREMENT=447023 DEFAULT CHARSET=utf8 COMMENT='course_modules table retrofitted from MySQL'; +# Inserting 2701 rows into the table... +ALTER TABLE moodle19.mdl_course_modules ADD stefantest LONGTEXT CHARACTER SET utf8 COLLATE utf8_general_ci AFTER showdescription; +drop database moodle19; diff --git a/mysql-test/suite/innodb/r/innodb-alter-timestamp.result b/mysql-test/suite/innodb/r/innodb-alter-timestamp.result new file mode 100644 index 00000000000..2ab81136d1f --- /dev/null +++ b/mysql-test/suite/innodb/r/innodb-alter-timestamp.result @@ -0,0 +1,29 @@ +CREATE TABLE t1 ( +`i1` INT(10) UNSIGNED NOT NULL, +`d1` TIMESTAMP NULL DEFAULT NULL +) ENGINE=innodb; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `i1` int(10) unsigned NOT NULL, + `d1` timestamp NULL DEFAULT NULL +) ENGINE=InnoDB DEFAULT CHARSET=latin1 +INSERT INTO t1 (i1) VALUES (1), (2), (3), (4), (5); +select * from t1; +i1 d1 +1 NULL +2 NULL +3 NULL +4 NULL +5 NULL +set sql_mode = 'STRICT_ALL_TABLES,NO_ZERO_DATE'; +ALTER TABLE t1 CHANGE `d1` `d1` TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +drop table t1; +CREATE TABLE t1 ( +`i1` INT(10) UNSIGNED NOT NULL, +`d1` TIMESTAMP NULL DEFAULT NULL +) ENGINE=innodb; +INSERT INTO t1 (i1) VALUES (1), (2), (3), (4), (5); +ALTER TABLE t1 CHANGE `d1` `d1` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP; +drop table t1; +set sql_mode = ''; diff --git a/mysql-test/suite/innodb/r/innodb-fk-warnings.result b/mysql-test/suite/innodb/r/innodb-fk-warnings.result new file mode 100644 index 00000000000..a022f07936c --- /dev/null +++ b/mysql-test/suite/innodb/r/innodb-fk-warnings.result @@ -0,0 +1,112 @@ +CREATE TABLE t1 ( +id int(11) NOT NULL PRIMARY KEY, +a int(11) NOT NULL, +b int(11) NOT NULL, +c int not null, +CONSTRAINT test FOREIGN KEY (b) REFERENCES t1 (id) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +CREATE TABLE t2 ( +id int(11) NOT NULL PRIMARY KEY, +a int(11) NOT NULL, +b int(11) NOT NULL, +c int not null, +CONSTRAINT mytest FOREIGN KEY (c) REFERENCES t1(id), +CONSTRAINT test FOREIGN KEY (b) REFERENCES t2 (id) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +ERROR HY000: Can't create table `test`.`t2` (errno: 121 "Duplicate key on write or update") +show warnings; +Level Code Message +Warning 121 Create or Alter table `test`.`t2` with foreign key constraint failed. Foreign key constraint `test/test` already exists on data dictionary. Foreign key constraint names need to be unique in database. Error in foreign key definition: CONSTRAINT `test` FOREIGN KEY (`b`) REFERENCES `test`.`t2` (`id`). +Error 1005 Can't create table `test`.`t2` (errno: 121 "Duplicate key on write or update") +Warning 1022 Can't write; duplicate key in table 't2' +drop table t1; +create table t1(a int) engine=innodb; +create table t2(a int, constraint a foreign key a (a) references t1(a)) engine=innodb; +ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") +show warnings; +Level Code Message +Warning 150 Create table '`test`.`t2`' with foreign key constraint failed. There is no index in the referenced table where the referenced columns appear as the first columns. Error close to foreign key a (a) references t1(a)) engine=innodb. +Error 1005 Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") +Warning 1215 Cannot add foreign key constraint +drop table t1; +create table t1(a int not null primary key, b int) engine=innodb; +create table t2(a int, b int, constraint a foreign key a (a) references t1(a), +constraint a foreign key a (a) references t1(b)) engine=innodb; +ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") +show warnings; +Level Code Message +Error 1005 Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") +Warning 1215 Cannot add foreign key constraint +create table t2(a int, b int, constraint a foreign key a (a) references t1(a)) engine=innodb; +alter table t2 add constraint b foreign key (b) references t2(b); +ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed") +show warnings; +Level Code Message +Warning 150 Alter table '`test`.`t2`' with foreign key constraint failed. There is no index in the referenced table where the referenced columns appear as the first columns. Error close to foreign key (b) references t2(b). +Error 1005 Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed") +Warning 1215 Cannot add foreign key constraint +drop table t2, t1; +create table t1 (f1 integer primary key) engine=innodb; +alter table t1 add constraint c1 foreign key (f1) references t11(f1); +ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed") +show warnings; +Level Code Message +Warning 150 Alter table `test`.`t1` with foreign key constraint failed. Referenced table `test`.`t11` not found in the data dictionary close to foreign key (f1) references t11(f1). +Error 1005 Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed") +Warning 1215 Cannot add foreign key constraint +drop table t1; +create temporary table t1(a int not null primary key, b int, key(b)) engine=innodb; +create temporary table t2(a int, foreign key(a) references t1(a)) engine=innodb; +ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") +show warnings; +Level Code Message +Warning 150 Create table `mysqld.1`.`t2` with foreign key constraint failed. Referenced table `mysqld.1`.`t1` not found in the data dictionary close to foreign key(a) references t1(a)) engine=innodb. +Error 1005 Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") +Warning 1215 Cannot add foreign key constraint +alter table t1 add foreign key(b) references t1(a); +ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed") +show warnings; +Level Code Message +Warning 150 Alter table `mysqld.1`.`t1` with foreign key constraint failed. Referenced table `mysqld.1`.`t1` not found in the data dictionary close to foreign key(b) references t1(a). +Error 1005 Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed") +Warning 1215 Cannot add foreign key constraint +drop table t1; +create table t1(a int not null primary key, b int, key(b)) engine=innodb; +alter table t1 add foreign key(a,b) references t1(a); +ERROR 42000: Incorrect foreign key definition for 'foreign key without name': Key reference and table reference don't match +show warnings; +Level Code Message +Error 1239 Incorrect foreign key definition for 'foreign key without name': Key reference and table reference don't match +drop table t1; +create table t1(a int not null primary key, b int, key(b)) engine=innodb; +alter table t1 add foreign key(a) references t1(a,b); +ERROR 42000: Incorrect foreign key definition for 'foreign key without name': Key reference and table reference don't match +show warnings; +Level Code Message +Error 1239 Incorrect foreign key definition for 'foreign key without name': Key reference and table reference don't match +drop table t1; +create table t1 (f1 integer not null primary key) engine=innodb; +alter table t1 add constraint c1 foreign key (f1) references t1(f1) on update set null; +ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed") +show warnings; +Level Code Message +Warning 150 Alter table `test`.`t1` with foreign key constraint failed. You have defined a SET NULL condition but column f1 is defined as NOT NULL in foreign key (f1) references t1(f1) on update set null close to on update set null. +Error 1005 Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed") +Warning 1215 Cannot add foreign key constraint +create table t2(a int not null, foreign key(a) references t1(f1) on delete set null) engine=innodb; +ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") +show warnings; +Level Code Message +Warning 150 Create table `test`.`t2` with foreign key constraint failed. You have defined a SET NULL condition but column a is defined as NOT NULL in foreign key(a) references t1(f1) on delete set null) engine=innodb close to on delete set null) engine=innodb. +Error 1005 Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") +Warning 1215 Cannot add foreign key constraint +drop table t1; +create table t1 (id int not null primary key, f1 int, f2 int, key(f1)) engine=innodb; +create table t2(a char(20), key(a), foreign key(a) references t1(f1)) engine=innodb; +ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") +show warnings; +Level Code Message +Warning 150 Create table `test`.`t2` with foreign key constraint failed. Field type or character set for column a does not mach referenced column f1 close to foreign key(a) references t1(f1)) engine=innodb +Error 1005 Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") +Warning 1215 Cannot add foreign key constraint +drop table t1; diff --git a/mysql-test/suite/innodb/r/innodb-fk.result b/mysql-test/suite/innodb/r/innodb-fk.result index 956dbce58ed..dee20d282f7 100644 --- a/mysql-test/suite/innodb/r/innodb-fk.result +++ b/mysql-test/suite/innodb/r/innodb-fk.result @@ -50,6 +50,8 @@ CONSTRAINT fk3 FOREIGN KEY (f3) REFERENCES t3 (id) ON DELETE CASCADE ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") show warnings; Level Code Message +Warning 150 Create table `test`.`t2` with foreign key constraint failed. Referenced table `test`.`t3` not found in the data dictionary close to FOREIGN KEY (f3) REFERENCES t3 (id) ON DELETE CASCADE +) ENGINE=InnoDB. Error 1005 Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") Warning 1215 Cannot add foreign key constraint CREATE TABLE t2 ( @@ -63,6 +65,7 @@ ALTER TABLE t2 ADD CONSTRAINT fk3 FOREIGN KEY (f3) REFERENCES t3 (id) ON DELETE ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed") show warnings; Level Code Message +Warning 150 Alter table `test`.`t2` with foreign key constraint failed. Referenced table `test`.`t3` not found in the data dictionary close to FOREIGN KEY (f3) REFERENCES t3 (id) ON DELETE CASCADE. Error 1005 Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed") Warning 1215 Cannot add foreign key constraint drop table t2; diff --git a/mysql-test/suite/innodb/r/innodb_simulate_comp_failures.result b/mysql-test/suite/innodb/r/innodb_simulate_comp_failures.result index cb7a3b9c282..1cb2cf77050 100644 --- a/mysql-test/suite/innodb/r/innodb_simulate_comp_failures.result +++ b/mysql-test/suite/innodb/r/innodb_simulate_comp_failures.result @@ -5,4 +5,4 @@ CREATE TABLE t1(id INT AUTO_INCREMENT PRIMARY KEY, msg VARCHAR(255), KEY msg_i(m SET GLOBAL innodb_simulate_comp_failures = 25; SELECT COUNT(*) FROM t1; COUNT(*) -100000 +10000 diff --git a/mysql-test/suite/innodb/r/innodb_uninstall.result b/mysql-test/suite/innodb/r/innodb_uninstall.result new file mode 100644 index 00000000000..d0270c1cf3e --- /dev/null +++ b/mysql-test/suite/innodb/r/innodb_uninstall.result @@ -0,0 +1,26 @@ +install plugin innodb soname 'ha_innodb'; +Warnings: +Warning 1105 Cannot enable tc-log at run-time. XA features of InnoDB are disabled +create table t1(a int not null primary key) engine=innodb; +begin; +insert into t1 values(1); +flush tables; +uninstall plugin innodb; +select sleep(1); +sleep(1) +0 +Warnings: +Warning 1620 Plugin is busy and will be uninstalled on shutdown +drop table t1; +install plugin innodb soname 'ha_innodb'; +Warnings: +Warning 1105 Cannot enable tc-log at run-time. XA features of InnoDB are disabled +create table t2(a int not null primary key) engine=innodb; +insert into t2 values(1); +drop table t2; +uninstall plugin innodb; +select sleep(1); +sleep(1) +0 +Warnings: +Warning 1620 Plugin is busy and will be uninstalled on shutdown diff --git a/mysql-test/suite/innodb/t/add_constraint.test b/mysql-test/suite/innodb/t/add_constraint.test new file mode 100644 index 00000000000..7e86a7e5f97 --- /dev/null +++ b/mysql-test/suite/innodb/t/add_constraint.test @@ -0,0 +1,21 @@ +--source include/have_innodb.inc + +--echo # +--echo # Bug #20762798 FK DDL: CRASH IN DICT_FOREIGN_REMOVE_FROM_CACHE +--echo # + +create table t1(a int, b int, key(a),key(b))engine=innodb; +create table t2(a int, b int, key(a),key(b))engine=innodb; + +alter table t2 add constraint b foreign key (b) references t1(a); +alter table t1 add constraint b1 foreign key (b) references t2(a); + +--replace_regex /#sql-[0-9a-f_]*/#sql-temporary/ +--error ER_CANT_CREATE_TABLE +alter table t2 add constraint b1 foreign key (b) references t1(a); + +alter table t2 drop foreign key b; +alter table t1 drop foreign key b1; + +drop table t2; +drop table t1; diff --git a/mysql-test/suite/innodb/t/innodb-alter-table.test b/mysql-test/suite/innodb/t/innodb-alter-table.test new file mode 100644 index 00000000000..2be2a30194d --- /dev/null +++ b/mysql-test/suite/innodb/t/innodb-alter-table.test @@ -0,0 +1,59 @@ +--source include/have_innodb.inc + +# +# MMDEV-8386: MariaDB creates very big tmp file and hangs on xtradb +# +drop database if exists moodle19; +create database moodle19; +use moodle19; + +CREATE TABLE `mdl_course_modules` ( + `id` bigint(10) NOT NULL AUTO_INCREMENT, + `course` bigint(10) NOT NULL DEFAULT '0', + `module` bigint(10) NOT NULL DEFAULT '0', + `instance` bigint(10) NOT NULL DEFAULT '0', + `section` bigint(10) NOT NULL DEFAULT '0', + `idnumber` varchar(100) DEFAULT NULL, + `added` bigint(10) NOT NULL DEFAULT '0', + `delay` varchar(10) NOT NULL DEFAULT '0', + `score` smallint(4) NOT NULL DEFAULT '0', + `indent` mediumint(5) NOT NULL DEFAULT '0', + `visible` tinyint(1) NOT NULL DEFAULT '1', + `checkboxesforprereqs` tinyint(1) NOT NULL DEFAULT '0', + `stylewhencomplete` varchar(200) DEFAULT '', + `checkboxforcomplete` tinyint(1) NOT NULL DEFAULT '0', + `stylewhenlocked` varchar(200) DEFAULT 'locked', + `visiblewhenlocked` tinyint(1) NOT NULL DEFAULT '1', + `visibleold` tinyint(1) NOT NULL DEFAULT '1', + `groupmode` smallint(4) NOT NULL DEFAULT '0', + `groupingid` bigint(10) NOT NULL DEFAULT '0', + `groupmembersonly` smallint(4) NOT NULL DEFAULT '0', + `completion` tinyint(1) NOT NULL DEFAULT '0', + `completiongradeitemnumber` bigint(10) DEFAULT NULL, + `completionview` tinyint(1) NOT NULL DEFAULT '0', + `completionexpected` bigint(10) NOT NULL DEFAULT '0', + `availablefrom` bigint(10) NOT NULL DEFAULT '0', + `availableuntil` bigint(10) NOT NULL DEFAULT '0', + `showavailability` tinyint(1) NOT NULL DEFAULT '0', + `showdescription` tinyint(1) NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `mdl_courmodu_vis_ix` (`visible`), + KEY `mdl_courmodu_cou_ix` (`course`), + KEY `mdl_courmodu_mod_ix` (`module`), + KEY `mdl_courmodu_ins_ix` (`instance`), + KEY `mdl_courmodu_idncou_ix` (`idnumber`,`course`), + KEY `mdl_courmodu_gro_ix` (`groupingid`) +) ENGINE=InnoDB AUTO_INCREMENT=447023 DEFAULT CHARSET=utf8 COMMENT='course_modules table retrofitted from MySQL'; + +let $num= 2701; +--disable_query_log +--echo # Inserting $num rows into the table... +while ($num) +{ + eval INSERT INTO mdl_course_modules VALUES ($num,4,5,5,24,NULL,1141569781,'',0,0,1,0,'',0,'locked',1,1,0,0,0,0,NULL,0,0,0,0,0,0); + dec $num; +} +--enable_query_log +ALTER TABLE moodle19.mdl_course_modules ADD stefantest LONGTEXT CHARACTER SET utf8 COLLATE utf8_general_ci AFTER showdescription; + +drop database moodle19; diff --git a/mysql-test/suite/innodb/t/innodb-alter-timestamp.test b/mysql-test/suite/innodb/t/innodb-alter-timestamp.test new file mode 100644 index 00000000000..c0b17ee6440 --- /dev/null +++ b/mysql-test/suite/innodb/t/innodb-alter-timestamp.test @@ -0,0 +1,27 @@ +--source include/have_innodb.inc + +CREATE TABLE t1 ( + `i1` INT(10) UNSIGNED NOT NULL, + `d1` TIMESTAMP NULL DEFAULT NULL +) ENGINE=innodb; + +show create table t1; + +INSERT INTO t1 (i1) VALUES (1), (2), (3), (4), (5); +select * from t1; +set sql_mode = 'STRICT_ALL_TABLES,NO_ZERO_DATE'; +ALTER TABLE t1 CHANGE `d1` `d1` TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL; +drop table t1; + +CREATE TABLE t1 ( + `i1` INT(10) UNSIGNED NOT NULL, + `d1` TIMESTAMP NULL DEFAULT NULL +) ENGINE=innodb; +INSERT INTO t1 (i1) VALUES (1), (2), (3), (4), (5); +ALTER TABLE t1 CHANGE `d1` `d1` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP; +drop table t1; +set sql_mode = ''; + + + + diff --git a/mysql-test/suite/innodb/t/innodb-fk-warnings.test b/mysql-test/suite/innodb/t/innodb-fk-warnings.test new file mode 100644 index 00000000000..a95a7f55a40 --- /dev/null +++ b/mysql-test/suite/innodb/t/innodb-fk-warnings.test @@ -0,0 +1,145 @@ +--source include/have_innodb.inc + +# +# MDEV-8524: Improve error messaging when there is duplicate key or foreign key names +# +CREATE TABLE t1 ( + id int(11) NOT NULL PRIMARY KEY, + a int(11) NOT NULL, + b int(11) NOT NULL, + c int not null, + CONSTRAINT test FOREIGN KEY (b) REFERENCES t1 (id) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +# +# Below create table fails because constraint name test +# is reserved for above table. +# +--error 1005 +CREATE TABLE t2 ( + id int(11) NOT NULL PRIMARY KEY, + a int(11) NOT NULL, + b int(11) NOT NULL, + c int not null, + CONSTRAINT mytest FOREIGN KEY (c) REFERENCES t1(id), + CONSTRAINT test FOREIGN KEY (b) REFERENCES t2 (id) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +show warnings; + +drop table t1; + +# +# MDEV-6697: Improve foreign keys warnings/errors +# + +# +# No index for referenced columns +# +create table t1(a int) engine=innodb; +--error 1005 +create table t2(a int, constraint a foreign key a (a) references t1(a)) engine=innodb; +show warnings; +drop table t1; + +create table t1(a int not null primary key, b int) engine=innodb; +--error 1005 +create table t2(a int, b int, constraint a foreign key a (a) references t1(a), +constraint a foreign key a (a) references t1(b)) engine=innodb; +show warnings; +create table t2(a int, b int, constraint a foreign key a (a) references t1(a)) engine=innodb; +--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +--error 1005 +alter table t2 add constraint b foreign key (b) references t2(b); +--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +show warnings; +drop table t2, t1; + +# +# Referenced table does not exists +# + +create table t1 (f1 integer primary key) engine=innodb; +--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +--error 1005 +alter table t1 add constraint c1 foreign key (f1) references t11(f1); +--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +show warnings; +drop table t1; + +# +# Foreign key on temporal tables +# + +create temporary table t1(a int not null primary key, b int, key(b)) engine=innodb; +# remove echos and uncomment the commented when MDEV-8569 is fixed +--echo create temporary table t2(a int, foreign key(a) references t1(a)) engine=innodb; +--echo ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") +--echo show warnings; +--echo Level Code Message +--echo Warning 150 Create table `mysqld.1`.`t2` with foreign key constraint failed. Referenced table `mysqld.1`.`t1` not found in the data dictionary close to foreign key(a) references t1(a)) engine=innodb. +--echo Error 1005 Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") +--echo Warning 1215 Cannot add foreign key constraint +--echo alter table t1 add foreign key(b) references t1(a); +--echo ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed") +--echo show warnings; +--echo Level Code Message +--echo Warning 150 Alter table `mysqld.1`.`t1` with foreign key constraint failed. Referenced table `mysqld.1`.`t1` not found in the data dictionary close to foreign key(b) references t1(a). +--echo Error 1005 Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed") +--echo Warning 1215 Cannot add foreign key constraint +#--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +#--error 1005 +#create temporary table t2(a int, foreign key(a) references t1(a)) engine=innodb; +#--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +#show warnings; +#--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +#--error 1005 +#alter table t1 add foreign key(b) references t1(a); +#--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +#show warnings; +drop table t1; + +# +# Column numbers do not match +# +create table t1(a int not null primary key, b int, key(b)) engine=innodb; +--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +--error 1239 +alter table t1 add foreign key(a,b) references t1(a); +--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +show warnings; +drop table t1; +create table t1(a int not null primary key, b int, key(b)) engine=innodb; +--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +--error 1239 +alter table t1 add foreign key(a) references t1(a,b); +--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +show warnings; +drop table t1; + +# +# ON UPDATE/DELETE SET NULL on NOT NULL column +# +create table t1 (f1 integer not null primary key) engine=innodb; +--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +--error 1005 +alter table t1 add constraint c1 foreign key (f1) references t1(f1) on update set null; +--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +show warnings; +--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +--error 1005 +create table t2(a int not null, foreign key(a) references t1(f1) on delete set null) engine=innodb; +--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +show warnings; +drop table t1; + +# +# Incorrect types +# +create table t1 (id int not null primary key, f1 int, f2 int, key(f1)) engine=innodb; +--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +--error 1005 +create table t2(a char(20), key(a), foreign key(a) references t1(f1)) engine=innodb; +--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ +show warnings; +drop table t1; diff --git a/mysql-test/suite/innodb/t/innodb_simulate_comp_failures.test b/mysql-test/suite/innodb/t/innodb_simulate_comp_failures.test index a940a926f85..ae9e0a9b984 100644 --- a/mysql-test/suite/innodb/t/innodb_simulate_comp_failures.test +++ b/mysql-test/suite/innodb/t/innodb_simulate_comp_failures.test @@ -1,8 +1,8 @@ --source include/big_test.inc # test takes too long with valgrind --source include/not_valgrind.inc ---let $num_inserts = 100000 ---let $num_ops = 30000 +--let $num_inserts = 10000 +--let $num_ops = 10000 --source suite/innodb/include/innodb_simulate_comp_failures.inc # clean exit --exit diff --git a/mysql-test/suite/innodb/t/innodb_uninstall.opt b/mysql-test/suite/innodb/t/innodb_uninstall.opt new file mode 100644 index 00000000000..918855a7b01 --- /dev/null +++ b/mysql-test/suite/innodb/t/innodb_uninstall.opt @@ -0,0 +1,3 @@ +--ignore-builtin-innodb +--loose-innodb + diff --git a/mysql-test/suite/innodb/t/innodb_uninstall.test b/mysql-test/suite/innodb/t/innodb_uninstall.test new file mode 100644 index 00000000000..34fc8345a02 --- /dev/null +++ b/mysql-test/suite/innodb/t/innodb_uninstall.test @@ -0,0 +1,58 @@ +--source include/not_embedded.inc +--source include/not_windows.inc + +if (!$HA_INNODB_SO) { + --skip Need InnoDB plugin +} + +# +# MDEV-8474: InnoDB sets per-connection data unsafely +# Below test caused hang +# +install plugin innodb soname 'ha_innodb'; +create table t1(a int not null primary key) engine=innodb; + +connect (con1, localhost, root); +connection con1; +begin; +insert into t1 values(1); + +connection default; +flush tables; +send uninstall plugin innodb; + +connection con1; +select sleep(1); +disconnect con1; + +connection default; +reap; + +--source include/restart_mysqld.inc + +drop table t1; + +# +# Another test that caused hang. +# + +connect (con1, localhost, root); +connection con1; +install plugin innodb soname 'ha_innodb'; +create table t2(a int not null primary key) engine=innodb; +insert into t2 values(1); +drop table t2; + +connection default; +send uninstall plugin innodb; + +connection con1; +select sleep(1); +disconnect con1; + +connection default; +reap; + +--source include/restart_mysqld.inc + + diff --git a/mysql-test/suite/ndb/r/ndb_restore_discover.result b/mysql-test/suite/ndb/r/ndb_restore_discover.result new file mode 100644 index 00000000000..de10af87047 --- /dev/null +++ b/mysql-test/suite/ndb/r/ndb_restore_discover.result @@ -0,0 +1,33 @@ +# +# 18075170 - sql node restart required to avoid deadlock after +# restore +# +CREATE TABLE t1 (id INT) ENGINE=NDBCluster; +CREATE TABLE t2 (id INT) ENGINE=NDBCluster; +INSERT INTO t1 VALUES (1); +INSERT INTO t2 VALUES (1); +DROP TABLE t1; +DROP TABLE t2; +SET autocommit = 0; +SELECT * FROM t1; +id +1 +SELECT * FROM t2; +id +1 +ROLLBACK; +SET autocommit = 1; +drop table t1; +drop table t2; +SET autocommit = 0; +SELECT * FROM t1; +id +1 +SELECT * FROM t2; +id +1 +ALTER TABLE t1 ADD val INT; +ROLLBACK; +SET autocommit = 1; +drop table t1; +drop table t2; diff --git a/mysql-test/suite/ndb/t/ndb_restore_discover.test b/mysql-test/suite/ndb/t/ndb_restore_discover.test new file mode 100644 index 00000000000..6631c74d5c8 --- /dev/null +++ b/mysql-test/suite/ndb/t/ndb_restore_discover.test @@ -0,0 +1,70 @@ +-- source include/have_ndb.inc +-- source include/count_sessions.inc + +--echo # +--echo # 18075170 - sql node restart required to avoid deadlock after +--echo # restore +--echo # +# Test Auto Discover option within a transaction +# and make sure the transaction is not broken. +CREATE TABLE t1 (id INT) ENGINE=NDBCluster; +CREATE TABLE t2 (id INT) ENGINE=NDBCluster; + +INSERT INTO t1 VALUES (1); +INSERT INTO t2 VALUES (1); + +-- source include/ndb_backup.inc + +DROP TABLE t1; +DROP TABLE t2; + +-- source include/ndb_restore_master.inc + +SET autocommit = 0; +SELECT * FROM t1; + +# Without fix below select was resulting in DEADLOCK error. With fix select +# should succeed. +SELECT * FROM t2; +ROLLBACK; +SET autocommit = 1; + +drop table t1; +drop table t2; + +# +# Checking lock preservation in transaction +# +# Using existing backup to create the scenario. Tables are deleted as part of +# above test cleanup. Thus restoring the backup will bring the system to +# required state. +-- source include/ndb_restore_master.inc + +SET autocommit = 0; +SELECT * FROM t1; +SELECT * FROM t2; + +connect(con2, localhost, root); +--SEND ALTER TABLE t1 ADD val INT + +connection default; +# Alter from con2 will be in waiting state as there is a lock on t1 from +# default connection due to active transaction. We check for this condition +# then releasing the lock by rollbacking active transaction. +let $wait_condition= + SELECT count(*) = 1 FROM information_schema.processlist WHERE state + LIKE "Waiting%" AND info = "ALTER TABLE t1 ADD val INT"; +--source include/wait_condition.inc +ROLLBACK; +SET autocommit = 1; + +connection con2; +--REAP + +disconnect con2; +connection default; +drop table t1; +drop table t2; + +# Wait till all disconnects are completed +-- source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/perfschema/r/digest_null_literal.result b/mysql-test/suite/perfschema/r/digest_null_literal.result index b0cefbbbaaf..a595c3f541b 100644 --- a/mysql-test/suite/perfschema/r/digest_null_literal.result +++ b/mysql-test/suite/perfschema/r/digest_null_literal.result @@ -16,12 +16,12 @@ NULL NULL NULL 1 2 3 NULL NULL SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR FROM performance_schema.events_statements_summary_by_digest; SCHEMA_NAME DIGEST_TEXT COUNT_STAR -test TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 +test TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 test SELECT ? 1 test SELECT ? FROM DUAL 1 test SELECT ?, ... 2 test SELECT ? IS NULL 1 test SELECT ? IS NOT NULL 1 test SELECT ? IS NULL , ? IS NULL , ? IS NOT NULL , ? IS NOT NULL 1 -test CREATE TABLE foo ( a INTEGER DEFAULT ? , b INTEGER NOT NULL DEFAULT ? , c INTEGER NOT NULL ) 1 -test DROP TABLE foo 1 +test CREATE TABLE `foo` ( `a` INTEGER DEFAULT ? , `b` INTEGER NOT NULL DEFAULT ? , `c` INTEGER NOT NULL ) 1 +test DROP TABLE `foo` 1 diff --git a/mysql-test/suite/perfschema/r/digest_table_full.result b/mysql-test/suite/perfschema/r/digest_table_full.result index 4c7de82abc2..f52b78c9f7d 100644 --- a/mysql-test/suite/perfschema/r/digest_table_full.result +++ b/mysql-test/suite/perfschema/r/digest_table_full.result @@ -113,7 +113,7 @@ SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS, SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest; SCHEMA_NAME DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS NULL NULL 55 32 1 2 -statements_digest TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0 +statements_digest TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 0 0 0 SHOW VARIABLES LIKE "performance_schema_digests_size"; Variable_name Value performance_schema_digests_size 2 diff --git a/mysql-test/suite/perfschema/r/global_read_lock.result b/mysql-test/suite/perfschema/r/global_read_lock.result index d71bcf81ea7..f7ff4382261 100644 --- a/mysql-test/suite/perfschema/r/global_read_lock.result +++ b/mysql-test/suite/perfschema/r/global_read_lock.result @@ -20,11 +20,13 @@ lock tables performance_schema.setup_instruments write; connection default; select event_name, left(source, locate(":", source)) as short_source, -timer_end, timer_wait, operation +if(timer_end IS NULL, NULL, "SET") as timer_end, +if(timer_wait IS NULL, NULL, "SET") as timer_wait, +operation from performance_schema.events_waits_current where event_name like "wait/synch/cond/sql/MDL_context::COND_wait_status"; event_name short_source timer_end timer_wait operation -wait/synch/cond/sql/MDL_context::COND_wait_status mdl.cc: NULL NULL timed_wait +wait/synch/cond/sql/MDL_context::COND_wait_status mdl.cc: SET SET timed_wait unlock tables; update performance_schema.setup_instruments set enabled='NO'; update performance_schema.setup_instruments set enabled='YES'; diff --git a/mysql-test/suite/perfschema/r/ortho_iter.result b/mysql-test/suite/perfschema/r/ortho_iter.result index 9081bfe5882..bb572237483 100644 --- a/mysql-test/suite/perfschema/r/ortho_iter.result +++ b/mysql-test/suite/perfschema/r/ortho_iter.result @@ -110,6 +110,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/privilege_table_io.result b/mysql-test/suite/perfschema/r/privilege_table_io.result index 126b2a58fae..f1f0946cb90 100644 --- a/mysql-test/suite/perfschema/r/privilege_table_io.result +++ b/mysql-test/suite/perfschema/r/privilege_table_io.result @@ -38,6 +38,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/rpl_gtid_func.result b/mysql-test/suite/perfschema/r/rpl_gtid_func.result index 86c8347addd..d5f764013df 100644 --- a/mysql-test/suite/perfschema/r/rpl_gtid_func.result +++ b/mysql-test/suite/perfschema/r/rpl_gtid_func.result @@ -37,7 +37,7 @@ select digest_text, count_star from performance_schema.events_statements_summary_by_digest where digest_text like "%in_%_digest%"; digest_text count_star -SELECT ? AS in_master_digest 1 +SELECT ? AS `in_master_digest` 1 insert into test.marker values (2); **** On Slave **** select * from test.marker; @@ -64,7 +64,7 @@ select digest_text, count_star from performance_schema.events_statements_summary_by_digest where digest_text like "%in_%_digest%"; digest_text count_star -SELECT ? AS in_slave_digest 1 +SELECT ? AS `in_slave_digest` 1 **** On Master **** delete from performance_schema.setup_objects where object_schema='master'; diff --git a/mysql-test/suite/perfschema/r/rpl_statements.result b/mysql-test/suite/perfschema/r/rpl_statements.result index 4e1f03643f1..081710f1d54 100644 --- a/mysql-test/suite/perfschema/r/rpl_statements.result +++ b/mysql-test/suite/perfschema/r/rpl_statements.result @@ -98,20 +98,20 @@ drop database marker2_db; select thread_id, event_id, rpad(event_name, 28, ' ') event_name, rpad(current_schema, 10, ' ') current_schema, rpad(digest_text, 72, ' ') digest_text, sql_text from performance_schema.events_statements_history_long where sql_text like '%marker%' order by event_id; thread_id event_id event_name current_schema digest_text sql_text -[THREAD_ID] [EVENT_ID] statement/sql/create_db test CREATE SCHEMA marker1_db create database marker1_db -[THREAD_ID] [EVENT_ID] statement/sql/create_db test CREATE SCHEMA marker2_db create database marker2_db -[THREAD_ID] [EVENT_ID] statement/sql/create_table test CREATE TABLE marker1_db . table1 ( s1 INTEGER ) ENGINE = innodb create table marker1_db.table1 (s1 int) engine=innodb -[THREAD_ID] [EVENT_ID] statement/sql/create_table test CREATE TABLE marker2_db . table1 ( s1 INTEGER ) ENGINE = innodb create table marker2_db.table1 (s1 int) engine=innodb -[THREAD_ID] [EVENT_ID] statement/sql/create_table test CREATE TABLE marker2_db . table2 ( s1 INTEGER ) ENGINE = innodb create table marker2_db.table2 (s1 int) engine=innodb -[THREAD_ID] [EVENT_ID] statement/sql/insert test INSERT INTO marker1_db . table1 VALUES (?) /* , ... */ insert into marker1_db.table1 values (1), (2), (3) -[THREAD_ID] [EVENT_ID] statement/sql/insert test INSERT INTO marker2_db . table1 VALUES (?) /* , ... */ insert into marker2_db.table1 values (1), (2), (3) -[THREAD_ID] [EVENT_ID] statement/sql/alter_table test ALTER TABLE marker1_db . table1 ADD COLUMN ( s2 VARCHARACTER (?) ) alter table marker1_db.table1 add column (s2 varchar(32)) -[THREAD_ID] [EVENT_ID] statement/sql/insert test INSERT INTO marker1_db . table1 VALUES (...) /* , ... */ insert into marker1_db.table1 values (4, 'four'), (5, 'five'), (6, 'six') -[THREAD_ID] [EVENT_ID] statement/sql/update test UPDATE marker1_db . table1 SET s1 = s1 + ? update marker1_db.table1 set s1 = s1 + 1 -[THREAD_ID] [EVENT_ID] statement/sql/insert test INSERT INTO marker1_db . table1 VALUES (...) /* , ... */ insert into marker1_db.table1 values (7, 'seven'), (8, 'eight'), (9, 'nine') -[THREAD_ID] [EVENT_ID] statement/sql/delete test DELETE FROM marker1_db . table1 WHERE s1 > ? delete from marker1_db.table1 where s1 > 4 -[THREAD_ID] [EVENT_ID] statement/sql/drop_table test DROP TABLE marker2_db . table1 drop table marker2_db.table1 -[THREAD_ID] [EVENT_ID] statement/sql/drop_db test DROP SCHEMA marker2_db drop database marker2_db +[THREAD_ID] [EVENT_ID] statement/sql/create_db test CREATE SCHEMA `marker1_db` create database marker1_db +[THREAD_ID] [EVENT_ID] statement/sql/create_db test CREATE SCHEMA `marker2_db` create database marker2_db +[THREAD_ID] [EVENT_ID] statement/sql/create_table test CREATE TABLE `marker1_db` . `table1` ( `s1` INTEGER ) ENGINE = `innodb` create table marker1_db.table1 (s1 int) engine=innodb +[THREAD_ID] [EVENT_ID] statement/sql/create_table test CREATE TABLE `marker2_db` . `table1` ( `s1` INTEGER ) ENGINE = `innodb` create table marker2_db.table1 (s1 int) engine=innodb +[THREAD_ID] [EVENT_ID] statement/sql/create_table test CREATE TABLE `marker2_db` . `table2` ( `s1` INTEGER ) ENGINE = `innodb` create table marker2_db.table2 (s1 int) engine=innodb +[THREAD_ID] [EVENT_ID] statement/sql/insert test INSERT INTO `marker1_db` . `table1` VALUES (?) /* , ... */ insert into marker1_db.table1 values (1), (2), (3) +[THREAD_ID] [EVENT_ID] statement/sql/insert test INSERT INTO `marker2_db` . `table1` VALUES (?) /* , ... */ insert into marker2_db.table1 values (1), (2), (3) +[THREAD_ID] [EVENT_ID] statement/sql/alter_table test ALTER TABLE `marker1_db` . `table1` ADD COLUMN ( `s2` VARCHARACTER (?) ) alter table marker1_db.table1 add column (s2 varchar(32)) +[THREAD_ID] [EVENT_ID] statement/sql/insert test INSERT INTO `marker1_db` . `table1` VALUES (...) /* , ... */ insert into marker1_db.table1 values (4, 'four'), (5, 'five'), (6, 'six') +[THREAD_ID] [EVENT_ID] statement/sql/update test UPDATE `marker1_db` . `table1` SET `s1` = `s1` + ? update marker1_db.table1 set s1 = s1 + 1 +[THREAD_ID] [EVENT_ID] statement/sql/insert test INSERT INTO `marker1_db` . `table1` VALUES (...) /* , ... */ insert into marker1_db.table1 values (7, 'seven'), (8, 'eight'), (9, 'nine') +[THREAD_ID] [EVENT_ID] statement/sql/delete test DELETE FROM `marker1_db` . `table1` WHERE `s1` > ? delete from marker1_db.table1 where s1 > 4 +[THREAD_ID] [EVENT_ID] statement/sql/drop_table test DROP TABLE `marker2_db` . `table1` drop table marker2_db.table1 +[THREAD_ID] [EVENT_ID] statement/sql/drop_db test DROP SCHEMA `marker2_db` drop database marker2_db # # STEP 4 - REPLICATE STATEMENT EVENTS ON MASTER TO SLAVE @@ -138,39 +138,39 @@ where (thread_id=@my_thread_id and digest_text like '%marker%')); select thread_id, event_id, rpad(event_name, 28, ' ') event_name, rpad(current_schema, 10, ' ') current_schema, rpad(digest_text, 72, ' ') digest_text, sql_text from master_events_statements_history_long order by event_id; thread_id event_id event_name current_schema digest_text sql_text -[THREAD_ID] [EVENT_ID] statement/sql/create_db test CREATE SCHEMA marker1_db create database marker1_db -[THREAD_ID] [EVENT_ID] statement/sql/create_db test CREATE SCHEMA marker2_db create database marker2_db -[THREAD_ID] [EVENT_ID] statement/sql/create_table test CREATE TABLE marker1_db . table1 ( s1 INTEGER ) ENGINE = innodb create table marker1_db.table1 (s1 int) engine=innodb -[THREAD_ID] [EVENT_ID] statement/sql/create_table test CREATE TABLE marker2_db . table1 ( s1 INTEGER ) ENGINE = innodb create table marker2_db.table1 (s1 int) engine=innodb -[THREAD_ID] [EVENT_ID] statement/sql/create_table test CREATE TABLE marker2_db . table2 ( s1 INTEGER ) ENGINE = innodb create table marker2_db.table2 (s1 int) engine=innodb -[THREAD_ID] [EVENT_ID] statement/sql/insert test INSERT INTO marker1_db . table1 VALUES (?) /* , ... */ insert into marker1_db.table1 values (1), (2), (3) -[THREAD_ID] [EVENT_ID] statement/sql/insert test INSERT INTO marker2_db . table1 VALUES (?) /* , ... */ insert into marker2_db.table1 values (1), (2), (3) -[THREAD_ID] [EVENT_ID] statement/sql/alter_table test ALTER TABLE marker1_db . table1 ADD COLUMN ( s2 VARCHARACTER (?) ) alter table marker1_db.table1 add column (s2 varchar(32)) -[THREAD_ID] [EVENT_ID] statement/sql/insert test INSERT INTO marker1_db . table1 VALUES (...) /* , ... */ insert into marker1_db.table1 values (4, 'four'), (5, 'five'), (6, 'six') -[THREAD_ID] [EVENT_ID] statement/sql/update test UPDATE marker1_db . table1 SET s1 = s1 + ? update marker1_db.table1 set s1 = s1 + 1 -[THREAD_ID] [EVENT_ID] statement/sql/insert test INSERT INTO marker1_db . table1 VALUES (...) /* , ... */ insert into marker1_db.table1 values (7, 'seven'), (8, 'eight'), (9, 'nine') -[THREAD_ID] [EVENT_ID] statement/sql/delete test DELETE FROM marker1_db . table1 WHERE s1 > ? delete from marker1_db.table1 where s1 > 4 -[THREAD_ID] [EVENT_ID] statement/sql/drop_table test DROP TABLE marker2_db . table1 drop table marker2_db.table1 -[THREAD_ID] [EVENT_ID] statement/sql/drop_db test DROP SCHEMA marker2_db drop database marker2_db +[THREAD_ID] [EVENT_ID] statement/sql/create_db test CREATE SCHEMA `marker1_db` create database marker1_db +[THREAD_ID] [EVENT_ID] statement/sql/create_db test CREATE SCHEMA `marker2_db` create database marker2_db +[THREAD_ID] [EVENT_ID] statement/sql/create_table test CREATE TABLE `marker1_db` . `table1` ( `s1` INTEGER ) ENGINE = `innodb` create table marker1_db.table1 (s1 int) engine=innodb +[THREAD_ID] [EVENT_ID] statement/sql/create_table test CREATE TABLE `marker2_db` . `table1` ( `s1` INTEGER ) ENGINE = `innodb` create table marker2_db.table1 (s1 int) engine=innodb +[THREAD_ID] [EVENT_ID] statement/sql/create_table test CREATE TABLE `marker2_db` . `table2` ( `s1` INTEGER ) ENGINE = `innodb` create table marker2_db.table2 (s1 int) engine=innodb +[THREAD_ID] [EVENT_ID] statement/sql/insert test INSERT INTO `marker1_db` . `table1` VALUES (?) /* , ... */ insert into marker1_db.table1 values (1), (2), (3) +[THREAD_ID] [EVENT_ID] statement/sql/insert test INSERT INTO `marker2_db` . `table1` VALUES (?) /* , ... */ insert into marker2_db.table1 values (1), (2), (3) +[THREAD_ID] [EVENT_ID] statement/sql/alter_table test ALTER TABLE `marker1_db` . `table1` ADD COLUMN ( `s2` VARCHARACTER (?) ) alter table marker1_db.table1 add column (s2 varchar(32)) +[THREAD_ID] [EVENT_ID] statement/sql/insert test INSERT INTO `marker1_db` . `table1` VALUES (...) /* , ... */ insert into marker1_db.table1 values (4, 'four'), (5, 'five'), (6, 'six') +[THREAD_ID] [EVENT_ID] statement/sql/update test UPDATE `marker1_db` . `table1` SET `s1` = `s1` + ? update marker1_db.table1 set s1 = s1 + 1 +[THREAD_ID] [EVENT_ID] statement/sql/insert test INSERT INTO `marker1_db` . `table1` VALUES (...) /* , ... */ insert into marker1_db.table1 values (7, 'seven'), (8, 'eight'), (9, 'nine') +[THREAD_ID] [EVENT_ID] statement/sql/delete test DELETE FROM `marker1_db` . `table1` WHERE `s1` > ? delete from marker1_db.table1 where s1 > 4 +[THREAD_ID] [EVENT_ID] statement/sql/drop_table test DROP TABLE `marker2_db` . `table1` drop table marker2_db.table1 +[THREAD_ID] [EVENT_ID] statement/sql/drop_db test DROP SCHEMA `marker2_db` drop database marker2_db *** List statement events on slave select thread_id, event_id, rpad(event_name, 28, ' ') event_name, rpad(current_schema, 10, ' ') current_schema, rpad(digest_text, 72, ' ') digest_text, sql_text from performance_schema.events_statements_history_long where thread_id = @slave_thread_id and sql_text like '%marker%' order by event_id; thread_id event_id event_name current_schema digest_text sql_text -[THREAD_ID] [EVENT_ID] statement/sql/create_db marker1_db CREATE SCHEMA marker1_db create database marker1_db -[THREAD_ID] [EVENT_ID] statement/sql/create_db marker2_db CREATE SCHEMA marker2_db create database marker2_db -[THREAD_ID] [EVENT_ID] statement/sql/create_table test CREATE TABLE marker1_db . table1 ( s1 INTEGER ) ENGINE = innodb create table marker1_db.table1 (s1 int) engine=innodb -[THREAD_ID] [EVENT_ID] statement/sql/create_table test CREATE TABLE marker2_db . table1 ( s1 INTEGER ) ENGINE = innodb create table marker2_db.table1 (s1 int) engine=innodb -[THREAD_ID] [EVENT_ID] statement/sql/create_table test CREATE TABLE marker2_db . table2 ( s1 INTEGER ) ENGINE = innodb create table marker2_db.table2 (s1 int) engine=innodb -[THREAD_ID] [EVENT_ID] statement/sql/insert test INSERT INTO marker1_db . table1 VALUES (?) /* , ... */ insert into marker1_db.table1 values (1), (2), (3) -[THREAD_ID] [EVENT_ID] statement/sql/insert test INSERT INTO marker2_db . table1 VALUES (?) /* , ... */ insert into marker2_db.table1 values (1), (2), (3) -[THREAD_ID] [EVENT_ID] statement/sql/alter_table test ALTER TABLE marker1_db . table1 ADD COLUMN ( s2 VARCHARACTER (?) ) alter table marker1_db.table1 add column (s2 varchar(32)) -[THREAD_ID] [EVENT_ID] statement/sql/insert test INSERT INTO marker1_db . table1 VALUES (...) /* , ... */ insert into marker1_db.table1 values (4, 'four'), (5, 'five'), (6, 'six') -[THREAD_ID] [EVENT_ID] statement/sql/update test UPDATE marker1_db . table1 SET s1 = s1 + ? update marker1_db.table1 set s1 = s1 + 1 -[THREAD_ID] [EVENT_ID] statement/sql/delete test DELETE FROM marker1_db . table1 WHERE s1 > ? delete from marker1_db.table1 where s1 > 4 +[THREAD_ID] [EVENT_ID] statement/sql/create_db marker1_db CREATE SCHEMA `marker1_db` create database marker1_db +[THREAD_ID] [EVENT_ID] statement/sql/create_db marker2_db CREATE SCHEMA `marker2_db` create database marker2_db +[THREAD_ID] [EVENT_ID] statement/sql/create_table test CREATE TABLE `marker1_db` . `table1` ( `s1` INTEGER ) ENGINE = `innodb` create table marker1_db.table1 (s1 int) engine=innodb +[THREAD_ID] [EVENT_ID] statement/sql/create_table test CREATE TABLE `marker2_db` . `table1` ( `s1` INTEGER ) ENGINE = `innodb` create table marker2_db.table1 (s1 int) engine=innodb +[THREAD_ID] [EVENT_ID] statement/sql/create_table test CREATE TABLE `marker2_db` . `table2` ( `s1` INTEGER ) ENGINE = `innodb` create table marker2_db.table2 (s1 int) engine=innodb +[THREAD_ID] [EVENT_ID] statement/sql/insert test INSERT INTO `marker1_db` . `table1` VALUES (?) /* , ... */ insert into marker1_db.table1 values (1), (2), (3) +[THREAD_ID] [EVENT_ID] statement/sql/insert test INSERT INTO `marker2_db` . `table1` VALUES (?) /* , ... */ insert into marker2_db.table1 values (1), (2), (3) +[THREAD_ID] [EVENT_ID] statement/sql/alter_table test ALTER TABLE `marker1_db` . `table1` ADD COLUMN ( `s2` VARCHARACTER (?) ) alter table marker1_db.table1 add column (s2 varchar(32)) +[THREAD_ID] [EVENT_ID] statement/sql/insert test INSERT INTO `marker1_db` . `table1` VALUES (...) /* , ... */ insert into marker1_db.table1 values (4, 'four'), (5, 'five'), (6, 'six') +[THREAD_ID] [EVENT_ID] statement/sql/update test UPDATE `marker1_db` . `table1` SET `s1` = `s1` + ? update marker1_db.table1 set s1 = s1 + 1 +[THREAD_ID] [EVENT_ID] statement/sql/delete test DELETE FROM `marker1_db` . `table1` WHERE `s1` > ? delete from marker1_db.table1 where s1 > 4 [THREAD_ID] [EVENT_ID] statement/sql/drop_table test DROP TABLE `marker2_db` . `table1` DROP TABLE `marker2_db`.`table1` /* generated by server */ -[THREAD_ID] [EVENT_ID] statement/sql/drop_db marker2_db DROP SCHEMA marker2_db drop database marker2_db +[THREAD_ID] [EVENT_ID] statement/sql/drop_db marker2_db DROP SCHEMA `marker2_db` drop database marker2_db *** Compare master and slave events @@ -190,7 +190,6 @@ where t1.thread_id = @slave_thread_id and sql_text like '%marker%' and not exists (select * from master_events_statements_history_long t2 where t2.digest = t1.digest); thread_id event_id event_name digest digest_text sql_text -[THREAD_ID] [EVENT_ID] statement/sql/drop_table [DIGEST] DROP TABLE `marker2_db` . `table1` DROP TABLE `marker2_db`.`table1` /* generated by server */ # # STEP 6 - DISABLE REPLICATED STATEMENT EVENTS ON SLAVE diff --git a/mysql-test/suite/perfschema/r/sizing_default.result b/mysql-test/suite/perfschema/r/sizing_default.result index d7c4e321204..1ca202e821f 100644 --- a/mysql-test/suite/perfschema/r/sizing_default.result +++ b/mysql-test/suite/perfschema/r/sizing_default.result @@ -23,6 +23,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 3504 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 7693 diff --git a/mysql-test/suite/perfschema/r/sizing_high.result b/mysql-test/suite/perfschema/r/sizing_high.result index c7c7b065992..b633d5fce8d 100644 --- a/mysql-test/suite/perfschema/r/sizing_high.result +++ b/mysql-test/suite/perfschema/r/sizing_high.result @@ -23,6 +23,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 10900 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 23385 diff --git a/mysql-test/suite/perfschema/r/sizing_low.result b/mysql-test/suite/perfschema/r/sizing_low.result index 213cc0b5f74..dce5a994099 100644 --- a/mysql-test/suite/perfschema/r/sizing_low.result +++ b/mysql-test/suite/perfschema/r/sizing_low.result @@ -23,6 +23,7 @@ performance_schema_events_waits_history_size 5 performance_schema_hosts_size 20 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 612 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 1556 diff --git a/mysql-test/suite/perfschema/r/sizing_med.result b/mysql-test/suite/perfschema/r/sizing_med.result index fbe703c5ff5..2eda017467a 100644 --- a/mysql-test/suite/perfschema/r/sizing_med.result +++ b/mysql-test/suite/perfschema/r/sizing_med.result @@ -23,6 +23,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1079 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 1754 diff --git a/mysql-test/suite/perfschema/r/sizing_off.result b/mysql-test/suite/perfschema/r/sizing_off.result index 614ad7d2475..b4ca7b1b9be 100644 --- a/mysql-test/suite/perfschema/r/sizing_off.result +++ b/mysql-test/suite/perfschema/r/sizing_off.result @@ -14,6 +14,7 @@ performance_schema_events_waits_history_size -1 performance_schema_hosts_size -1 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances -1 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances -1 diff --git a/mysql-test/suite/perfschema/r/start_server_disable_idle.result b/mysql-test/suite/perfschema/r/start_server_disable_idle.result index 9e0b9209b89..382824458a0 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_idle.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_idle.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_disable_stages.result b/mysql-test/suite/perfschema/r/start_server_disable_stages.result index 99b18e851a4..6fae8be810f 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_stages.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_stages.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_disable_statements.result b/mysql-test/suite/perfschema/r/start_server_disable_statements.result index 5217f16a32f..ff9c6f93268 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_statements.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_statements.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_disable_waits.result b/mysql-test/suite/perfschema/r/start_server_disable_waits.result index 86c25348cd5..38e1f59cd39 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_waits.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_waits.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_innodb.result b/mysql-test/suite/perfschema/r/start_server_innodb.result index d03c20a5878..a270b4a6320 100644 --- a/mysql-test/suite/perfschema/r/start_server_innodb.result +++ b/mysql-test/suite/perfschema/r/start_server_innodb.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_account.result b/mysql-test/suite/perfschema/r/start_server_no_account.result index 3e0324868a7..05d67d88a8b 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_account.result +++ b/mysql-test/suite/perfschema/r/start_server_no_account.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result index 158dfb81ebe..574c8d4173b 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 0 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result index 3673600a078..ea5c7a69125 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 0 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_class.result b/mysql-test/suite/perfschema/r/start_server_no_file_class.result index 1e819d26265..0f93054bfd4 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_file_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_file_class.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 0 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result index b439af66f8d..71004d68f5e 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 0 diff --git a/mysql-test/suite/perfschema/r/start_server_no_host.result b/mysql-test/suite/perfschema/r/start_server_no_host.result index abb8a157ec6..329f74a4fff 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_host.result +++ b/mysql-test/suite/perfschema/r/start_server_no_host.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 0 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result index c5fe555b749..cda2719cc37 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result index d88d808a9ab..0ea5fe44521 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result index 1155993e60c..29a17e6a3ac 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result index 4d419817b0a..8b214077f37 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result index 281ca17491c..3a0588d616d 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result +++ b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result index 1e5578daddc..89763379b99 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result +++ b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_socket_class.result b/mysql-test/suite/perfschema/r/start_server_no_socket_class.result index ef1050d9fde..0b14c6caf15 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_socket_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_socket_class.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result b/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result index 97cbc807f3c..599e09f6c99 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_stage_class.result b/mysql-test/suite/perfschema/r/start_server_no_stage_class.result index a173447632d..1d53efc500c 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_stage_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_stage_class.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_stages_history.result b/mysql-test/suite/perfschema/r/start_server_no_stages_history.result index 6de6cc3187e..370ec61ff67 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_stages_history.result +++ b/mysql-test/suite/perfschema/r/start_server_no_stages_history.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result index fc0e680ebb7..d8018e0ba44 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result +++ b/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_statement_class.result b/mysql-test/suite/perfschema/r/start_server_no_statement_class.result index fca5ab82238..a617e7edb0a 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_statement_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_statement_class.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_statements_history.result b/mysql-test/suite/perfschema/r/start_server_no_statements_history.result index 1fc13bf6ce3..8d196aa9a4a 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_statements_history.result +++ b/mysql-test/suite/perfschema/r/start_server_no_statements_history.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result index d51d3acf343..360e8db910b 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result +++ b/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result index 784ed74e33c..01b7233582e 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result +++ b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result index da73df5c419..5608c324321 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result index a84f0f3c0ef..b1a7758a9d8 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result index 3be29053b33..ad0353589ad 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_user.result b/mysql-test/suite/perfschema/r/start_server_no_user.result index d80a9a4a2c4..2e1c097e28b 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_user.result +++ b/mysql-test/suite/perfschema/r/start_server_no_user.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_waits_history.result b/mysql-test/suite/perfschema/r/start_server_no_waits_history.result index 928307123d8..a3a9cbeee11 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_waits_history.result +++ b/mysql-test/suite/perfschema/r/start_server_no_waits_history.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 0 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result index d8ada5f9da5..e5465aa6bbb 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result +++ b/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_nothing.result b/mysql-test/suite/perfschema/r/start_server_nothing.result index bf84848641c..d28eed31e7d 100644 --- a/mysql-test/suite/perfschema/r/start_server_nothing.result +++ b/mysql-test/suite/perfschema/r/start_server_nothing.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 0 performance_schema_hosts_size 0 performance_schema_max_cond_classes 0 performance_schema_max_cond_instances 0 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 0 performance_schema_max_file_handles 0 performance_schema_max_file_instances 0 @@ -119,6 +120,7 @@ performance_schema_events_waits_history_size 0 performance_schema_hosts_size 0 performance_schema_max_cond_classes 0 performance_schema_max_cond_instances 0 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 0 performance_schema_max_file_handles 0 performance_schema_max_file_instances 0 diff --git a/mysql-test/suite/perfschema/r/start_server_off.result b/mysql-test/suite/perfschema/r/start_server_off.result index 293607c41e9..a5f552b4bbf 100644 --- a/mysql-test/suite/perfschema/r/start_server_off.result +++ b/mysql-test/suite/perfschema/r/start_server_off.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/start_server_on.result b/mysql-test/suite/perfschema/r/start_server_on.result index d03c20a5878..a270b4a6320 100644 --- a/mysql-test/suite/perfschema/r/start_server_on.result +++ b/mysql-test/suite/perfschema/r/start_server_on.result @@ -85,6 +85,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/statement_digest.result b/mysql-test/suite/perfschema/r/statement_digest.result index 6d9429799bd..6abe865f1aa 100644 --- a/mysql-test/suite/perfschema/r/statement_digest.result +++ b/mysql-test/suite/perfschema/r/statement_digest.result @@ -112,42 +112,41 @@ DROP TRIGGER trg; SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS, SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest; SCHEMA_NAME DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS -statements_digest TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0 -statements_digest SELECT ? FROM t1 1 0 0 0 -statements_digest SELECT ? FROM `t1` 1 0 0 0 -statements_digest SELECT ?, ... FROM t1 2 0 0 0 -statements_digest SELECT ? FROM t2 1 0 0 0 -statements_digest SELECT ?, ... FROM t2 2 0 0 0 -statements_digest INSERT INTO t1 VALUES (?) 2 2 0 0 -statements_digest INSERT INTO t2 VALUES (?) 1 1 0 0 -statements_digest INSERT INTO t3 VALUES (...) 4 4 0 0 -statements_digest INSERT INTO t4 VALUES (...) 1 1 0 0 -statements_digest INSERT INTO t5 VALUES (...) 1 1 0 0 -statements_digest INSERT INTO t1 VALUES (?) /* , ... */ 2 7 0 0 -statements_digest INSERT INTO t3 VALUES (...) /* , ... */ 1 3 0 0 -statements_digest INSERT INTO t5 VALUES (...) /* , ... */ 1 3 0 0 -statements_digest INSERT INTO t6 VALUES (...) 5 5 0 0 +statements_digest TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 0 0 0 +statements_digest SELECT ? FROM `t1` 2 0 0 0 +statements_digest SELECT ?, ... FROM `t1` 2 0 0 0 +statements_digest SELECT ? FROM `t2` 1 0 0 0 +statements_digest SELECT ?, ... FROM `t2` 2 0 0 0 +statements_digest INSERT INTO `t1` VALUES (?) 2 2 0 0 +statements_digest INSERT INTO `t2` VALUES (?) 1 1 0 0 +statements_digest INSERT INTO `t3` VALUES (...) 4 4 0 0 +statements_digest INSERT INTO `t4` VALUES (...) 1 1 0 0 +statements_digest INSERT INTO `t5` VALUES (...) 1 1 0 0 +statements_digest INSERT INTO `t1` VALUES (?) /* , ... */ 2 7 0 0 +statements_digest INSERT INTO `t3` VALUES (...) /* , ... */ 1 3 0 0 +statements_digest INSERT INTO `t5` VALUES (...) /* , ... */ 1 3 0 0 +statements_digest INSERT INTO `t6` VALUES (...) 5 5 0 0 statements_digest SELECT ? + ? 3 0 0 0 statements_digest SELECT ? 1 0 0 0 -statements_digest CREATE SCHEMA statements_digest_temp 2 2 0 0 -statements_digest DROP SCHEMA statements_digest_temp 2 0 0 0 -statements_digest SELECT ? FROM no_such_table 1 0 0 1 -statements_digest CREATE TABLE dup_table ( c CHARACTER (?) ) 2 0 0 1 -statements_digest DROP TABLE dup_table 1 0 0 0 -statements_digest INSERT INTO t11 VALUES (?) 1 1 1 0 +statements_digest CREATE SCHEMA `statements_digest_temp` 2 2 0 0 +statements_digest DROP SCHEMA `statements_digest_temp` 2 0 0 0 +statements_digest SELECT ? FROM `no_such_table` 1 0 0 1 +statements_digest CREATE TABLE `dup_table` ( `c` CHARACTER (?) ) 2 0 0 1 +statements_digest DROP TABLE `dup_table` 1 0 0 0 +statements_digest INSERT INTO `t11` VALUES (?) 1 1 1 0 statements_digest SHOW WARNINGS 1 0 0 0 -statements_digest PREPARE stmt FROM ? 1 0 0 0 -statements_digest EXECUTE stmt 2 0 0 0 -statements_digest DEALLOCATE PREPARE stmt 1 0 0 0 -statements_digest CREATE PROCEDURE p1 ( ) BEGIN SELECT * FROM t12 ; END 1 0 0 0 -statements_digest CALL p1 ( ) 2 0 0 0 -statements_digest DROP PROCEDURE p1 1 0 0 0 -statements_digest CREATE FUNCTION `func` ( a INTEGER , b INTEGER ) RETURNS INTEGER (?) RETURN a + b 1 0 0 0 -statements_digest SELECT func (...) 2 0 0 0 -statements_digest DROP FUNCTION func 1 0 0 0 -statements_digest CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @? := ? 1 0 0 0 -statements_digest INSERT INTO t12 VALUES (?) 2 2 0 0 -statements_digest DROP TRIGGER trg 1 0 0 0 +statements_digest PREPARE `stmt` FROM ? 1 0 0 0 +statements_digest EXECUTE `stmt` 2 0 0 0 +statements_digest DEALLOCATE PREPARE `stmt` 1 0 0 0 +statements_digest CREATE PROCEDURE `p1` ( ) BEGIN SELECT * FROM `t12` ; END 1 0 0 0 +statements_digest CALL `p1` ( ) 2 0 0 0 +statements_digest DROP PROCEDURE `p1` 1 0 0 0 +statements_digest CREATE FUNCTION `func` ( `a` INTEGER , `b` INTEGER ) RETURNS INTEGER (?) RETURN `a` + `b` 1 0 0 0 +statements_digest SELECT `func` (...) 2 0 0 0 +statements_digest DROP FUNCTION `func` 1 0 0 0 +statements_digest CREATE TRIGGER `trg` BEFORE INSERT ON `t12` FOR EACH ROW SET @? := ? 1 0 0 0 +statements_digest INSERT INTO `t12` VALUES (?) 2 2 0 0 +statements_digest DROP TRIGGER `trg` 1 0 0 0 #################################### # CLEANUP #################################### diff --git a/mysql-test/suite/perfschema/r/statement_digest_consumers.result b/mysql-test/suite/perfschema/r/statement_digest_consumers.result index 04577e254f4..db60362dd92 100644 --- a/mysql-test/suite/perfschema/r/statement_digest_consumers.result +++ b/mysql-test/suite/perfschema/r/statement_digest_consumers.result @@ -125,42 +125,41 @@ DROP TRIGGER trg; #################################### SELECT schema_name,digest_text, count_star FROM performance_schema.events_statements_summary_by_digest; schema_name digest_text count_star -statements_digest TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 -statements_digest SELECT ? FROM t1 1 -statements_digest SELECT ? FROM `t1` 1 -statements_digest SELECT ?, ... FROM t1 2 -statements_digest SELECT ? FROM t2 1 -statements_digest SELECT ?, ... FROM t2 2 -statements_digest INSERT INTO t1 VALUES (?) 2 -statements_digest INSERT INTO t2 VALUES (?) 1 -statements_digest INSERT INTO t3 VALUES (...) 4 -statements_digest INSERT INTO t4 VALUES (...) 1 -statements_digest INSERT INTO t5 VALUES (...) 1 -statements_digest INSERT INTO t1 VALUES (?) /* , ... */ 2 -statements_digest INSERT INTO t3 VALUES (...) /* , ... */ 1 -statements_digest INSERT INTO t5 VALUES (...) /* , ... */ 1 -statements_digest INSERT INTO t6 VALUES (...) 5 +statements_digest TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 +statements_digest SELECT ? FROM `t1` 2 +statements_digest SELECT ?, ... FROM `t1` 2 +statements_digest SELECT ? FROM `t2` 1 +statements_digest SELECT ?, ... FROM `t2` 2 +statements_digest INSERT INTO `t1` VALUES (?) 2 +statements_digest INSERT INTO `t2` VALUES (?) 1 +statements_digest INSERT INTO `t3` VALUES (...) 4 +statements_digest INSERT INTO `t4` VALUES (...) 1 +statements_digest INSERT INTO `t5` VALUES (...) 1 +statements_digest INSERT INTO `t1` VALUES (?) /* , ... */ 2 +statements_digest INSERT INTO `t3` VALUES (...) /* , ... */ 1 +statements_digest INSERT INTO `t5` VALUES (...) /* , ... */ 1 +statements_digest INSERT INTO `t6` VALUES (...) 5 statements_digest SELECT ? + ? 3 statements_digest SELECT ? 1 -statements_digest CREATE SCHEMA statements_digest_temp 2 -statements_digest DROP SCHEMA statements_digest_temp 2 -statements_digest SELECT ? FROM no_such_table 1 -statements_digest CREATE TABLE dup_table ( c CHARACTER (?) ) 2 -statements_digest DROP TABLE dup_table 1 -statements_digest INSERT INTO t11 VALUES (?) 1 +statements_digest CREATE SCHEMA `statements_digest_temp` 2 +statements_digest DROP SCHEMA `statements_digest_temp` 2 +statements_digest SELECT ? FROM `no_such_table` 1 +statements_digest CREATE TABLE `dup_table` ( `c` CHARACTER (?) ) 2 +statements_digest DROP TABLE `dup_table` 1 +statements_digest INSERT INTO `t11` VALUES (?) 1 statements_digest SHOW WARNINGS 1 -statements_digest PREPARE stmt FROM ? 1 -statements_digest EXECUTE stmt 2 -statements_digest DEALLOCATE PREPARE stmt 1 -statements_digest CREATE PROCEDURE p1 ( ) BEGIN SELECT * FROM t12 ; END 1 -statements_digest CALL p1 ( ) 2 -statements_digest DROP PROCEDURE p1 1 -statements_digest CREATE FUNCTION `func` ( a INTEGER , b INTEGER ) RETURNS INTEGER (?) RETURN a + b 1 -statements_digest SELECT func (...) 2 -statements_digest DROP FUNCTION func 1 -statements_digest CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @? := ? 1 -statements_digest INSERT INTO t12 VALUES (?) 2 -statements_digest DROP TRIGGER trg 1 +statements_digest PREPARE `stmt` FROM ? 1 +statements_digest EXECUTE `stmt` 2 +statements_digest DEALLOCATE PREPARE `stmt` 1 +statements_digest CREATE PROCEDURE `p1` ( ) BEGIN SELECT * FROM `t12` ; END 1 +statements_digest CALL `p1` ( ) 2 +statements_digest DROP PROCEDURE `p1` 1 +statements_digest CREATE FUNCTION `func` ( `a` INTEGER , `b` INTEGER ) RETURNS INTEGER (?) RETURN `a` + `b` 1 +statements_digest SELECT `func` (...) 2 +statements_digest DROP FUNCTION `func` 1 +statements_digest CREATE TRIGGER `trg` BEFORE INSERT ON `t12` FOR EACH ROW SET @? := ? 1 +statements_digest INSERT INTO `t12` VALUES (?) 2 +statements_digest DROP TRIGGER `trg` 1 SELECT digest_text FROM performance_schema.events_statements_current; digest_text #################################### diff --git a/mysql-test/suite/perfschema/r/statement_digest_long_query.result b/mysql-test/suite/perfschema/r/statement_digest_long_query.result index 236720edb91..1c581085eef 100644 --- a/mysql-test/suite/perfschema/r/statement_digest_long_query.result +++ b/mysql-test/suite/perfschema/r/statement_digest_long_query.result @@ -8,5 +8,5 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1 #################################### SELECT schema_name, digest_text, count_star FROM events_statements_summary_by_digest; schema_name digest_text count_star -performance_schema TRUNCATE TABLE events_statements_summary_by_digest 1 +performance_schema TRUNCATE TABLE `events_statements_summary_by_digest` 1 performance_schema SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? 1 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result index 2613737a3da..189a3200a91 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result @@ -55,6 +55,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result index e5aaf207820..b4fbf37265a 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result @@ -54,6 +54,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result index 637d923ebdb..d20378236f5 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result @@ -55,6 +55,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result index a41ae765a77..087ed9e63ab 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result @@ -54,6 +54,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result index 2278744621e..860059fe0eb 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result @@ -53,6 +53,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result index b3ada0d638a..50bc51b8da6 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result @@ -52,6 +52,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result index 361a8a700d0..9340014985e 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result @@ -53,6 +53,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result index 97bb0e34e0d..53ec7343676 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result @@ -52,6 +52,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_off.result b/mysql-test/suite/perfschema/r/table_aggregate_off.result index f28f374c5dd..029a5d53861 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_off.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_off.result @@ -54,6 +54,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result index f7760043ddd..d5c58d478bb 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result @@ -55,6 +55,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result index 0ee5eaddcaf..ae08a9749ef 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result @@ -54,6 +54,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result index 025a7f27738..c3849107bd4 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result @@ -55,6 +55,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result index f655cd5bb93..f8f17d400ae 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result @@ -54,6 +54,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result index 55bb5a6a71f..2aeeffdedcc 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result @@ -57,6 +57,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result index 7f9f9e99359..43088cd3cfd 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result @@ -56,6 +56,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result index 7aa15b6a01d..f65e0494ebd 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result @@ -57,6 +57,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result index 0732fce5853..2ab94084bb7 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result @@ -56,6 +56,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result index c1f6fd56a97..7aec1bba281 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result @@ -55,6 +55,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result index 705e6ca7021..ddfc5e373dd 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result @@ -54,6 +54,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result index 04b7c7979c4..01b1d61877f 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result @@ -55,6 +55,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result index ef1f31b19a4..7b2554a4b64 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result @@ -54,6 +54,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result index a7ac4fa860f..7a950643800 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result @@ -57,6 +57,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result index 28bdcfb1d82..8f9e6278ba8 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result @@ -56,6 +56,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result index 683dd9cc4a6..eb83349f11e 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result @@ -57,6 +57,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result index d488066dd7f..8c3b6a0549f 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result @@ -56,6 +56,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result index d3a4416fdfd..f2c79374583 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result @@ -57,6 +57,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result index c69fc8a37d3..66a917412a9 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result @@ -56,6 +56,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result index 91110a94be5..3b6326fd2df 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result @@ -57,6 +57,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result index b443ac28c17..85e1bbeb332 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result @@ -56,6 +56,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result index 08a107acb2a..725770f2b3c 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result @@ -55,6 +55,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result index 07272c6e204..d92ec0a1997 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result @@ -54,6 +54,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result index 77c52780ae9..b03a26f4694 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result @@ -55,6 +55,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result index 6d7192285e3..ca62861bedb 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result @@ -54,6 +54,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result index 160be444e7c..7c1bbd2ddb0 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result @@ -57,6 +57,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result index e915a8dfa95..302563786d2 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result @@ -56,6 +56,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result index 82c1b65acff..390a3523421 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result @@ -57,6 +57,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result index 9023a4b0a69..123075896aa 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result @@ -56,6 +56,7 @@ performance_schema_events_waits_history_size 10 performance_schema_hosts_size 100 performance_schema_max_cond_classes 80 performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 performance_schema_max_file_classes 50 performance_schema_max_file_handles 32768 performance_schema_max_file_instances 10000 diff --git a/mysql-test/suite/perfschema/r/unary_digest.result b/mysql-test/suite/perfschema/r/unary_digest.result index 40fcc026fad..44347886a96 100644 --- a/mysql-test/suite/perfschema/r/unary_digest.result +++ b/mysql-test/suite/perfschema/r/unary_digest.result @@ -39,9 +39,9 @@ ERROR 42S02: Table 'test.expect_unchanged' doesn't exist SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR FROM performance_schema.events_statements_summary_by_digest; SCHEMA_NAME DIGEST_TEXT COUNT_STAR -test TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 -test SELECT ? FROM expect_unary 5 -test SELECT ? + ? FROM expect_binary 2 -test SELECT ? - ? FROM expect_binary 2 -test INSERT INTO expect_full_reduce VALUES (...) 27 -test SELECT a - b , a + b , - a , - b , + a , + b FROM expect_unchanged 1 +test TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 +test SELECT ? FROM `expect_unary` 5 +test SELECT ? + ? FROM `expect_binary` 2 +test SELECT ? - ? FROM `expect_binary` 2 +test INSERT INTO `expect_full_reduce` VALUES (...) 27 +test SELECT `a` - `b` , `a` + `b` , - `a` , - `b` , + `a` , + `b` FROM `expect_unchanged` 1 diff --git a/mysql-test/suite/perfschema/t/global_read_lock.test b/mysql-test/suite/perfschema/t/global_read_lock.test index f73b8785cb2..1ab6005f7e2 100644 --- a/mysql-test/suite/perfschema/t/global_read_lock.test +++ b/mysql-test/suite/perfschema/t/global_read_lock.test @@ -56,7 +56,9 @@ let $wait_condition= select 1 from performance_schema.events_waits_current where # Observe the blocked thread in the performance schema :) select event_name, left(source, locate(":", source)) as short_source, - timer_end, timer_wait, operation + if(timer_end IS NULL, NULL, "SET") as timer_end, + if(timer_wait IS NULL, NULL, "SET") as timer_wait, + operation from performance_schema.events_waits_current where event_name like "wait/synch/cond/sql/MDL_context::COND_wait_status"; diff --git a/mysql-test/suite/rpl/r/create_select.result b/mysql-test/suite/rpl/r/create_select.result new file mode 100644 index 00000000000..ac222824e34 --- /dev/null +++ b/mysql-test/suite/rpl/r/create_select.result @@ -0,0 +1,30 @@ +include/rpl_init.inc [topology=1->2->3] +# On server_1 +CREATE DATABASE test_8428; +USE test_8428; +CREATE TABLE t1(i INT) ENGINE=INNODB; +INSERT INTO t1 VALUES(1), (2), (3), (4), (5); +CREATE TABLE t2 AS SELECT * FROM t1; +CREATE TABLE t3 ENGINE=MyISAM AS SELECT * FROM t1; +# On server_2 +SHOW TABLES IN test_8428; +Tables_in_test_8428 +t1 +t2 +t3 +# On server_3 +SHOW TABLES IN test_8428; +Tables_in_test_8428 +t1 +t2 +t3 +SELECT * from test_8428.t1; +i +1 +2 +3 +4 +5 +DROP DATABASE test_8428; +include/rpl_end.inc +# End of test diff --git a/mysql-test/suite/rpl/r/rpl_alter.result b/mysql-test/suite/rpl/r/rpl_alter.result index 2cffa70d778..608526ea79f 100644 --- a/mysql-test/suite/rpl/r/rpl_alter.result +++ b/mysql-test/suite/rpl/r/rpl_alter.result @@ -14,4 +14,109 @@ select * from mysqltest.t3; n 45 drop database mysqltest; +use test; +# +# Test bug where ALTER TABLE MODIFY didn't replicate properly +# +create table t1 (a int unsigned primary key, b int); +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(10) unsigned NOT NULL, + `b` int(11) DEFAULT NULL, + PRIMARY KEY (`a`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +insert into t1 (a) values (1),((1<<32)-1); +select * from t1; +a b +1 NULL +4294967295 NULL +alter table t1 modify a bigint; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` bigint(20) NOT NULL, + `b` int(11) DEFAULT NULL, + PRIMARY KEY (`a`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +select * from t1; +a b +1 NULL +4294967295 NULL +alter table t1 modify a int unsigned; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(10) unsigned NOT NULL, + `b` int(11) DEFAULT NULL, + PRIMARY KEY (`a`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +select * from t1; +a b +1 NULL +4294967295 NULL +alter table t1 modify a bigint unsigned; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` bigint(20) unsigned NOT NULL, + `b` int(11) DEFAULT NULL, + PRIMARY KEY (`a`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +select * from t1; +a b +1 NULL +4294967295 NULL +use test; +select * from t1; +a b +1 NULL +4294967295 NULL +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` bigint(20) unsigned NOT NULL, + `b` int(11) DEFAULT NULL, + PRIMARY KEY (`a`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +create table t2 (a int unsigned auto_increment primary key, b int); +show create table t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `a` int(10) unsigned NOT NULL AUTO_INCREMENT, + `b` int(11) DEFAULT NULL, + PRIMARY KEY (`a`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +alter table t2 modify a bigint; +show create table t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `a` bigint(20) NOT NULL, + `b` int(11) DEFAULT NULL, + PRIMARY KEY (`a`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +alter table t2 modify a bigint auto_increment; +show create table t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `a` bigint(20) NOT NULL AUTO_INCREMENT, + `b` int(11) DEFAULT NULL, + PRIMARY KEY (`a`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +drop table t1,t2; +# +# MDEV-8432: Slave cannot replicate signed integer-type values +# with high bit set to 1 +# Test replication when we have int on master and bigint on slave +# +create table t1 (a int unsigned primary key, b int); +SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_NON_LOSSY'; +alter table t1 modify a bigint unsigned; +insert into t1 (a) values (1),((1<<32)-1); +select * from t1; +a b +1 NULL +4294967295 NULL +SET GLOBAL SLAVE_TYPE_CONVERSIONS=''; +drop table t1; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_create_drop_role.result b/mysql-test/suite/rpl/r/rpl_create_drop_role.result index eee92eb0eaf..84c9b9a7110 100644 --- a/mysql-test/suite/rpl/r/rpl_create_drop_role.result +++ b/mysql-test/suite/rpl/r/rpl_create_drop_role.result @@ -6,7 +6,7 @@ User role_1 CREATE ROLE IF NOT EXISTS role_1; Warnings: -Note 1974 Can't create role 'role_1'; it already exists +Note 1975 Can't create role 'role_1'; it already exists CREATE ROLE IF NOT EXISTS role_2; SELECT User FROM mysql.user WHERE is_role='Y' ORDER BY User; User @@ -33,7 +33,7 @@ DROP ROLE IF EXISTS role_2; DROP ROLE IF EXISTS role_3; DROP ROLE IF EXISTS role_4; Warnings: -Note 1975 Can't drop role 'role_4'; it doesn't exist +Note 1976 Can't drop role 'role_4'; it doesn't exist DROP ROLE role_4; ERROR HY000: Operation DROP ROLE failed for 'role_4' SELECT User FROM mysql.user WHERE is_role='Y' ORDER BY User; diff --git a/mysql-test/suite/rpl/r/rpl_create_drop_user.result b/mysql-test/suite/rpl/r/rpl_create_drop_user.result index e83372a97aa..c55c522852c 100644 --- a/mysql-test/suite/rpl/r/rpl_create_drop_user.result +++ b/mysql-test/suite/rpl/r/rpl_create_drop_user.result @@ -40,7 +40,7 @@ DROP USER IF EXISTS u1@localhost; DROP USER u2@localhost; DROP USER IF EXISTS u3@localhost; Warnings: -Note 1973 Can't drop user 'u3'@'localhost'; it doesn't exist +Note 1974 Can't drop user 'u3'@'localhost'; it doesn't exist SELECT user, password FROM mysql.user WHERE user LIKE 'u%' ORDER BY user; user password include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/create_select.cnf b/mysql-test/suite/rpl/t/create_select.cnf new file mode 100644 index 00000000000..65a4396edf3 --- /dev/null +++ b/mysql-test/suite/rpl/t/create_select.cnf @@ -0,0 +1,16 @@ +!include suite/rpl/my.cnf + +[mysqld.1] + +[mysqld.2] +log-slave-updates +binlog-checksum=CRC32 + +[mysqld.3] +log-slave-updates +binlog-checksum=CRC32 + +[ENV] +SERVER_MYPORT_3= @mysqld.3.port +SERVER_MYSOCK_3= @mysqld.3.socket + diff --git a/mysql-test/suite/rpl/t/create_select.test b/mysql-test/suite/rpl/t/create_select.test new file mode 100644 index 00000000000..c55dea92744 --- /dev/null +++ b/mysql-test/suite/rpl/t/create_select.test @@ -0,0 +1,41 @@ +--source include/have_innodb.inc + +--let $rpl_topology=1->2->3 +--source include/rpl_init.inc + +# +# Test of MDEV-8428 Mangled DML statements on 2nd level slave when enabling +# binlog checksums +# + +connection server_1; + +--echo # On server_1 +CREATE DATABASE test_8428; +USE test_8428; +CREATE TABLE t1(i INT) ENGINE=INNODB; +INSERT INTO t1 VALUES(1), (2), (3), (4), (5); +CREATE TABLE t2 AS SELECT * FROM t1; +CREATE TABLE t3 ENGINE=MyISAM AS SELECT * FROM t1; + +save_master_pos; +connection server_2; +sync_with_master; + +--echo # On server_2 +SHOW TABLES IN test_8428; + +save_master_pos; +connection server_3; +sync_with_master; + +--echo # On server_3 +SHOW TABLES IN test_8428; +SELECT * from test_8428.t1; + +# Cleanup +connection server_1; +DROP DATABASE test_8428; +--source include/rpl_end.inc +--echo # End of test + diff --git a/mysql-test/suite/rpl/t/rpl_alter.test b/mysql-test/suite/rpl/t/rpl_alter.test index 630197f8637..8b8bcfb3d26 100644 --- a/mysql-test/suite/rpl/t/rpl_alter.test +++ b/mysql-test/suite/rpl/t/rpl_alter.test @@ -15,4 +15,57 @@ drop database mysqltest; sync_slave_with_master; # End of 4.1 tests + +connection master; +use test; + +--echo # +--echo # Test bug where ALTER TABLE MODIFY didn't replicate properly +--echo # + +create table t1 (a int unsigned primary key, b int); +show create table t1; +insert into t1 (a) values (1),((1<<32)-1); +select * from t1; +alter table t1 modify a bigint; +show create table t1; +select * from t1; +alter table t1 modify a int unsigned; +show create table t1; +select * from t1; +alter table t1 modify a bigint unsigned; +show create table t1; +select * from t1; +sync_slave_with_master; +use test; +select * from t1; +show create table t1; +connection master; +# +create table t2 (a int unsigned auto_increment primary key, b int); +show create table t2; +alter table t2 modify a bigint; +show create table t2; +alter table t2 modify a bigint auto_increment; +show create table t2; +drop table t1,t2; + +--echo # +--echo # MDEV-8432: Slave cannot replicate signed integer-type values +--echo # with high bit set to 1 +--echo # Test replication when we have int on master and bigint on slave +--echo # + +create table t1 (a int unsigned primary key, b int); +sync_slave_with_master; +SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_NON_LOSSY'; +alter table t1 modify a bigint unsigned; +connection master; +insert into t1 (a) values (1),((1<<32)-1); +sync_slave_with_master; +select * from t1; +SET GLOBAL SLAVE_TYPE_CONVERSIONS=''; +connection master; +drop table t1; + --source include/rpl_end.inc diff --git a/mysql-test/suite/sys_vars/r/all_vars.result b/mysql-test/suite/sys_vars/r/all_vars.result index ca821f870fb..b812a5dbee3 100644 --- a/mysql-test/suite/sys_vars/r/all_vars.result +++ b/mysql-test/suite/sys_vars/r/all_vars.result @@ -15,5 +15,6 @@ innodb_default_encryption_key_id max_digest_length strict_password_validation wsrep_patch_version +pfs_max_digest_length drop table t1; drop table t2; diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff b/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff index 28c12e27ebd..2d3a7c07467 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff @@ -661,8 +661,8 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_VERSION SESSION_VALUE NULL --GLOBAL_VALUE 5.6.25 -+GLOBAL_VALUE 5.6.24-72.2 +-GLOBAL_VALUE 5.6.26 ++GLOBAL_VALUE 5.6.25-73.1 GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE NULL VARIABLE_SCOPE GLOBAL diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result index 18f682bb16e..e3531cc0edc 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result @@ -2331,7 +2331,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_VERSION SESSION_VALUE NULL -GLOBAL_VALUE 5.6.25 +GLOBAL_VALUE 5.6.26 GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE NULL VARIABLE_SCOPE GLOBAL diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result index 3c232d6b504..a2a89722868 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -2585,6 +2585,20 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_DIGEST_LENGTH +SESSION_VALUE NULL +GLOBAL_VALUE 1024 +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE 1024 +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE BIGINT +VARIABLE_COMMENT Maximum length considered for digest text, when stored in performance_schema tables. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1048576 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY YES +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_CLASSES SESSION_VALUE NULL GLOBAL_VALUE 50 diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result index 42ee3381ac7..fac934f01ef 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -2781,6 +2781,20 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_DIGEST_LENGTH +SESSION_VALUE NULL +GLOBAL_VALUE 1024 +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE 1024 +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE BIGINT +VARIABLE_COMMENT Maximum length considered for digest text, when stored in performance_schema tables. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1048576 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY YES +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_CLASSES SESSION_VALUE NULL GLOBAL_VALUE 50 diff --git a/mysql-test/suite/vcol/r/load_data.result b/mysql-test/suite/vcol/r/load_data.result new file mode 100644 index 00000000000..9769b55ac9a --- /dev/null +++ b/mysql-test/suite/vcol/r/load_data.result @@ -0,0 +1,20 @@ +create table t1 ( c1 varchar(10), c2 varchar(10), c3 int ); +insert into t1 values ("a" , "b", 1), ("a" , "b", 2); +create table t2 like t1 ; +alter table t2 add column c4 bigint unsigned as (CONV(LEFT(MD5(concat(c1,c2,c3)), 16), 16, 10)) persistent unique key; +select * into outfile 't1.csv' from t1; +load data infile 't1.csv' into table t2 ; +Warnings: +Warning 1261 Row 1 doesn't contain data for all columns +Warning 1261 Row 2 doesn't contain data for all columns +select * from t2; +c1 c2 c3 c4 +a b 1 7545402351885872315 +a b 2 6048842355806993119 +insert into t2 (c1,c2,c3) values ("a" , "b", 4); +select * from t2; +c1 c2 c3 c4 +a b 1 7545402351885872315 +a b 2 6048842355806993119 +a b 4 15541743660496249717 +drop table t1, t2; diff --git a/mysql-test/suite/vcol/t/load_data.test b/mysql-test/suite/vcol/t/load_data.test new file mode 100644 index 00000000000..4db3c77244e --- /dev/null +++ b/mysql-test/suite/vcol/t/load_data.test @@ -0,0 +1,13 @@ +# +# MDEV-7968 Virtual column set to NULL using load data infile +# +create table t1 ( c1 varchar(10), c2 varchar(10), c3 int ); +insert into t1 values ("a" , "b", 1), ("a" , "b", 2); +create table t2 like t1 ; +alter table t2 add column c4 bigint unsigned as (CONV(LEFT(MD5(concat(c1,c2,c3)), 16), 16, 10)) persistent unique key; +select * into outfile 't1.csv' from t1; +load data infile 't1.csv' into table t2 ; +select * from t2; +insert into t2 (c1,c2,c3) values ("a" , "b", 4); +select * from t2; +drop table t1, t2; diff --git a/mysql-test/t/alter_table.test b/mysql-test/t/alter_table.test index cdc188b7776..bce7f3f95bb 100644 --- a/mysql-test/t/alter_table.test +++ b/mysql-test/t/alter_table.test @@ -1,3 +1,7 @@ +if (`select plugin_auth_version < "5.6.26" from information_schema.plugins where plugin_name='innodb'`) +{ + --skip Not fixed in XtraDB below 5.6.26 +} --source include/have_innodb.inc # # Test of alter table diff --git a/mysql-test/t/blackhole_plugin.test b/mysql-test/t/blackhole_plugin.test index 8af8fcc941c..0cc7ae0817c 100644 --- a/mysql-test/t/blackhole_plugin.test +++ b/mysql-test/t/blackhole_plugin.test @@ -7,7 +7,7 @@ DROP TABLE t1; --replace_regex /\.dll/.so/ eval INSTALL PLUGIN blackhole SONAME '$HA_BLACKHOLE_SO'; --replace_regex /\.dll/.so/ ---error 1125 +--error ER_PLUGIN_INSTALLED eval INSTALL PLUGIN BLACKHOLE SONAME '$HA_BLACKHOLE_SO'; UNINSTALL PLUGIN blackhole; diff --git a/mysql-test/t/derived.test b/mysql-test/t/derived.test index ddce7f55292..d98e7b56905 100644 --- a/mysql-test/t/derived.test +++ b/mysql-test/t/derived.test @@ -492,7 +492,38 @@ update t1 set balance=(select sum(balance) from (SELECT balance FROM t1 where ac set optimizer_switch=@save_derived_optimizer_switch_bug; drop table t1; -set optimizer_switch=@save_derived_optimizer_switch; +--echo # +--echo # MDEV-6219:Server crashes in Bitmap<64u>::merge +--echo # (this=0x180, map2=...) on 2nd execution of PS with INSERT .. SELECT, +--echo # derived_merge +--echo # + +CREATE TABLE t1 (a VARCHAR(8)) ENGINE=MyISAM; +INSERT INTO t1 VALUES ('foo'),('bar'); + +create procedure p1() + INSERT INTO t1 SELECT * FROM ( + SELECT * FROM t1 + ) AS sq + WHERE sq.a IN ( SELECT 'baz' FROM DUAL ); + +call p1(); +call p1(); +drop procedure p1; + +PREPARE stmt FROM " + INSERT INTO t1 SELECT * FROM ( + SELECT * FROM t1 + ) AS sq + WHERE sq.a IN ( SELECT 'baz' FROM DUAL ) +"; + +EXECUTE stmt; +EXECUTE stmt; + +deallocate prepare stmt; + +drop table t1; --echo # --echo # MDEV-6892: WHERE does not apply @@ -506,3 +537,5 @@ select x.id, message from (select id from t1) x left join (select id, 1 as message from t2) y on x.id=y.id where coalesce(message,0) <> 0; drop table t1,t2; + +set optimizer_switch=@save_derived_optimizer_switch; diff --git a/mysql-test/t/empty_server_name-8224.test b/mysql-test/t/empty_server_name-8224.test index 528bce5dac5..b15e9d82eb8 100644 --- a/mysql-test/t/empty_server_name-8224.test +++ b/mysql-test/t/empty_server_name-8224.test @@ -7,3 +7,7 @@ create server '' foreign data wrapper w2 options (host '127.0.0.1'); --shutdown_server 10 --source include/wait_until_disconnected.inc --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect + +-- enable_reconnect +-- source include/wait_until_connected_again.inc +drop server ''; diff --git a/mysql-test/t/func_gconcat.test b/mysql-test/t/func_gconcat.test index 42a30760a86..5550eebf1a3 100644 --- a/mysql-test/t/func_gconcat.test +++ b/mysql-test/t/func_gconcat.test @@ -821,3 +821,14 @@ FROM ( SELECT * FROM t2 ) AS sq2, t3 ORDER BY field; drop table t3, t2, t1; + +--echo # +--echo # MDEV-7821 - Server crashes in Item_func_group_concat::fix_fields on 2nd +--echo # execution of PS +--echo # +CREATE TABLE t1(a INT); +INSERT INTO t1 VALUES(1),(2); +PREPARE stmt FROM "SELECT GROUP_CONCAT(t1a.a ORDER BY 1, t1a.a=0) FROM t1 AS t1a, t1 AS t1b GROUP BY t1a.a"; +EXECUTE stmt; +EXECUTE stmt; +DROP TABLE t1; diff --git a/mysql-test/t/func_misc.test b/mysql-test/t/func_misc.test index 5236987e16f..ef6472a3848 100644 --- a/mysql-test/t/func_misc.test +++ b/mysql-test/t/func_misc.test @@ -391,6 +391,11 @@ set optimizer_switch=@optimizer_switch_save; drop view v_merge, vm; drop table t1,tv; +--echo # +--echo # MDEV-4017 - GET_LOCK() with negative timeouts has strange behavior +--echo # +SELECT GET_LOCK('ul1', NULL); +SELECT GET_LOCK('ul1', -1); --echo # --echo # GET_LOCK, RELEASE_LOCK, IS_USED_LOCK functions test diff --git a/mysql-test/t/grant.test b/mysql-test/t/grant.test index 20632038273..b1580383f22 100644 --- a/mysql-test/t/grant.test +++ b/mysql-test/t/grant.test @@ -1666,6 +1666,7 @@ FLUSH PRIVILEGES; CREATE DATABASE mysqltest1; CREATE PROCEDURE mysqltest1.test() SQL SECURITY DEFINER SELECT 1; +CREATE FUNCTION mysqltest1.test() RETURNS INT RETURN 1; --error ER_NO_SUCH_TABLE GRANT EXECUTE ON FUNCTION mysqltest1.test TO mysqltest_1@localhost; GRANT ALL PRIVILEGES ON test.* TO mysqltest_1@localhost; @@ -2210,3 +2211,25 @@ DROP DATABASE secret; # Wait till we reached the initial number of concurrent sessions --source include/wait_until_count_sessions.inc +--echo # +--echo # BUG#11759114 - '51401: GRANT TREATS NONEXISTENT FUNCTIONS/PRIVILEGES +--echo # DIFFERENTLY'. +--echo # +--disable_warnings +drop database if exists mysqltest_db1; +--enable_warnings +create database mysqltest_db1; +create user mysqltest_u1; +--echo # Both GRANT statements below should fail with the same error. +--error ER_SP_DOES_NOT_EXIST +grant execute on function mysqltest_db1.f1 to mysqltest_u1; +--error ER_SP_DOES_NOT_EXIST +grant execute on procedure mysqltest_db1.p1 to mysqltest_u1; +--echo # Let us show that GRANT behaviour for routines is consistent +--echo # with GRANT behaviour for tables. Attempt to grant privilege +--echo # on non-existent table also results in an error. +--error ER_NO_SUCH_TABLE +grant select on mysqltest_db1.t1 to mysqltest_u1; +show grants for mysqltest_u1; +drop database mysqltest_db1; +drop user mysqltest_u1; diff --git a/mysql-test/t/innodb_load_xa.test b/mysql-test/t/innodb_load_xa.test index fe466e1f899..65b74120e8e 100644 --- a/mysql-test/t/innodb_load_xa.test +++ b/mysql-test/t/innodb_load_xa.test @@ -20,3 +20,6 @@ commit; show status like 'Handler_prepare'; drop table t1; uninstall plugin innodb; + +--source include/restart_mysqld.inc + diff --git a/mysql-test/t/mdev-504.test b/mysql-test/t/mdev-504.test index bc38e99067a..fb5c7666d33 100644 --- a/mysql-test/t/mdev-504.test +++ b/mysql-test/t/mdev-504.test @@ -1,5 +1,7 @@ --disable_ps_protocol +SET GLOBAL net_write_timeout = 900; + CREATE TABLE A ( pk INTEGER AUTO_INCREMENT PRIMARY KEY, fdate DATE @@ -74,4 +76,4 @@ DROP TABLE A; DROP PROCEDURE p_analyze; DROP FUNCTION rnd3; SET GLOBAL use_stat_tables = DEFAULT; - +SET GLOBAL net_write_timeout = DEFAULT; diff --git a/mysql-test/t/merge_recover-master.opt b/mysql-test/t/myisam_recover-master.opt index fca5ea079e3..fca5ea079e3 100644 --- a/mysql-test/t/merge_recover-master.opt +++ b/mysql-test/t/myisam_recover-master.opt diff --git a/mysql-test/t/merge_recover.test b/mysql-test/t/myisam_recover.test index f2cb204eeb6..49fe9c33460 100644 --- a/mysql-test/t/merge_recover.test +++ b/mysql-test/t/myisam_recover.test @@ -1,5 +1,9 @@ +--source include/count_sessions.inc + +--echo # +--echo # Tests for corrupted MyISAM tables and MyISAMMRG tables with corrupted +--echo # children.. --echo # ---echo # Test of MyISAM MRG tables with corrupted children. --echo # Run with --myisam-recover=force option. --echo # --echo # Preparation: we need to make sure that the merge parent @@ -57,10 +61,10 @@ eval $lock; --echo # connection default; --echo # ---echo # We have to disable the ps-protocol, to avoid +--echo # We have to disable the ps-protocol, to avoid --echo # "Prepared statement needs to be re-prepared" errors --echo # -- table def versions change all the time with full table cache. ---echo # +--echo # --disable_ps_protocol --disable_warnings drop table if exists t1, t1_mrg, t1_copy; @@ -69,12 +73,12 @@ let $MYSQLD_DATADIR=`select @@datadir`; --echo # --echo # Prepare a MERGE engine table, that refers to a corrupted --echo # child. ---echo # +--echo # create table t1 (a int, key(a)) engine=myisam; create table t1_mrg (a int) union (t1) engine=merge; --echo # --echo # Create a table with a corrupted index file: ---echo # save an old index file, insert more rows, +--echo # save an old index file, insert more rows, --echo # overwrite the new index file with the old one. --echo # insert into t1 (a) values (1), (2), (3); @@ -111,3 +115,66 @@ set @@global.table_open_cache=default; disconnect con1; connection default; --enable_ps_protocol + +--echo # +--echo # 18075170 - sql node restart required to avoid deadlock after +--echo # restore +--echo # +--echo # Check that auto-repair for MyISAM tables can now happen in the +--echo # middle of transaction, without aborting it. +--enable_prepare_warnings + +connection default; + +create table t1 (a int, key(a)) engine=myisam; +create table t2 (a int); +insert into t2 values (1); + +--echo # Create a table with a corrupted index file: +--echo # save an old index file, insert more rows, +--echo # overwrite the new index file with the old one. +insert into t1 (a) values (1); +flush table t1; +--copy_file $MYSQLD_DATADIR/test/t1.MYI $MYSQLD_DATADIR/test/t1_copy.MYI +insert into t1 (a) values (4); +flush table t1; +--remove_file $MYSQLD_DATADIR/test/t1.MYI +--copy_file $MYSQLD_DATADIR/test/t1_copy.MYI $MYSQLD_DATADIR/test/t1.MYI +--remove_file $MYSQLD_DATADIR/test/t1_copy.MYI + +--echo # Check table is needed to mark the table as crashed. +check table t1; + +--echo # At this point we have a corrupt t1 +set autocommit = 0; +select * from t2; +--echo # Without fix select from t1 will break the transaction. After the fix +--echo # transaction should be active and should hold lock on table t2. Alter +--echo # table from con2 will wait only if the transaction is not broken. +--replace_regex /'.*[\/\\]/'/ +select * from t1; + +connect(con2, localhost, root); +--SEND ALTER TABLE t2 ADD val INT + +connection default; +--echo # With fix we should have alter table waiting for t2 lock here. +let $wait_condition= + SELECT count(*) = 1 FROM information_schema.processlist WHERE state + LIKE "Waiting%" AND info = "ALTER TABLE t2 ADD val INT"; + +--source include/wait_condition.inc +ROLLBACK; +SET autocommit = 1; + +connection con2; +--REAP + +connection default; +disconnect con2; + +--echo # Cleanup +drop table t1, t2; + +# Wait till all disconnects are completed +-- source include/wait_until_count_sessions.inc diff --git a/mysql-test/t/mysql_upgrade.test b/mysql-test/t/mysql_upgrade.test index 8c641428353..a24ba0de2d9 100644 --- a/mysql-test/t/mysql_upgrade.test +++ b/mysql-test/t/mysql_upgrade.test @@ -15,7 +15,6 @@ file_exists $MYSQLD_DATADIR/mysql_upgrade_info; --echo Run it again - should say already completed --replace_result $MYSQL_SERVER_VERSION VERSION ---error 1 --exec $MYSQL_UPGRADE 2>&1 # It should have created a file in the MySQL Servers datadir diff --git a/mysql-test/t/plugin.test b/mysql-test/t/plugin.test index 13e2c71fbc4..ec7117bb832 100644 --- a/mysql-test/t/plugin.test +++ b/mysql-test/t/plugin.test @@ -6,7 +6,7 @@ DROP TABLE t1; INSTALL PLUGIN example SONAME 'ha_example'; --replace_regex /\.dll/.so/ ---error 1125 +--error ER_PLUGIN_INSTALLED INSTALL PLUGIN EXAMPLE SONAME 'ha_example'; UNINSTALL PLUGIN example; diff --git a/mysql-test/t/sp-group.test b/mysql-test/t/sp-group.test new file mode 100644 index 00000000000..2083ac97595 --- /dev/null +++ b/mysql-test/t/sp-group.test @@ -0,0 +1,187 @@ +--source include/have_innodb.inc + +drop table if exists t1; +drop view if exists view_t1; + +# +# Test case for MDEV 7601, MDEV-7594 and MDEV-7555 +# Server crashes in functions related to stored procedures +# Server crashes in different ways while executing concurrent +# flow involving views and non-empty sql_mode with ONLY_FULL_GROUP_BY +# + +SET sql_mode=ONLY_FULL_GROUP_BY; + +CREATE TABLE t1 ( + pk INT, + f0 INT, f1 INT, f2 INT, f3 INT, f4 INT, + f5 INT, f6 INT, f7 INT, f8 INT, f9 INT, + PRIMARY KEY (pk) +); + +CREATE VIEW view_t1 AS SELECT * FROM t1; +CREATE PROCEDURE s1() + SELECT * FROM ( + INFORMATION_SCHEMA.`INNODB_BUFFER_PAGE_LRU` AS table1 + LEFT JOIN test.view_t1 AS table2 + ON ( table2.`f6` = table1.FREE_PAGE_CLOCK) + ) + ORDER BY table1.NUMBER_RECORDS + LIMIT 0 +; +CALL s1; +CALL s1; + +drop table t1; +drop view view_t1; +drop procedure s1; + +# +# MDEV-7590 +# Server crashes in st_select_lex_unit::cleanup on executing a trigger +# + +CREATE TABLE A ( + pk INTEGER AUTO_INCREMENT, + col_int_key INTEGER, + col_varchar_key VARCHAR(1), + PRIMARY KEY (pk) +) ENGINE=MyISAM; +CREATE VIEW view_A AS SELECT * FROM A; +CREATE TABLE C ( + pk INTEGER AUTO_INCREMENT, + col_int_nokey INTEGER, + col_int_key INTEGER, + col_date_key DATE, + col_date_nokey DATE, + col_time_key TIME, + col_time_nokey TIME, + col_datetime_key DATETIME, + col_datetime_nokey DATETIME, + col_varchar_key VARCHAR(1), + col_varchar_nokey VARCHAR(1), + PRIMARY KEY (pk) +) ENGINE=MyISAM; +CREATE VIEW view_C AS SELECT * FROM C; +CREATE TABLE AA ( + pk INTEGER AUTO_INCREMENT, + col_int_nokey INTEGER, + col_int_key INTEGER, + col_date_key DATE, + col_date_nokey DATE, + col_time_key TIME, + col_time_nokey TIME, + col_datetime_key DATETIME, + col_datetime_nokey DATETIME, + col_varchar_key VARCHAR(1), + col_varchar_nokey VARCHAR(1), + PRIMARY KEY (pk), + KEY (col_varchar_key, col_int_key) +) ENGINE=MyISAM; +CREATE VIEW view_AA AS SELECT * FROM AA; +CREATE TABLE BB ( + pk INTEGER AUTO_INCREMENT, + col_int_key INTEGER, + col_varchar_key VARCHAR(1), + col_varchar_nokey VARCHAR(1), + PRIMARY KEY (pk), + KEY (col_varchar_key, col_int_key) +) ENGINE=MyISAM; +CREATE VIEW view_BB AS SELECT * FROM BB; +CREATE TABLE DD ( + pk INTEGER AUTO_INCREMENT, + col_int_key INTEGER, + col_date_key DATE, + col_time_key TIME, + col_datetime_key DATETIME, + col_varchar_key VARCHAR(1), + PRIMARY KEY (pk), + KEY (col_varchar_key, col_int_key) +) ENGINE=MyISAM; +CREATE VIEW view_DD AS SELECT * FROM DD; +CREATE TRIGGER k BEFORE INSERT ON `DD` FOR EACH ROW INSERT INTO `view_BB` SELECT * FROM `view_A` LIMIT 0 ; +CREATE TRIGGER r BEFORE INSERT ON `A` FOR EACH ROW INSERT INTO `view_AA` SELECT * FROM `view_C` LIMIT 0 ; +--error ER_WRONG_AUTO_KEY +ALTER TABLE `DD` DROP PRIMARY KEY; +INSERT INTO `view_A` ( `pk` ) VALUES (NULL); +--error 0,ER_WRONG_VALUE_COUNT_ON_ROW +INSERT INTO `DD` ( `pk` ) VALUES (NULL); +INSERT INTO `A` ( `pk` ) VALUES (NULL); +--error 0,ER_WRONG_VALUE_COUNT_ON_ROW +INSERT INTO `view_DD` ( `pk` ) VALUES (NULL); + +drop trigger r; +drop trigger k; +drop view view_A,view_AA,view_C,view_BB,view_DD; +drop table A,C,AA,BB,DD; + +# +# MDEV-7581 +# Server crashes in st_select_lex_unit::cleanup after a sequence of statements +# + +CREATE TABLE A ( + i INT, + i1 INT, + i2 INT, + d1 DATE, + d2 DATE, + col_time_nokey1 TIME, + col_time_nokey2 TIME, + col_datetime_nokey1 DATETIME, + col_datetime_nokey2 DATETIME, + col_varchar_nokey1 VARCHAR(1), + col_varchar_nokey2 VARCHAR(1) +) ENGINE=MyISAM; + +CREATE VIEW view_A AS SELECT * FROM A; + +CREATE TABLE B ( + col_varchar_nokey VARCHAR(1) +) ENGINE=MyISAM; + +CREATE TABLE AA ( + i INT, + i1 INT, + i2 INT, + d1 DATE, + d2 DATE, + col_time_nokey1 TIME, + col_time_nokey2 TIME, + col_datetime_nokey1 DATETIME, + col_datetime_nokey2 DATETIME, + col_varchar_nokey1 VARCHAR(1), + col_varchar_nokey2 VARCHAR(1) +) ENGINE=MyISAM; + +CREATE VIEW view_AA AS SELECT * FROM AA; + +CREATE TABLE DD ( + i INT, + i1 INT, + i2 INT, + d1 DATE, + d2 DATE, + col_time_nokey1 TIME, + col_time_nokey2 TIME, + col_datetime_nokey1 DATETIME, + col_datetime_nokey2 DATETIME, + col_varchar_nokey1 VARCHAR(1), + col_varchar_nokey2 VARCHAR(1) +) ENGINE=MyISAM; + +CREATE VIEW view_DD AS SELECT * FROM DD; + +CREATE TRIGGER tr1 BEFORE INSERT ON `AA` FOR EACH ROW INSERT INTO `view_A` SELECT * FROM `view_AA` LIMIT 0 ; +CREATE TRIGGER tr2 BEFORE INSERT ON `B` FOR EACH ROW INSERT INTO `D` SELECT * FROM `A` LIMIT 0 ; + +INSERT INTO `view_AA` ( `i` ) VALUES (1); +INSERT INTO `AA` ( `i` ) VALUES (2); +DELETE FROM `B`; +INSERT INTO `view_DD` ( `i` ) VALUES (1); +INSERT INTO `view_AA` ( `i` ) VALUES (3); + +drop trigger tr1; +drop trigger tr2; +drop view view_A, view_AA,view_DD; +drop table A,B,AA,DD; diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test index 7dda755481c..3a4ddee1de2 100644 --- a/mysql-test/t/sp.test +++ b/mysql-test/t/sp.test @@ -9301,6 +9301,75 @@ DROP TABLE t1; --echo # End of 5.5 test +--echo # +--echo # MDEV-7040: Crash in field_conv, memcpy_field_possible, part#2 +--echo # +create table t1 ( + col1 bigint(20), + col2 char(1), + col3 char(2) +); +insert into t1 values (1,'a','a'), (2,'b','b'); + +create table t2 as select * from t1; +create table t3 as select * from t1; +create table t4 as select * from t1; +create table t5 as select * from t1; +create table t6 as select * from t1; + +flush tables; + +DELIMITER |; + +CREATE PROCEDURE p1() +begin + DECLARE _var1 bigint(20) UNSIGNED; + DECLARE _var2 CHAR(1) DEFAULT NULL; + DECLARE _var3 CHAR(1) DEFAULT NULL; + + DECLARE _done BOOLEAN DEFAULT 0; + + declare cur1 cursor for + select col1, col2, col3 + from t1 + where + col1 in (select t2.col1 from t2 where t2.col2=t1.col2) or + col2 in (select t3.col3 from t3 where t3.col3=t1.col2) ; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET _done = 1; + + OPEN cur1; + + set _var1 = (select _var1 from t4 limit 1); + set _var1 = (select _var1 from t5 limit 1); + set _var1 = (select _var1 from t6 limit 1); +label1: + LOOP + SET _done = 0; + FETCH cur1 INTO _var1, _var2, _var3; + IF _done THEN + LEAVE label1; + END IF; + END LOOP label1; + CLOSE cur1; +end| +DELIMITER ;| + +set @tmp_toc= @@table_open_cache; +set @tmp_tdc= @@table_definition_cache; + +set global table_open_cache=1; +set global table_definition_cache=1; +call p1(); + +set global table_open_cache= @tmp_toc; +set global table_definition_cache= @tmp_tdc; +drop procedure p1; + +drop table t1,t2,t3,t4,t5,t6; + +--echo # End of 10.0 test + DELIMITER |; CREATE FUNCTION f(f1 VARCHAR(64) COLLATE latin1_german2_ci) RETURNS VARCHAR(64) diff --git a/mysql-test/t/subselect_sj2.test b/mysql-test/t/subselect_sj2.test index 7ee52a0fa8a..5d6639a6d5a 100644 --- a/mysql-test/t/subselect_sj2.test +++ b/mysql-test/t/subselect_sj2.test @@ -1410,5 +1410,44 @@ eval explain $query; drop table t3,t2,t1; set optimizer_search_depth=@tmp7474; +--echo # +--echo # +--echo # +CREATE TABLE t1 ( + id int(16) NOT NULL AUTO_INCREMENT, + PRIMARY KEY (id) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE t2 ( + id int(16) NOT NULL AUTO_INCREMENT, + t3_id int(16) NOT NULL DEFAULT '0', + t1_id int(16) NOT NULL DEFAULT '0', + PRIMARY KEY (id), + KEY t3_idx (t3_id), + KEY t1_idx (t1_id) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +CREATE TABLE t3 ( + id int(16) NOT NULL AUTO_INCREMENT, + PRIMARY KEY (id) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + +INSERT INTO t3 VALUES (1); + +INSERT INTO t2 VALUES (1, 1, 1); +INSERT INTO t2 VALUES (2, 1, 2); +INSERT INTO t2 VALUES (3, 1, 2); +INSERT INTO t2 VALUES (4, 1, 1); + +INSERT INTO t1 VALUES (1); +INSERT INTO t1 VALUES (2); + +SELECT * FROM t1 WHERE t1.id IN ( + SELECT t2.t1_id FROM t3 JOIN t2 ON t3.id = t2.t3_id WHERE t3.id = 1 +); + +drop table t1,t2,t3; + --echo # This must be the last in the file: set optimizer_switch=@subselect_sj2_tmp; diff --git a/mysql-test/t/subselect_sj_mat.test b/mysql-test/t/subselect_sj_mat.test index c34c805f90c..d2bafa86028 100644 --- a/mysql-test/t/subselect_sj_mat.test +++ b/mysql-test/t/subselect_sj_mat.test @@ -1841,8 +1841,23 @@ drop database mysqltest2; drop database mysqltest3; drop database mysqltest4; ---echo # End of 5.5 tests +--echo # +--echo # MDEV-7810 Wrong result on execution of a query as a PS +--echo # (both 1st and further executions) + +CREATE TABLE t1 (a INT NOT NULL) ENGINE=MyISAM; +INSERT INTO t1 VALUES (0),(8); + +SELECT a FROM (SELECT DISTINCT * FROM t1) AS sq WHERE a IN (SELECT MIN(t2.a) FROM (t1 AS t2)); +PREPARE stmt FROM " +SELECT a FROM (SELECT DISTINCT * FROM t1) AS sq WHERE a IN (SELECT MIN(t2.a) FROM (t1 AS t2)) +"; +execute stmt; +execute stmt; + +drop table t1; +--echo # End of 5.5 tests --echo # --echo # MDEV-7220: Materialization strategy is not used for REPLACE ... SELECT --echo # @@ -1885,3 +1900,28 @@ select * from t1 where (a,b) in (select max(a),b from t2 group by b); show status where Variable_name like 'Handler_read%' or Variable_name like 'Handler_%write%'; drop table t0,t1,t2,t3; + +--echo # +--echo # MDEV-7971: Assertion `name != __null' failed in ACL_internal_schema_registry::lookup +--echo # on 2nd execution os PS with multi-table update +--echo # +CREATE TABLE t1 (f1 INT); +INSERT INTO t1 VALUES (1),(2); + +CREATE TABLE t2 (f2 INT); +INSERT INTO t2 VALUES (3),(4); + +CREATE TABLE t3 (f3 INT); +INSERT INTO t3 VALUES (5),(6); + +PREPARE stmt FROM ' + UPDATE t1, t2 + SET f1 = 5 + WHERE 8 IN ( SELECT MIN(f3) FROM t3 ) +'; + +EXECUTE stmt; +EXECUTE stmt; + +DROP TABLE t1,t2,t3; + diff --git a/mysql-test/t/type_binary.test b/mysql-test/t/type_binary.test index 4d5a5312472..b583e257aa9 100644 --- a/mysql-test/t/type_binary.test +++ b/mysql-test/t/type_binary.test @@ -100,3 +100,29 @@ select hex(f2), hex(f3) from t1; drop table t1; --echo End of 5.0 tests + +--echo # +--echo # Start of 10.0 tests +--echo # + +--echo # +--echo # MDEV-8472 BINARY, VARBINARY and BLOB return different warnings on CAST to DECIMAL +--echo # +SET NAMES utf8; +CREATE TABLE t1 (a BINARY(30)); +INSERT INTO t1 VALUES ('1äÖüß@µ*$'); +SELECT CAST(a AS DECIMAL) FROM t1; +DROP TABLE t1; +CREATE TABLE t1 (a VARBINARY(30)); +INSERT INTO t1 VALUES ('1äÖüß@µ*$'); +SELECT CAST(a AS DECIMAL) FROM t1; +DROP TABLE t1; +CREATE TABLE t1 (a BLOB); +INSERT INTO t1 VALUES ('1äÖüß@µ*$'); +SELECT CAST(a AS DECIMAL) FROM t1; +DROP TABLE t1; + +--echo # +--echo # End of 10.0 tests +--echo # + diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test index e95194e3f2c..8c2a8ac8dc2 100644 --- a/mysql-test/t/view.test +++ b/mysql-test/t/view.test @@ -5380,6 +5380,27 @@ show create view v2; drop view v2; drop table t1; +--echo # +--echo # MDEV-8554: Server crashes in base_list_iterator::next_fast on 1st execution of PS with a multi-table update +--echo # +CREATE TABLE t1 (a INT) ENGINE=MyISAM; +INSERT INTO t1 VALUES (1),(2); # Not necessary, the table can be empty + +CREATE TABLE t2 (b INT) ENGINE=MyISAM; +INSERT INTO t2 VALUES (3),(4); # Not necessary, the table can be empty + +CREATE TABLE t3 (c INT) ENGINE=MyISAM; +INSERT INTO t3 VALUES (5),(6); # Not necessary, the table can be empty + +CREATE OR REPLACE ALGORITHM=MERGE VIEW v3 AS SELECT * FROM t3; + +PREPARE stmt FROM 'UPDATE t1, t2 SET a = 1 WHERE a IN ( SELECT 0 FROM t3 )'; +UPDATE t1, t2 SET a = 1 WHERE a IN ( SELECT 0 FROM v3 ); +EXECUTE stmt; + +DROP TABLE t1, t2, t3; +DROP VIEW v3; + --echo # ----------------------------------------------------------------- --echo # -- End of 5.5 tests. --echo # ----------------------------------------------------------------- |