diff options
| author | unknown <jimw@mysql.com> | 2005-07-25 11:25:28 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-07-25 11:25:28 -0700 |
| commit | f8a6e9d369c2dcf738393ec0d7c54c9a7605156d (patch) | |
| tree | 740db13069806b181ea0193bd73576bb51916444 /mysql-test/r/key_cache.result | |
| parent | bf45b6ba8477a9a910ec530c126569c208d5c0a1 (diff) | |
| download | mariadb-git-f8a6e9d369c2dcf738393ec0d7c54c9a7605156d.tar.gz | |
Don't force column header to @@session.var_name if @@local.var_name
was used. (Bug #10724)
mysql-test/r/key_cache.result:
Updated results
mysql-test/r/ps_1general.result:
Updated results
mysql-test/r/user_var.result:
Add new results
mysql-test/r/variables.result:
Update results
mysql-test/t/user_var.test:
Add new regression test
sql/item_func.cc:
Don't set name explicitly in get_system_var(), let it get set by the
select_item: rule in sql_parse.yy or other callers of get_system_var().
sql/sql_parse.cc:
Set the name on the Item returned by get_system_var().
Diffstat (limited to 'mysql-test/r/key_cache.result')
| -rw-r--r-- | mysql-test/r/key_cache.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/key_cache.result b/mysql-test/r/key_cache.result index 79b5a6e84b2..41aaa21eea3 100644 --- a/mysql-test/r/key_cache.result +++ b/mysql-test/r/key_cache.result @@ -23,13 +23,13 @@ SELECT @@global.default.key_buffer_size; @@global.default.key_buffer_size 16777216 SELECT @@global.default.`key_buffer_size`; -@@global.default.key_buffer_size +@@global.default.`key_buffer_size` 16777216 SELECT @@global.`default`.`key_buffer_size`; -@@global.default.key_buffer_size +@@global.`default`.`key_buffer_size` 16777216 SELECT @@`default`.key_buffer_size; -@@default.key_buffer_size +@@`default`.key_buffer_size 16777216 SELECT @@small.key_buffer_size; @@small.key_buffer_size |