diff options
| author | monty@mashka.mysql.fi <> | 2003-08-19 00:08:08 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-08-19 00:08:08 +0300 |
| commit | 4f7512160bfd467e5d53c3e133e1842fac2737ce (patch) | |
| tree | df4f8c8cf4d399e322333c5516d5c19507b1fda8 /mysql-test/t/variables.test | |
| parent | 2263e3e51faba531a0a7055dbf706a6a8719ad70 (diff) | |
| download | mariadb-git-4f7512160bfd467e5d53c3e133e1842fac2737ce.tar.gz | |
After merge fixes
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
Diffstat (limited to 'mysql-test/t/variables.test')
| -rw-r--r-- | mysql-test/t/variables.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 16a192f1276..22f8406cba5 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -120,7 +120,7 @@ set SESSION query_cache_size=10000; set GLOBAL table_type=DEFAULT; --error 1115 set character_set_client=UNKNOWN_CHARACTER_SET; ---error 1271 +--error 1272 set collation_connection=UNKNOWN_COLLATION; --error 1228 set global autocommit=1; |