database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge mysql.com:/home/jimw/my/mysql-4.1-clean

Browse Source 
into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/t/variables.test:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/r/variables.result:
  Resolve conflict
scripts/mysqld_multi.sh:
  Resolve conflict
This commit is contained in:
unknown
2005-09-02 12:42:00 -07:00
parent 196862dfd9 cbb1da77cf
commit 79ae20bc3a
4 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/t/variables.test
View File

@ -390,6 +390,14 @@ SET GLOBAL table_cache=-1;
SHOW VARIABLES LIKE 'table_cache';
SET GLOBAL table_cache=DEFAULT;
#
# Bugs12363: character_set_results is nullable,
# but value_ptr returns string "NULL"
#
set character_set_results=NULL;
select ifnull(@@character_set_results,"really null");
set names latin1;
# End of 4.1 tests
#