diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-11 12:39:38 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-11 12:39:38 +0300 |
| commit | 567671368723c704d60902b4d0ccff951b414552 (patch) | |
| tree | 965519a5b0af3f33624c7e16fd61b58d15f42372 /mysql-test/r/errors.result | |
| parent | efee0608316e4cc034a3e62d05980eef8530843d (diff) | |
| parent | ceefe7bb50b17b72e88851e3b98642e89a4cddae (diff) | |
| download | mariadb-git-567671368723c704d60902b4d0ccff951b414552.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- client/mysqltest.cc
- mysql-test/collections/default.experimental
- mysql-test/suite/rpl/t/disabled.def
- sql/mysqld.cc
- sql/opt_range.cc
- sql/sp.cc
- sql/sql_acl.cc
- sql/sql_partition.cc
- sql/sql_table.cc
Diffstat (limited to 'mysql-test/r/errors.result')
| -rw-r--r-- | mysql-test/r/errors.result | 29 |
1 files changed, 29 insertions, 0 deletions
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 '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 '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' |