diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-05-21 17:44:12 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-05-21 17:44:12 +0500 |
| commit | 4637832fa19b2866929c1e5cb7c9dd0a40db15c9 (patch) | |
| tree | c1d41d9ae86450c3c93a4424253c8553ffcec322 /mysql-test/r/variables.result | |
| parent | 01add721927cf92ec3368cb56d685777aacbfe42 (diff) | |
| download | mariadb-git-4637832fa19b2866929c1e5cb7c9dd0a40db15c9.tar.gz | |
Some SHOW VARIABLES have been renamed:
collation_client -> character_set_client
collation_results -> character_set_results
character_set -> character_set_server
SET NAMES now doesn't start client->server conversion
SET CHARACTER SET now starts both client->server and server->client conversion
Diffstat (limited to 'mysql-test/r/variables.result')
| -rw-r--r-- | mysql-test/r/variables.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 5e613418ea1..f1afcedac83 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -156,9 +156,9 @@ show variables like 'net_buffer_length'; Variable_name Value net_buffer_length 1048576 set character set cp1251_koi8; -show variables like "collation_client"; +show variables like "character_set_client"; Variable_name Value -collation_client cp1251_bulgarian_ci +character_set_client cp1251 select @@timestamp>0; @@timestamp>0 1 @@ -185,7 +185,7 @@ set SESSION query_cache_size=10000; Variable 'query_cache_size' is a GLOBAL variable and should be set with SET GLOBAL set GLOBAL table_type=DEFAULT; Variable 'table_type' doesn't have a default value -set collation_client=UNKNOWN_CHARACTER_SET; +set character_set_client=UNKNOWN_CHARACTER_SET; Unknown character set: 'UNKNOWN_CHARACTER_SET' set global autocommit=1; Variable 'autocommit' is a LOCAL variable and can't be used with SET GLOBAL |