diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-10-15 17:23:43 +0500 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-10-15 17:23:43 +0500 |
| commit | d8c3f2263f3deaadff957a0047460e8058cffccf (patch) | |
| tree | e38788d80d85437efb1819550af226f7b2e2c195 /mysql-test | |
| parent | 3929dddcd76130529cabfbd68cfff024e6b5c80d (diff) | |
| download | mariadb-git-d8c3f2263f3deaadff957a0047460e8058cffccf.tar.gz | |
WL#751 Error message construction, backport
Diffstat (limited to 'mysql-test')
27 files changed, 311 insertions, 161 deletions
diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index c1e8f7cd826..505f93f1fec 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -39,7 +39,7 @@ sub fix_charset_dir { sub fix_language { my ($self, $config, $group_name, $group)= @_; return my_find_dir($self->get_basedir($group), - \@share_locations, "english"); + \@share_locations); } sub fix_datadir { @@ -197,7 +197,7 @@ my @mysqld_rules= { 'basedir' => sub { return shift->{ARGS}->{basedir}; } }, { 'tmpdir' => \&fix_tmpdir }, { 'character-sets-dir' => \&fix_charset_dir }, - { 'language' => \&fix_language }, + { 'lc-messages-dir' => \&fix_language }, { 'datadir' => \&fix_datadir }, { 'pid-file' => \&fix_pidfile }, { '#host' => \&fix_host }, diff --git a/mysql-test/lib/t/testMyConfigFactory.t b/mysql-test/lib/t/testMyConfigFactory.t index 16fdd9db539..e3ab5d54b5b 100755 --- a/mysql-test/lib/t/testMyConfigFactory.t +++ b/mysql-test/lib/t/testMyConfigFactory.t @@ -67,11 +67,11 @@ is( $config->value('client', 'host'), ok ( $config->value("mysqld.1", 'character-sets-dir') =~ /$basedir.*charsets$/, "'character-sets-dir' generated"); -ok ( $config->value("mysqld.1", 'language') =~ /$basedir.*english$/, - "'language' generated"); +ok ( $config->value("mysqld.1", 'lc-messages-dir') =~ /$basedir.*share$/, + "'lc-messages-dir' generated"); ok ( $config->value("ENV", 'MASTER_MY_PORT') =~ /\d/, - "'language' generated"); + "'lc-messages-dir' generated"); my $gen2_cnf= "$dir/gen2.cnf"; open(OUT, ">", $gen2_cnf) or die; diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 78b69b26367..78c238979f8 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -955,12 +955,12 @@ sub command_line_setup { } # Look for language files and charsetsdir, use same share - $path_language= mtr_path_exists("$basedir/share/mysql/english", - "$basedir/sql/share/english", - "$basedir/share/english"); + $path_language= mtr_path_exists("$basedir/share/mysql", + "$basedir/sql/share", + "$basedir/share"); - my $path_share= dirname($path_language); + my $path_share= $path_language; $path_charsetsdir= mtr_path_exists("$path_share/charsets"); if (using_extern()) @@ -1432,7 +1432,7 @@ sub collect_mysqld_features { mtr_init_args(\$args); mtr_add_arg($args, "--no-defaults"); mtr_add_arg($args, "--datadir=%s", mixed_path($tmpdir)); - mtr_add_arg($args, "--language=%s", $path_language); + mtr_add_arg($args, "--lc-messages-dir=%s", $path_language); mtr_add_arg($args, "--skip-grant-tables"); mtr_add_arg($args, "--verbose"); mtr_add_arg($args, "--help"); @@ -2700,7 +2700,7 @@ sub mysql_install_db { my $install_datadir= $datadir || $mysqld->value('datadir'); my $install_basedir= $mysqld->value('basedir'); - my $install_lang= $mysqld->value('language'); + my $install_lang= $mysqld->value('lc-messages-dir'); my $install_chsdir= $mysqld->value('character-sets-dir'); mtr_report("Installing system database..."); @@ -2723,7 +2723,7 @@ sub mysql_install_db { $path_vardir_trace); } - mtr_add_arg($args, "--language=%s", $install_lang); + mtr_add_arg($args, "--lc-messages-dir=%s", $install_lang); mtr_add_arg($args, "--character-sets-dir=%s", $install_chsdir); # If DISABLE_GRANT_OPTIONS is defined when the server is compiled (e.g., diff --git a/mysql-test/r/compare.result b/mysql-test/r/compare.result index f9563b89b76..d931879ce23 100644 --- a/mysql-test/r/compare.result +++ b/mysql-test/r/compare.result @@ -47,11 +47,11 @@ insert into t1 values (0x01,0x01); select * from t1 where a=b; a b Warnings: -Warning 1292 Truncated incorrect DOUBLE value: '' +Warning 1292 Truncated incorrect DOUBLE value: '\x01' select * from t1 where a=b and b=0x01; a b Warnings: -Warning 1292 Truncated incorrect DOUBLE value: '' +Warning 1292 Truncated incorrect DOUBLE value: '\x01' drop table if exists t1; CREATE TABLE t1 (b int(2) zerofill, c int(2) zerofill); INSERT INTO t1 (b,c) VALUES (1,2), (1,1), (2,2); diff --git a/mysql-test/r/ctype_errors.result b/mysql-test/r/ctype_errors.result new file mode 100644 index 00000000000..d8218e40e6f --- /dev/null +++ b/mysql-test/r/ctype_errors.result @@ -0,0 +1,32 @@ +Start of 5.4 tests +CREATE TABLE t1(f1 INT); +SET lc_messages=ru_RU; +SHOW VARIABLES LIKE 'lc_messages'; +Variable_name Value +lc_messages ru_RU +CREATE TABLE t1(f1 INT); +ERROR 42S01: \0422\0430\0431\043B\0438\0446\0430 't1' \0443\0436\0435 \0441\0443\0449\0435\0441\0442\0432\0443\0435\0442 +SET NAMES utf8; +CREATE TABLE t1(f1 INT); +ERROR 42S01: Таблица 't1' уже существует +SHOW VARIABLES LIKE 'lc_messages'; +Variable_name Value +lc_messages en_US +CREATE TABLE t1(f1 INT); +ERROR 42S01: Table 't1' already exists +SHOW GLOBAL VARIABLES LIKE 'lc_messages'; +Variable_name Value +lc_messages en_US +SET GLOBAL lc_messages=ru_RU; +SHOW GLOBAL VARIABLES LIKE 'lc_messages'; +Variable_name Value +lc_messages ru_RU +SET GLOBAL lc_messages=en_US; +DROP TABLE t1; +drop table `ק`; +ERROR 42S02: Unknown table 'ק' +SET lc_messages=cs_CZ; +SET NAMES UTF8; +USE nonexistant; +ERROR 42000: Nezn-Bámá databáze 'nonexistant' +End of 5.4 tests diff --git a/mysql-test/r/ctype_recoding.result b/mysql-test/r/ctype_recoding.result index ee95812c03e..15eb0ad2c55 100644 --- a/mysql-test/r/ctype_recoding.result +++ b/mysql-test/r/ctype_recoding.result @@ -162,10 +162,10 @@ Field Type Null Key Default Extra DROP TABLE t1; SET NAMES binary; CREATE TABLE `good` (a int); -ERROR HY000: Invalid utf8 character string: '' +ERROR HY000: Invalid utf8 character string: 'good\xD0\xCC\xCF\xC8\xCF' SET NAMES utf8; CREATE TABLE `good` (a int); -ERROR HY000: Invalid utf8 character string: '' +ERROR HY000: Invalid utf8 character string: 'good\xD0\xCC\xCF\xC8\xCF' set names latin1; create table t1 (a char(10) character set koi8r, b text character set koi8r); insert into t1 values ('test','test'); diff --git a/mysql-test/r/ctype_ucs2_def.result b/mysql-test/r/ctype_ucs2_def.result index 005d46062fb..af69a9e77d6 100644 --- a/mysql-test/r/ctype_ucs2_def.result +++ b/mysql-test/r/ctype_ucs2_def.result @@ -19,7 +19,7 @@ col2 VARCHAR(32) CHARACTER SET ucs2 COLLATE ucs2_bin NOT NULL, UNIQUE KEY key1 USING HASH (col1, col2)) ENGINE=MEMORY; INSERT INTO t1 VALUES('A', 'A'), ('B', 'B'), ('C', 'C'); INSERT INTO t1 VALUES('A ', 'A '); -ERROR 23000: Duplicate entry '' for key 'key1' +ERROR 23000: Duplicate entry 'A -A ' for key 'key1' DROP TABLE t1; CREATE TABLE t1 ( c1 CHAR(255) CHARACTER SET UCS2 COLLATE UCS2_BIN NOT NULL, diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/r/ctype_utf8.result index 393625f5192..4ff48bd380a 100644 --- a/mysql-test/r/ctype_utf8.result +++ b/mysql-test/r/ctype_utf8.result @@ -363,9 +363,9 @@ create table t1 (c varchar(30) character set utf8, unique(c(10))); insert into t1 values ('1'),('2'),('3'),('x'),('y'),('z'); insert into t1 values ('aaaaaaaaaa'); insert into t1 values ('aaaaaaaaaaa'); -ERROR 23000: Duplicate entry 'aaaaaaaaaaa' for key 'c' +ERROR 23000: Duplicate entry 'aaaaaaaaaa' for key 'c' insert into t1 values ('aaaaaaaaaaaa'); -ERROR 23000: Duplicate entry 'aaaaaaaaaaaa' for key 'c' +ERROR 23000: Duplicate entry 'aaaaaaaaaa' for key 'c' insert into t1 values (repeat('b',20)); select c c1 from t1 where c='1'; c1 @@ -396,9 +396,9 @@ create table t1 (c varchar(30) character set utf8, unique(c(10))) engine=innodb; insert into t1 values ('1'),('2'),('3'),('x'),('y'),('z'); insert into t1 values ('aaaaaaaaaa'); insert into t1 values ('aaaaaaaaaaa'); -ERROR 23000: Duplicate entry 'aaaaaaaaaaa' for key 'c' +ERROR 23000: Duplicate entry 'aaaaaaaaaa' for key 'c' insert into t1 values ('aaaaaaaaaaaa'); -ERROR 23000: Duplicate entry 'aaaaaaaaaaaa' for key 'c' +ERROR 23000: Duplicate entry 'aaaaaaaaaa' for key 'c' insert into t1 values (repeat('b',20)); select c c1 from t1 where c='1'; c1 @@ -430,19 +430,19 @@ insert into t1 values ('1'),('2'),('3'),('4'),('x'),('y'),('z'); insert into t1 values ('a'); insert into t1 values ('aa'); insert into t1 values ('aaa'); -ERROR 23000: Duplicate entry 'aaa' for key 'c' +ERROR 23000: Duplicate entry 'aa' for key 'c' insert into t1 values ('b'); insert into t1 values ('bb'); insert into t1 values ('bbb'); -ERROR 23000: Duplicate entry 'bbb' for key 'c' +ERROR 23000: Duplicate entry 'bb' for key 'c' insert into t1 values ('а'); insert into t1 values ('аа'); insert into t1 values ('ааа'); -ERROR 23000: Duplicate entry 'ааа' for key 'c' +ERROR 23000: Duplicate entry 'аа' for key 'c' insert into t1 values ('б'); insert into t1 values ('бб'); insert into t1 values ('ббб'); -ERROR 23000: Duplicate entry 'ббб' for key 'c' +ERROR 23000: Duplicate entry 'бб' for key 'c' insert into t1 values ('ꪪ'); insert into t1 values ('ꪪꪪ'); insert into t1 values ('ꪪꪪꪪ'); @@ -453,19 +453,19 @@ insert into t1 values ('1'),('2'),('3'),('4'),('x'),('y'),('z'); insert into t1 values ('a'); insert into t1 values ('aa'); insert into t1 values ('aaa'); -ERROR 23000: Duplicate entry 'aaa' for key 'c' +ERROR 23000: Duplicate entry 'aa' for key 'c' insert into t1 values ('b'); insert into t1 values ('bb'); insert into t1 values ('bbb'); -ERROR 23000: Duplicate entry 'bbb' for key 'c' +ERROR 23000: Duplicate entry 'bb' for key 'c' insert into t1 values ('а'); insert into t1 values ('аа'); insert into t1 values ('ааа'); -ERROR 23000: Duplicate entry 'ааа' for key 'c' +ERROR 23000: Duplicate entry 'аа' for key 'c' insert into t1 values ('б'); insert into t1 values ('бб'); insert into t1 values ('ббб'); -ERROR 23000: Duplicate entry 'ббб' for key 'c' +ERROR 23000: Duplicate entry 'бб' for key 'c' insert into t1 values ('ꪪ'); insert into t1 values ('ꪪꪪ'); insert into t1 values ('ꪪꪪꪪ'); @@ -483,14 +483,14 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MEMORY DEFAULT CHARSET=latin1 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f'); insert into t1 values ('aa'); -ERROR 23000: Duplicate entry 'aa' for key 'a' +ERROR 23000: Duplicate entry 'a' for key 'a' insert into t1 values ('aaa'); -ERROR 23000: Duplicate entry 'aaa' for key 'a' +ERROR 23000: Duplicate entry 'a' for key 'a' insert into t1 values ('б'); insert into t1 values ('бб'); -ERROR 23000: Duplicate entry 'б' for key 'a' +ERROR 23000: Duplicate entry 'б' for key 'a' insert into t1 values ('ббб'); -ERROR 23000: Duplicate entry 'б' for key 'a' +ERROR 23000: Duplicate entry 'б' for key 'a' select c as c_all from t1 order by c; c_all a @@ -519,14 +519,14 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MEMORY DEFAULT CHARSET=latin1 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f'); insert into t1 values ('aa'); -ERROR 23000: Duplicate entry 'aa' for key 'a' +ERROR 23000: Duplicate entry 'a' for key 'a' insert into t1 values ('aaa'); -ERROR 23000: Duplicate entry 'aaa' for key 'a' +ERROR 23000: Duplicate entry 'a' for key 'a' insert into t1 values ('б'); insert into t1 values ('бб'); -ERROR 23000: Duplicate entry 'б' for key 'a' +ERROR 23000: Duplicate entry 'б' for key 'a' insert into t1 values ('ббб'); -ERROR 23000: Duplicate entry 'б' for key 'a' +ERROR 23000: Duplicate entry 'б' for key 'a' select c as c_all from t1 order by c; c_all a @@ -549,14 +549,14 @@ unique key a (c(1)) ) engine=innodb; insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f'); insert into t1 values ('aa'); -ERROR 23000: Duplicate entry 'aa' for key 'a' +ERROR 23000: Duplicate entry 'a' for key 'a' insert into t1 values ('aaa'); -ERROR 23000: Duplicate entry 'aaa' for key 'a' +ERROR 23000: Duplicate entry 'a' for key 'a' insert into t1 values ('б'); insert into t1 values ('бб'); -ERROR 23000: Duplicate entry 'б' for key 'a' +ERROR 23000: Duplicate entry 'б' for key 'a' insert into t1 values ('ббб'); -ERROR 23000: Duplicate entry 'б' for key 'a' +ERROR 23000: Duplicate entry 'б' for key 'a' select c as c_all from t1 order by c; c_all a @@ -577,9 +577,9 @@ create table t1 (c varchar(30) character set utf8 collate utf8_bin, unique(c(10) insert into t1 values ('1'),('2'),('3'),('x'),('y'),('z'); insert into t1 values ('aaaaaaaaaa'); insert into t1 values ('aaaaaaaaaaa'); -ERROR 23000: Duplicate entry 'aaaaaaaaaaa' for key 'c' +ERROR 23000: Duplicate entry 'aaaaaaaaaa' for key 'c' insert into t1 values ('aaaaaaaaaaaa'); -ERROR 23000: Duplicate entry 'aaaaaaaaaaaa' for key 'c' +ERROR 23000: Duplicate entry 'aaaaaaaaaa' for key 'c' insert into t1 values (repeat('b',20)); select c c1 from t1 where c='1'; c1 @@ -611,19 +611,19 @@ insert into t1 values ('1'),('2'),('3'),('4'),('x'),('y'),('z'); insert into t1 values ('a'); insert into t1 values ('aa'); insert into t1 values ('aaa'); -ERROR 23000: Duplicate entry 'aaa' for key 'c' +ERROR 23000: Duplicate entry 'aa' for key 'c' insert into t1 values ('b'); insert into t1 values ('bb'); insert into t1 values ('bbb'); -ERROR 23000: Duplicate entry 'bbb' for key 'c' +ERROR 23000: Duplicate entry 'bb' for key 'c' insert into t1 values ('а'); insert into t1 values ('аа'); insert into t1 values ('ааа'); -ERROR 23000: Duplicate entry 'ааа' for key 'c' +ERROR 23000: Duplicate entry 'аа' for key 'c' insert into t1 values ('б'); insert into t1 values ('бб'); insert into t1 values ('ббб'); -ERROR 23000: Duplicate entry 'ббб' for key 'c' +ERROR 23000: Duplicate entry 'бб' for key 'c' insert into t1 values ('ꪪ'); insert into t1 values ('ꪪꪪ'); insert into t1 values ('ꪪꪪꪪ'); @@ -641,14 +641,14 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MEMORY DEFAULT CHARSET=latin1 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f'); insert into t1 values ('aa'); -ERROR 23000: Duplicate entry 'aa' for key 'a' +ERROR 23000: Duplicate entry 'a' for key 'a' insert into t1 values ('aaa'); -ERROR 23000: Duplicate entry 'aaa' for key 'a' +ERROR 23000: Duplicate entry 'a' for key 'a' insert into t1 values ('б'); insert into t1 values ('бб'); -ERROR 23000: Duplicate entry 'б' for key 'a' +ERROR 23000: Duplicate entry 'б' for key 'a' insert into t1 values ('ббб'); -ERROR 23000: Duplicate entry 'б' for key 'a' +ERROR 23000: Duplicate entry 'б' for key 'a' select c as c_all from t1 order by c; c_all a @@ -677,14 +677,14 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MEMORY DEFAULT CHARSET=latin1 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f'); insert into t1 values ('aa'); -ERROR 23000: Duplicate entry 'aa' for key 'a' +ERROR 23000: Duplicate entry 'a' for key 'a' insert into t1 values ('aaa'); -ERROR 23000: Duplicate entry 'aaa' for key 'a' +ERROR 23000: Duplicate entry 'a' for key 'a' insert into t1 values ('б'); insert into t1 values ('бб'); -ERROR 23000: Duplicate entry 'б' for key 'a' +ERROR 23000: Duplicate entry 'б' for key 'a' insert into t1 values ('ббб'); -ERROR 23000: Duplicate entry 'б' for key 'a' +ERROR 23000: Duplicate entry 'б' for key 'a' select c as c_all from t1 order by c; c_all a @@ -707,14 +707,14 @@ unique key a (c(1)) ) engine=innodb; insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f'); insert into t1 values ('aa'); -ERROR 23000: Duplicate entry 'aa' for key 'a' +ERROR 23000: Duplicate entry 'a' for key 'a' insert into t1 values ('aaa'); -ERROR 23000: Duplicate entry 'aaa' for key 'a' +ERROR 23000: Duplicate entry 'a' for key 'a' insert into t1 values ('б'); insert into t1 values ('бб'); -ERROR 23000: Duplicate entry 'б' for key 'a' +ERROR 23000: Duplicate entry 'б' for key 'a' insert into t1 values ('ббб'); -ERROR 23000: Duplicate entry 'б' for key 'a' +ERROR 23000: Duplicate entry 'б' for key 'a' select c as c_all from t1 order by c; c_all a diff --git a/mysql-test/r/errors.result b/mysql-test/r/errors.result index 022a32d9c9b..d15daf2e4b0 100644 --- a/mysql-test/r/errors.result +++ b/mysql-test/r/errors.result @@ -55,3 +55,32 @@ Error 1054 Unknown column 'b' in 'field list' INSERT INTO t1 SELECT b FROM t1; ERROR 42S22: Unknown column 'b' in 'field list' DROP TABLE t1; +SET NAMES utf8; +SET sql_quote_show_create= _binary x'5452C39C45'; +ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TR\xC3\x9CE' +SET sql_quote_show_create= _utf8 x'5452C39C45'; +ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TRÜE' +SET sql_quote_show_create=_latin1 x'5452DC45'; +ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TRÜE' +SET sql_quote_show_create='TRÜE'; +ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TRÜE' +SET sql_quote_show_create=TRÜE; +ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TRÜE' +SET NAMES latin1; +SET sql_quote_show_create= _binary x'5452C39C45'; +ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TR\xC3\x9CE' +SET sql_quote_show_create= _utf8 x'5452C39C45'; +ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TRE' +SET sql_quote_show_create=_latin1 x'5452DC45'; +ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TRE' +SET sql_quote_show_create='TR.E'; +ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TR.E' +SET sql_quote_show_create=TR.E; +ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'E' +SET NAMES binary; +SET sql_quote_show_create= _binary x'5452C39C45'; +ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TR\xC3\x9CE' +SET sql_quote_show_create= _utf8 x'5452C39C45'; +ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TRÜE' +SET sql_quote_show_create=_latin1 x'5452DC45'; +ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TRÜE' diff --git a/mysql-test/r/events_bugs.result b/mysql-test/r/events_bugs.result index 50bfa97c59f..6d4d7a7e11b 100644 --- a/mysql-test/r/events_bugs.result +++ b/mysql-test/r/events_bugs.result @@ -16,7 +16,7 @@ DROP EVENT Lower_case; SET NAMES cp1251; CREATE EVENT __1251 ON SCHEDULE EVERY 1 YEAR DO SELECT 100; CREATE EVENT __1251 ON SCHEDULE EVERY 2 YEAR DO SELECT 200; -ERROR HY000: Event 'ДоЛеН_регистър_1251' already exists +ERROR HY000: Event '__1251' already exists DROP EVENT __1251; SET NAMES utf8; CREATE EVENT долен_регистър_утф8 ON SCHEDULE EVERY 3 YEAR DO SELECT 300; diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index b2d672453cf..17b679d99e4 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -2725,7 +2725,7 @@ create table t3 (s1 varchar(2) binary,primary key (s1)) engine=innodb; create table t4 (s1 char(2) binary,primary key (s1)) engine=innodb; insert into t1 values (0x41),(0x4120),(0x4100); insert into t2 values (0x41),(0x4120),(0x4100); -ERROR 23000: Duplicate entry 'A' for key 'PRIMARY' +ERROR 23000: Duplicate entry 'A\x00' for key 'PRIMARY' insert into t2 values (0x41),(0x4120); insert into t3 values (0x41),(0x4120),(0x4100); ERROR 23000: Duplicate entry 'A ' for key 'PRIMARY' diff --git a/mysql-test/r/key.result b/mysql-test/r/key.result index fcc09a0244d..21fcfceff81 100644 --- a/mysql-test/r/key.result +++ b/mysql-test/r/key.result @@ -251,13 +251,13 @@ insert t1 values ('cccc', 'tttt'), (0xD0B1212223D0B1D0B1D0B1D0B1D0B1, 0xD0B1D0B1212223D0B1D0B1D0B1D0B1), (0xD0B1222123D0B1D0B1D0B1D0B1D0B1, 0xD0B1D0B1222123D0B1D0B1D0B1D0B1); insert t1 (c) values ('cc22'); -ERROR 23000: Duplicate entry 'cc22' for key 'c' +ERROR 23000: Duplicate entry 'cc' for key 'c' insert t1 (t) values ('ttt22'); -ERROR 23000: Duplicate entry 'ttt22' for key 't' +ERROR 23000: Duplicate entry 'ttt' for key 't' insert t1 (c) values (0xD0B1212322D0B1D0B1D0B1D0B1D0B1); -ERROR 23000: Duplicate entry 'б!#"' for key 'c' +ERROR 23000: Duplicate entry '\0431!' for key 'c' insert t1 (t) values (0xD0B1D0B1212322D0B1D0B1D0B1D0B1); -ERROR 23000: Duplicate entry 'бб!#"б' for key 't' +ERROR 23000: Duplicate entry '\0431\0431!' for key 't' select c from t1 where c='cccc'; c cccc diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index c02073df677..70e93c3e01f 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -207,6 +207,8 @@ Warning (Code 1286): Unknown table engine 'nonexistent2' Warning (Code 1266): Using storage engine MyISAM for table 't2' Error (Code 1050): Table 't2' already exists drop tables t1, t2; +Variable_name Value +lc_messages ru_RU <TABLE BORDER=1><TR><TH><</TH></TR><TR><TD>< & ></TD></TR></TABLE>create table t1 (a char(5)); insert into t1 values ('\0b\0'); a diff --git a/mysql-test/r/signal.result b/mysql-test/r/signal.result index 56140733c33..6894d38316b 100644 --- a/mysql-test/r/signal.result +++ b/mysql-test/r/signal.result @@ -2332,21 +2332,21 @@ DECLARE céèçà foo CONDITION FOR SQLSTATE '12345'; SIGNAL céèçà SET MYSQL_ERRNO = 1000; end $$ ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'èçà foo CONDITION FOR SQLSTATE '12345'; -SIGNAL céèçà SET MYSQL_ERRNO = 1' at line 3 +SIGNAL céèçà SET ' at line 3 create procedure test_signal() begin DECLARE "céèçà" CONDITION FOR SQLSTATE '12345'; SIGNAL "céèçà" SET MYSQL_ERRNO = 1000; end $$ ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"céèçà" CONDITION FOR SQLSTATE '12345'; -SIGNAL "céèçà" SET MYSQL_ERRNO =' at line 3 +SIGNAL "céèçà" S' at line 3 create procedure test_signal() begin DECLARE 'céèçà' CONDITION FOR SQLSTATE '12345'; SIGNAL 'céèçà' SET MYSQL_ERRNO = 1000; end $$ ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''céèçà' CONDITION FOR SQLSTATE '12345'; -SIGNAL 'céèçà' SET MYSQL_ERRNO =' at line 3 +SIGNAL 'céèçà' S' at line 3 create procedure test_signal() begin DECLARE `céèçà` CONDITION FOR SQLSTATE '12345'; diff --git a/mysql-test/r/type_binary.result b/mysql-test/r/type_binary.result index 432c58272a2..01841bf27fc 100644 --- a/mysql-test/r/type_binary.result +++ b/mysql-test/r/type_binary.result @@ -47,7 +47,7 @@ create table t1 (s1 binary(2) primary key); insert into t1 values (0x01); insert into t1 values (0x0120); insert into t1 values (0x0100); -ERROR 23000: Duplicate entry '' for key 'PRIMARY' +ERROR 23000: Duplicate entry '\x01\x00' for key 'PRIMARY' select hex(s1) from t1 order by s1; hex(s1) 0100 diff --git a/mysql-test/r/type_bit.result b/mysql-test/r/type_bit.result index b831771d9c5..ee68eab8a3f 100644 --- a/mysql-test/r/type_bit.result +++ b/mysql-test/r/type_bit.result @@ -71,7 +71,7 @@ hex(a) 1 1 alter table t1 add unique (a); -ERROR 23000: Duplicate entry '' for key 'a' +ERROR 23000: Duplicate entry '\x00' for key 'a' drop table t1; create table t1 (a bit(2)); insert into t1 values (b'00'), (b'01'), (b'10'), (b'100'); diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index da833c79bb7..47621171e94 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -864,7 +864,7 @@ select @@query_prealloc_size = @test; @@query_prealloc_size = @test 1 set global sql_mode=repeat('a',80); -ERROR 42000: Variable 'sql_mode' can't be set to the value of 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +ERROR 42000: Variable 'sql_mode' can't be set to the value of 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' End of 4.1 tests create table t1 (a int); select a into @x from t1; @@ -1176,18 +1176,18 @@ ERROR HY000: Variable 'init_file' is a read only variable SET @@global.init_file= 'x'; ERROR HY000: Variable 'init_file' is a read only variable # -SHOW VARIABLES like 'language'; +SHOW VARIABLES like 'lc_messages_dir'; Variable_name Value -language # -SELECT @@session.language; -ERROR HY000: Variable 'language' is a GLOBAL variable -SELECT @@global.language; -@@global.language +lc_messages_dir # +SELECT @@session.lc_messages_dir; +ERROR HY000: Variable 'lc_messages_dir' is a GLOBAL variable +SELECT @@global.lc_messages_dir; +@@global.lc_messages_dir # -SET @@session.language= 'x'; -ERROR HY000: Variable 'language' is a read only variable -SET @@global.language= 'x'; -ERROR HY000: Variable 'language' is a read only variable +SET @@session.lc_messages_dir= 'x'; +ERROR HY000: Variable 'lc_messages_dir' is a read only variable +SET @@global.lc_messages_dir= 'x'; +ERROR HY000: Variable 'lc_messages_dir' is a read only variable # SHOW VARIABLES like 'large_page_size'; Variable_name Value diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index 8a87852d582..e2bce537179 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -35,7 +35,7 @@ Warning 1366 Incorrect integer value: 'hej' for column 'a' at row 1 insert into t1 values ("hej"),("d"); Warnings: Warning 1366 Incorrect integer value: 'hej' for column 'a' at row 1 -Warning 1366 Incorrect integer value: 'd?' for column 'a' at row 2 +Warning 1366 Incorrect integer value: 'd' for column 'a' at row 2 set SQL_WARNINGS=1; insert into t1 values ("hej"); Warnings: @@ -43,7 +43,7 @@ Warning 1366 Incorrect integer value: 'hej' for column 'a' at row 1 insert into t1 values ("hej"),("d"); Warnings: Warning 1366 Incorrect integer value: 'hej' for column 'a' at row 1 -Warning 1366 Incorrect integer value: 'd?' for column 'a' at row 2 +Warning 1366 Incorrect integer value: 'd' for column 'a' at row 2 drop table t1; set SQL_WARNINGS=0; drop temporary table if exists not_exists; 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 172f410b949..ca68e92aaa9 100644 --- a/mysql-test/suite/funcs_1/r/innodb_func_view.result +++ b/mysql-test/suite/funcs_1/r/innodb_func_view.result @@ -2123,10 +2123,10 @@ IS NOT TRUE <--------30 characters-------> 3 IS NOT TRUE ---äÖüß@µ*$-- 4 IS TRUE -1 5 Warnings: -Warning 1292 Truncated incorrect DOUBLE value: '' +Warning 1292 Truncated incorrect DOUBLE value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' Warning 1292 Truncated incorrect DOUBLE value: '<--------30 characters------->' -Warning 1292 Truncated incorrect DOUBLE value: ' ---@*$-- ' -Warning 1292 Truncated incorrect DOUBLE value: '-1' +Warning 1292 Truncated incorrect DOUBLE value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DOUBLE value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' 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 if(`t1_values`.`my_binary_30`,'IS TRUE','IS NOT TRUE') AS `IF(my_binary_30, 'IS TRUE', 'IS NOT TRUE')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2140,10 +2140,10 @@ IS NOT TRUE <--------30 characters-------> 3 IS NOT TRUE ---äÖüß@µ*$-- IS TRUE -1 Warnings: -Warning 1292 Truncated incorrect DOUBLE value: '' +Warning 1292 Truncated incorrect DOUBLE value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' Warning 1292 Truncated incorrect DOUBLE value: '<--------30 characters------->' -Warning 1292 Truncated incorrect DOUBLE value: ' ---@*$-- ' -Warning 1292 Truncated incorrect DOUBLE value: '-1' +Warning 1292 Truncated incorrect DOUBLE value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DOUBLE value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' DROP VIEW v1; @@ -2186,7 +2186,7 @@ IS NOT TRUE ---äÖüß@µ*$-- 4 IS TRUE -1 5 Warnings: Warning 1292 Truncated incorrect DOUBLE value: '<--------30 characters------->' -Warning 1292 Truncated incorrect DOUBLE value: ' ---@*$-- ' +Warning 1292 Truncated incorrect DOUBLE 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 if(`t1_values`.`my_char_30`,'IS TRUE','IS NOT TRUE') AS `IF(my_char_30, 'IS TRUE', 'IS NOT TRUE')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2201,7 +2201,7 @@ IS NOT TRUE ---äÖüß@µ*$-- 4 IS TRUE -1 5 Warnings: Warning 1292 Truncated incorrect DOUBLE value: '<--------30 characters------->' -Warning 1292 Truncated incorrect DOUBLE value: ' ---@*$-- ' +Warning 1292 Truncated incorrect DOUBLE value: ' ---äÖüß@µ*$-- ' DROP VIEW v1; @@ -3409,13 +3409,13 @@ NULL NULL 1 -3333.33 -3333.3333 28 Warnings: Warning 1366 Incorrect decimal value: '' for column '' at row -1 -Warning 1292 Truncated incorrect DECIMAL value: '' +Warning 1292 Truncated incorrect DECIMAL value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' Warning 1366 Incorrect decimal value: '' for column '' at row -1 Warning 1292 Truncated incorrect DECIMAL value: '<--------30 characters------->' Warning 1366 Incorrect decimal value: '' for column '' at row -1 -Warning 1292 Truncated incorrect DECIMAL value: ' ---@*$-- ' -Warning 1292 Truncated incorrect DECIMAL value: '-1' -Warning 1292 Truncated incorrect DECIMAL value: '-3333.3333' +Warning 1292 Truncated incorrect DECIMAL value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DECIMAL value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DECIMAL value: '-3333.3333\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' 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_binary_30` as decimal(37,2)) AS `CAST(my_binary_30 AS DECIMAL(37,2))`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -3431,13 +3431,13 @@ NULL NULL 1 -3333.33 -3333.3333 Warnings: Warning 1366 Incorrect decimal value: '' for column '' at row -1 -Warning 1292 Truncated incorrect DECIMAL value: '' +Warning 1292 Truncated incorrect DECIMAL value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' Warning 1366 Incorrect decimal value: '' for column '' at row -1 Warning 1292 Truncated incorrect DECIMAL value: '<--------30 characters------->' Warning 1366 Incorrect decimal value: '' for column '' at row -1 -Warning 1292 Truncated incorrect DECIMAL value: ' ---@*$-- ' -Warning 1292 Truncated incorrect DECIMAL value: '-1' -Warning 1292 Truncated incorrect DECIMAL value: '-3333.3333' +Warning 1292 Truncated incorrect DECIMAL value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DECIMAL value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DECIMAL value: '-3333.3333\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' DROP VIEW v1; @@ -3495,7 +3495,7 @@ Warning 1292 Truncated incorrect DECIMAL value: ' ' Warning 1366 Incorrect decimal value: '' for column '' at row -1 Warning 1292 Truncated incorrect DECIMAL value: '<--------30 characters------->' Warning 1366 Incorrect decimal value: '' for column '' at row -1 -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_char_30` as decimal(37,2)) AS `CAST(my_char_30 AS DECIMAL(37,2))`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -3515,7 +3515,7 @@ Warning 1292 Truncated incorrect DECIMAL value: ' ' Warning 1366 Incorrect decimal value: '' for column '' at row -1 Warning 1292 Truncated incorrect DECIMAL value: '<--------30 characters------->' Warning 1366 Incorrect decimal value: '' for column '' at row -1 -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 a386272b8ab..8b2c2be11e9 100644 --- a/mysql-test/suite/funcs_1/r/memory_func_view.result +++ b/mysql-test/suite/funcs_1/r/memory_func_view.result @@ -2124,10 +2124,10 @@ IS NOT TRUE <--------30 characters-------> 3 IS NOT TRUE ---äÖüß@µ*$-- 4 IS TRUE -1 5 Warnings: -Warning 1292 Truncated incorrect DOUBLE value: '' +Warning 1292 Truncated incorrect DOUBLE value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' Warning 1292 Truncated incorrect DOUBLE value: '<--------30 characters------->' -Warning 1292 Truncated incorrect DOUBLE value: ' ---@*$-- ' -Warning 1292 Truncated incorrect DOUBLE value: '-1' +Warning 1292 Truncated incorrect DOUBLE value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DOUBLE value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' 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 if(`t1_values`.`my_binary_30`,'IS TRUE','IS NOT TRUE') AS `IF(my_binary_30, 'IS TRUE', 'IS NOT TRUE')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2141,10 +2141,10 @@ IS NOT TRUE <--------30 characters-------> 3 IS NOT TRUE ---äÖüß@µ*$-- IS TRUE -1 Warnings: -Warning 1292 Truncated incorrect DOUBLE value: '' +Warning 1292 Truncated incorrect DOUBLE value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' Warning 1292 Truncated incorrect DOUBLE value: '<--------30 characters------->' -Warning 1292 Truncated incorrect DOUBLE value: ' ---@*$-- ' -Warning 1292 Truncated incorrect DOUBLE value: '-1' +Warning 1292 Truncated incorrect DOUBLE value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DOUBLE value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' DROP VIEW v1; @@ -2187,7 +2187,7 @@ IS NOT TRUE ---äÖüß@µ*$-- 4 IS TRUE -1 5 Warnings: Warning 1292 Truncated incorrect DOUBLE value: '<--------30 characters------->' -Warning 1292 Truncated incorrect DOUBLE value: ' ---@*$-- ' +Warning 1292 Truncated incorrect DOUBLE 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 if(`t1_values`.`my_char_30`,'IS TRUE','IS NOT TRUE') AS `IF(my_char_30, 'IS TRUE', 'IS NOT TRUE')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2202,7 +2202,7 @@ IS NOT TRUE ---äÖüß@µ*$-- 4 IS TRUE -1 5 Warnings: Warning 1292 Truncated incorrect DOUBLE value: '<--------30 characters------->' -Warning 1292 Truncated incorrect DOUBLE value: ' ---@*$-- ' +Warning 1292 Truncated incorrect DOUBLE value: ' ---äÖüß@µ*$-- ' DROP VIEW v1; @@ -3410,13 +3410,13 @@ NULL NULL 1 -3333.33 -3333.3333 28 Warnings: Warning 1366 Incorrect decimal value: '' for column '' at row -1 -Warning 1292 Truncated incorrect DECIMAL value: '' +Warning 1292 Truncated incorrect DECIMAL value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' Warning 1366 Incorrect decimal value: '' for column '' at row -1 Warning 1292 Truncated incorrect DECIMAL value: '<--------30 characters------->' Warning 1366 Incorrect decimal value: '' for column '' at row -1 -Warning 1292 Truncated incorrect DECIMAL value: ' ---@*$-- ' -Warning 1292 Truncated incorrect DECIMAL value: '-1' -Warning 1292 Truncated incorrect DECIMAL value: '-3333.3333' +Warning 1292 Truncated incorrect DECIMAL value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DECIMAL value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DECIMAL value: '-3333.3333\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' 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_binary_30` as decimal(37,2)) AS `CAST(my_binary_30 AS DECIMAL(37,2))`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -3432,13 +3432,13 @@ NULL NULL 1 -3333.33 -3333.3333 Warnings: Warning 1366 Incorrect decimal value: '' for column '' at row -1 -Warning 1292 Truncated incorrect DECIMAL value: '' +Warning 1292 Truncated incorrect DECIMAL value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' Warning 1366 Incorrect decimal value: '' for column '' at row -1 Warning 1292 Truncated incorrect DECIMAL value: '<--------30 characters------->' Warning 1366 Incorrect decimal value: '' for column '' at row -1 -Warning 1292 Truncated incorrect DECIMAL value: ' ---@*$-- ' -Warning 1292 Truncated incorrect DECIMAL value: '-1' -Warning 1292 Truncated incorrect DECIMAL value: '-3333.3333' +Warning 1292 Truncated incorrect DECIMAL value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DECIMAL value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DECIMAL value: '-3333.3333\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' DROP VIEW v1; @@ -3496,7 +3496,7 @@ Warning 1292 Truncated incorrect DECIMAL value: ' ' Warning 1366 Incorrect decimal value: '' for column '' at row -1 Warning 1292 Truncated incorrect DECIMAL value: '<--------30 characters------->' Warning 1366 Incorrect decimal value: '' for column '' at row -1 -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_char_30` as decimal(37,2)) AS `CAST(my_char_30 AS DECIMAL(37,2))`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -3516,7 +3516,7 @@ Warning 1292 Truncated incorrect DECIMAL value: ' ' Warning 1366 Incorrect decimal value: '' for column '' at row -1 Warning 1292 Truncated incorrect DECIMAL value: '<--------30 characters------->' Warning 1366 Incorrect decimal value: '' for column '' at row -1 -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 a386272b8ab..8b2c2be11e9 100644 --- a/mysql-test/suite/funcs_1/r/myisam_func_view.result +++ b/mysql-test/suite/funcs_1/r/myisam_func_view.result @@ -2124,10 +2124,10 @@ IS NOT TRUE <--------30 characters-------> 3 IS NOT TRUE ---äÖüß@µ*$-- 4 IS TRUE -1 5 Warnings: -Warning 1292 Truncated incorrect DOUBLE value: '' +Warning 1292 Truncated incorrect DOUBLE value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' Warning 1292 Truncated incorrect DOUBLE value: '<--------30 characters------->' -Warning 1292 Truncated incorrect DOUBLE value: ' ---@*$-- ' -Warning 1292 Truncated incorrect DOUBLE value: '-1' +Warning 1292 Truncated incorrect DOUBLE value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DOUBLE value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' 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 if(`t1_values`.`my_binary_30`,'IS TRUE','IS NOT TRUE') AS `IF(my_binary_30, 'IS TRUE', 'IS NOT TRUE')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2141,10 +2141,10 @@ IS NOT TRUE <--------30 characters-------> 3 IS NOT TRUE ---äÖüß@µ*$-- IS TRUE -1 Warnings: -Warning 1292 Truncated incorrect DOUBLE value: '' +Warning 1292 Truncated incorrect DOUBLE value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' Warning 1292 Truncated incorrect DOUBLE value: '<--------30 characters------->' -Warning 1292 Truncated incorrect DOUBLE value: ' ---@*$-- ' -Warning 1292 Truncated incorrect DOUBLE value: '-1' +Warning 1292 Truncated incorrect DOUBLE value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DOUBLE value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' DROP VIEW v1; @@ -2187,7 +2187,7 @@ IS NOT TRUE ---äÖüß@µ*$-- 4 IS TRUE -1 5 Warnings: Warning 1292 Truncated incorrect DOUBLE value: '<--------30 characters------->' -Warning 1292 Truncated incorrect DOUBLE value: ' ---@*$-- ' +Warning 1292 Truncated incorrect DOUBLE 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 if(`t1_values`.`my_char_30`,'IS TRUE','IS NOT TRUE') AS `IF(my_char_30, 'IS TRUE', 'IS NOT TRUE')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2202,7 +2202,7 @@ IS NOT TRUE ---äÖüß@µ*$-- 4 IS TRUE -1 5 Warnings: Warning 1292 Truncated incorrect DOUBLE value: '<--------30 characters------->' -Warning 1292 Truncated incorrect DOUBLE value: ' ---@*$-- ' +Warning 1292 Truncated incorrect DOUBLE value: ' ---äÖüß@µ*$-- ' DROP VIEW v1; @@ -3410,13 +3410,13 @@ NULL NULL 1 -3333.33 -3333.3333 28 Warnings: Warning 1366 Incorrect decimal value: '' for column '' at row -1 -Warning 1292 Truncated incorrect DECIMAL value: '' +Warning 1292 Truncated incorrect DECIMAL value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' Warning 1366 Incorrect decimal value: '' for column '' at row -1 Warning 1292 Truncated incorrect DECIMAL value: '<--------30 characters------->' Warning 1366 Incorrect decimal value: '' for column '' at row -1 -Warning 1292 Truncated incorrect DECIMAL value: ' ---@*$-- ' -Warning 1292 Truncated incorrect DECIMAL value: '-1' -Warning 1292 Truncated incorrect DECIMAL value: '-3333.3333' +Warning 1292 Truncated incorrect DECIMAL value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DECIMAL value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DECIMAL value: '-3333.3333\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' 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_binary_30` as decimal(37,2)) AS `CAST(my_binary_30 AS DECIMAL(37,2))`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -3432,13 +3432,13 @@ NULL NULL 1 -3333.33 -3333.3333 Warnings: Warning 1366 Incorrect decimal value: '' for column '' at row -1 -Warning 1292 Truncated incorrect DECIMAL value: '' +Warning 1292 Truncated incorrect DECIMAL value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' Warning 1366 Incorrect decimal value: '' for column '' at row -1 Warning 1292 Truncated incorrect DECIMAL value: '<--------30 characters------->' Warning 1366 Incorrect decimal value: '' for column '' at row -1 -Warning 1292 Truncated incorrect DECIMAL value: ' ---@*$-- ' -Warning 1292 Truncated incorrect DECIMAL value: '-1' -Warning 1292 Truncated incorrect DECIMAL value: '-3333.3333' +Warning 1292 Truncated incorrect DECIMAL value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DECIMAL value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DECIMAL value: '-3333.3333\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' DROP VIEW v1; @@ -3496,7 +3496,7 @@ Warning 1292 Truncated incorrect DECIMAL value: ' ' Warning 1366 Incorrect decimal value: '' for column '' at row -1 Warning 1292 Truncated incorrect DECIMAL value: '<--------30 characters------->' Warning 1366 Incorrect decimal value: '' for column '' at row -1 -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_char_30` as decimal(37,2)) AS `CAST(my_char_30 AS DECIMAL(37,2))`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -3516,7 +3516,7 @@ Warning 1292 Truncated incorrect DECIMAL value: ' ' Warning 1366 Incorrect decimal value: '' for column '' at row -1 Warning 1292 Truncated incorrect DECIMAL value: '<--------30 characters------->' Warning 1366 Incorrect decimal value: '' for column '' at row -1 -Warning 1292 Truncated incorrect DECIMAL value: ' ---@*$-- ' +Warning 1292 Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$-- ' DROP VIEW v1; diff --git a/mysql-test/suite/funcs_1/r/ndb_func_view.result b/mysql-test/suite/funcs_1/r/ndb_func_view.result index 172f410b949..ca68e92aaa9 100644 --- a/mysql-test/suite/funcs_1/r/ndb_func_view.result +++ b/mysql-test/suite/funcs_1/r/ndb_func_view.result @@ -2123,10 +2123,10 @@ IS NOT TRUE <--------30 characters-------> 3 IS NOT TRUE ---äÖüß@µ*$-- 4 IS TRUE -1 5 Warnings: -Warning 1292 Truncated incorrect DOUBLE value: '' +Warning 1292 Truncated incorrect DOUBLE value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' Warning 1292 Truncated incorrect DOUBLE value: '<--------30 characters------->' -Warning 1292 Truncated incorrect DOUBLE value: ' ---@*$-- ' -Warning 1292 Truncated incorrect DOUBLE value: '-1' +Warning 1292 Truncated incorrect DOUBLE value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DOUBLE value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' 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 if(`t1_values`.`my_binary_30`,'IS TRUE','IS NOT TRUE') AS `IF(my_binary_30, 'IS TRUE', 'IS NOT TRUE')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2140,10 +2140,10 @@ IS NOT TRUE <--------30 characters-------> 3 IS NOT TRUE ---äÖüß@µ*$-- IS TRUE -1 Warnings: -Warning 1292 Truncated incorrect DOUBLE value: '' +Warning 1292 Truncated incorrect DOUBLE value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' Warning 1292 Truncated incorrect DOUBLE value: '<--------30 characters------->' -Warning 1292 Truncated incorrect DOUBLE value: ' ---@*$-- ' -Warning 1292 Truncated incorrect DOUBLE value: '-1' +Warning 1292 Truncated incorrect DOUBLE value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DOUBLE value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' DROP VIEW v1; @@ -2186,7 +2186,7 @@ IS NOT TRUE ---äÖüß@µ*$-- 4 IS TRUE -1 5 Warnings: Warning 1292 Truncated incorrect DOUBLE value: '<--------30 characters------->' -Warning 1292 Truncated incorrect DOUBLE value: ' ---@*$-- ' +Warning 1292 Truncated incorrect DOUBLE 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 if(`t1_values`.`my_char_30`,'IS TRUE','IS NOT TRUE') AS `IF(my_char_30, 'IS TRUE', 'IS NOT TRUE')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2201,7 +2201,7 @@ IS NOT TRUE ---äÖüß@µ*$-- 4 IS TRUE -1 5 Warnings: Warning 1292 Truncated incorrect DOUBLE value: '<--------30 characters------->' -Warning 1292 Truncated incorrect DOUBLE value: ' ---@*$-- ' +Warning 1292 Truncated incorrect DOUBLE value: ' ---äÖüß@µ*$-- ' DROP VIEW v1; @@ -3409,13 +3409,13 @@ NULL NULL 1 -3333.33 -3333.3333 28 Warnings: Warning 1366 Incorrect decimal value: '' for column '' at row -1 -Warning 1292 Truncated incorrect DECIMAL value: '' +Warning 1292 Truncated incorrect DECIMAL value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' Warning 1366 Incorrect decimal value: '' for column '' at row -1 Warning 1292 Truncated incorrect DECIMAL value: '<--------30 characters------->' Warning 1366 Incorrect decimal value: '' for column '' at row -1 -Warning 1292 Truncated incorrect DECIMAL value: ' ---@*$-- ' -Warning 1292 Truncated incorrect DECIMAL value: '-1' -Warning 1292 Truncated incorrect DECIMAL value: '-3333.3333' +Warning 1292 Truncated incorrect DECIMAL value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DECIMAL value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DECIMAL value: '-3333.3333\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' 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_binary_30` as decimal(37,2)) AS `CAST(my_binary_30 AS DECIMAL(37,2))`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -3431,13 +3431,13 @@ NULL NULL 1 -3333.33 -3333.3333 Warnings: Warning 1366 Incorrect decimal value: '' for column '' at row -1 -Warning 1292 Truncated incorrect DECIMAL value: '' +Warning 1292 Truncated incorrect DECIMAL value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' Warning 1366 Incorrect decimal value: '' for column '' at row -1 Warning 1292 Truncated incorrect DECIMAL value: '<--------30 characters------->' Warning 1366 Incorrect decimal value: '' for column '' at row -1 -Warning 1292 Truncated incorrect DECIMAL value: ' ---@*$-- ' -Warning 1292 Truncated incorrect DECIMAL value: '-1' -Warning 1292 Truncated incorrect DECIMAL value: '-3333.3333' +Warning 1292 Truncated incorrect DECIMAL value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DECIMAL value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +Warning 1292 Truncated incorrect DECIMAL value: '-3333.3333\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' DROP VIEW v1; @@ -3495,7 +3495,7 @@ Warning 1292 Truncated incorrect DECIMAL value: ' ' Warning 1366 Incorrect decimal value: '' for column '' at row -1 Warning 1292 Truncated incorrect DECIMAL value: '<--------30 characters------->' Warning 1366 Incorrect decimal value: '' for column '' at row -1 -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_char_30` as decimal(37,2)) AS `CAST(my_char_30 AS DECIMAL(37,2))`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -3515,7 +3515,7 @@ Warning 1292 Truncated incorrect DECIMAL value: ' ' Warning 1366 Incorrect decimal value: '' for column '' at row -1 Warning 1292 Truncated incorrect DECIMAL value: '<--------30 characters------->' Warning 1366 Incorrect decimal value: '' for column '' at row -1 -Warning 1292 Truncated incorrect DECIMAL value: ' ---@*$-- ' +Warning 1292 Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$-- ' DROP VIEW v1; diff --git a/mysql-test/suite/ndb/r/ndb_index_unique.result b/mysql-test/suite/ndb/r/ndb_index_unique.result index bfc0c5a2e56..1fe02d4b5c7 100644 --- a/mysql-test/suite/ndb/r/ndb_index_unique.result +++ b/mysql-test/suite/ndb/r/ndb_index_unique.result @@ -682,7 +682,7 @@ create table t1 (a int primary key, b varchar(1000) not null, unique key (b)) engine=ndb charset=utf8; insert into t1 values (1, repeat(_utf8 0xe288ab6474, 200)); insert into t1 values (2, repeat(_utf8 0xe288ab6474, 200)); -ERROR 23000: Duplicate entry '∫dt∫dt∫dt∫dt∫dt∫dt∫dt∫dt∫dt∫dt∫dt∫dt∫d' for key 'b' +ERROR 23000: Duplicate entry '\222Bdt\222Bdt\222Bdt\222Bdt\222Bdt\222Bdt\222Bdt\222Bdt\222Bdt\222Bdt\222Bdt\222Bdt\222Bd' for key 'b' select a, sha1(b) from t1; a sha1(b) 1 08f5d02c8b8bc244f275bdfc22c42c5cab0d9d7d diff --git a/mysql-test/t/ctype_errors.test b/mysql-test/t/ctype_errors.test new file mode 100644 index 00000000000..3c73fdae264 --- /dev/null +++ b/mysql-test/t/ctype_errors.test @@ -0,0 +1,47 @@ +--echo Start of 5.4 tests + +# +# ls_messages +# +CREATE TABLE t1(f1 INT); +connect (con1,localhost,root,,test); +connection con1; +SET lc_messages=ru_RU; +SHOW VARIABLES LIKE 'lc_messages'; +--error ER_TABLE_EXISTS_ERROR +CREATE TABLE t1(f1 INT); +SET NAMES utf8; +--error ER_TABLE_EXISTS_ERROR +CREATE TABLE t1(f1 INT); +connection default; +SHOW VARIABLES LIKE 'lc_messages'; +--error ER_TABLE_EXISTS_ERROR +CREATE TABLE t1(f1 INT); + +SHOW GLOBAL VARIABLES LIKE 'lc_messages'; +SET GLOBAL lc_messages=ru_RU; +SHOW GLOBAL VARIABLES LIKE 'lc_messages'; +SET GLOBAL lc_messages=en_US; + +disconnect con1; +DROP TABLE t1; + +# +# Bug#1406 Tablename in Errormessage not in default characterset +# +--error ER_BAD_TABLE_ERROR +drop table `ק`; + +# +# Bug#14602 Error messages not returned in character_set_results +# +connect (con1,localhost,root,,test); +connection con1; +SET lc_messages=cs_CZ; +SET NAMES UTF8; +--error ER_BAD_DB_ERROR +USE nonexistant; +disconnect con1; +connection default; + +--echo End of 5.4 tests diff --git a/mysql-test/t/errors.test b/mysql-test/t/errors.test index 89579ec1739..820766c3a78 100644 --- a/mysql-test/t/errors.test +++ b/mysql-test/t/errors.test @@ -67,3 +67,38 @@ SHOW ERRORS; INSERT INTO t1 SELECT b FROM t1; DROP TABLE t1; # End of 5.0 tests + +# +# testing the value encoding in the error messages of set_var +# +SET NAMES utf8; +--error ER_WRONG_VALUE_FOR_VAR +SET sql_quote_show_create= _binary x'5452C39C45'; +--error ER_WRONG_VALUE_FOR_VAR +SET sql_quote_show_create= _utf8 x'5452C39C45'; +--error ER_WRONG_VALUE_FOR_VAR +SET sql_quote_show_create=_latin1 x'5452DC45'; +--error ER_WRONG_VALUE_FOR_VAR +SET sql_quote_show_create='TRÜE'; +--error ER_WRONG_VALUE_FOR_VAR +SET sql_quote_show_create=TRÜE; + +SET NAMES latin1; +--error ER_WRONG_VALUE_FOR_VAR +SET sql_quote_show_create= _binary x'5452C39C45'; +--error ER_WRONG_VALUE_FOR_VAR +SET sql_quote_show_create= _utf8 x'5452C39C45'; +--error ER_WRONG_VALUE_FOR_VAR +SET sql_quote_show_create=_latin1 x'5452DC45'; +--error ER_WRONG_VALUE_FOR_VAR +SET sql_quote_show_create='TR.E'; +--error ER_WRONG_VALUE_FOR_VAR +SET sql_quote_show_create=TR.E; + +SET NAMES binary; +--error ER_WRONG_VALUE_FOR_VAR +SET sql_quote_show_create= _binary x'5452C39C45'; +--error ER_WRONG_VALUE_FOR_VAR +SET sql_quote_show_create= _utf8 x'5452C39C45'; +--error ER_WRONG_VALUE_FOR_VAR +SET sql_quote_show_create=_latin1 x'5452DC45'; diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index cffa6392fa3..6e74e065720 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -383,6 +383,11 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug31060.sql; drop tables t1, t2; # +# mysql client with 'init-command' option +# +--exec $MYSQL --init-command="SET lc_messages=ru_RU" -e "SHOW VARIABLES LIKE 'lc_messages';" + +# # Bug #27884: mysql --html does not quote HTML special characters in output # --exec $MYSQL --html test -e "select '< & >' as '<'" diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index e7d7d5ca16b..6b179c72915 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -948,15 +948,15 @@ SET @@global.init_file= 'x'; # --echo # --replace_column 2 # -SHOW VARIABLES like 'language'; +SHOW VARIABLES like 'lc_messages_dir'; --error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT @@session.language; +SELECT @@session.lc_messages_dir; --replace_column 1 # -SELECT @@global.language; +SELECT @@global.lc_messages_dir; --error ER_INCORRECT_GLOBAL_LOCAL_VAR -SET @@session.language= 'x'; +SET @@session.lc_messages_dir= 'x'; --error ER_INCORRECT_GLOBAL_LOCAL_VAR -SET @@global.language= 'x'; +SET @@global.lc_messages_dir= 'x'; # --echo # --replace_column 2 # |