diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-02-29 21:55:04 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-02-29 21:55:04 +0100 |
| commit | e4bfb6f161b77a8c5801ba71b4ffd980066a1399 (patch) | |
| tree | a48bbc4154695db34ba124f07a70bef5cabab48d /mysql-test/r/ddl_i18n_utf8.result | |
| parent | e293bdb2c19cacad91d4f5a846568ac595b3a48e (diff) | |
| download | mariadb-git-e4bfb6f161b77a8c5801ba71b4ffd980066a1399.tar.gz | |
pbxt suite is now a main-pbxt overlay
Diffstat (limited to 'mysql-test/r/ddl_i18n_utf8.result')
| -rw-r--r-- | mysql-test/r/ddl_i18n_utf8.result | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/mysql-test/r/ddl_i18n_utf8.result b/mysql-test/r/ddl_i18n_utf8.result index a970a1b41fa..fb32d229040 100644 --- a/mysql-test/r/ddl_i18n_utf8.result +++ b/mysql-test/r/ddl_i18n_utf8.result @@ -1395,18 +1395,18 @@ INSERT INTO t1 VALUES(1)| ---> Log: SELECT msg FROM log| msg -utf8_unicode_ci +koi8r_general_ci +koi8r_general_ci +utf8 +utf8 utf8_general_ci utf8_general_ci -koi8r_general_ci utf8_general_ci -utf8 utf8_general_ci utf8_general_ci utf8_general_ci -koi8r_general_ci utf8_general_ci -utf8 +utf8_unicode_ci SELECT COLLATION(@a1) AS ca1, @@ -1426,18 +1426,18 @@ INSERT INTO mysqltest2.t1 VALUES(1)| ---> Log: SELECT msg FROM mysqltest2.log| msg -utf8_unicode_ci +koi8r_general_ci +koi8r_general_ci +utf8 +utf8 utf8_general_ci utf8_general_ci -koi8r_general_ci utf8_general_ci -utf8 utf8_general_ci utf8_general_ci utf8_general_ci -koi8r_general_ci utf8_general_ci -utf8 +utf8_unicode_ci SELECT COLLATION(@a1) AS ca1, @@ -1668,18 +1668,18 @@ INSERT INTO t1 VALUES(1)| ---> Log: SELECT msg FROM log| msg -utf8_unicode_ci +koi8r_general_ci +koi8r_general_ci +utf8 +utf8 utf8_general_ci utf8_general_ci -koi8r_general_ci utf8_general_ci -utf8 utf8_general_ci utf8_general_ci utf8_general_ci -koi8r_general_ci utf8_general_ci -utf8 +utf8_unicode_ci SELECT COLLATION(@a1) AS ca1, @@ -1699,18 +1699,18 @@ INSERT INTO mysqltest2.t1 VALUES(1)| ---> Log: SELECT msg FROM mysqltest2.log| msg -utf8_unicode_ci +koi8r_general_ci +koi8r_general_ci +utf8 +utf8 utf8_general_ci utf8_general_ci -koi8r_general_ci utf8_general_ci -utf8 utf8_general_ci utf8_general_ci utf8_general_ci -koi8r_general_ci utf8_general_ci -utf8 +utf8_unicode_ci SELECT COLLATION(@a1) AS ca1, @@ -2103,18 +2103,18 @@ INSERT INTO t1 VALUES(1)| ---> Log: SELECT msg FROM log| msg -utf8_unicode_ci +koi8r_general_ci +koi8r_general_ci +utf8 +utf8 utf8_general_ci utf8_general_ci -koi8r_general_ci utf8_general_ci -utf8 utf8_general_ci utf8_general_ci utf8_general_ci -koi8r_general_ci utf8_general_ci -utf8 +utf8_unicode_ci SELECT COLLATION(@a1) AS ca1, @@ -2134,18 +2134,18 @@ INSERT INTO mysqltest2.t1 VALUES(1)| ---> Log: SELECT msg FROM mysqltest2.log| msg -utf8_unicode_ci +koi8r_general_ci +koi8r_general_ci +utf8 +utf8 utf8_general_ci utf8_general_ci -koi8r_general_ci utf8_general_ci -utf8 utf8_general_ci utf8_general_ci utf8_general_ci -koi8r_general_ci utf8_general_ci -utf8 +utf8_unicode_ci SELECT COLLATION(@a1) AS ca1, |