database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +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/my_manage.c:
  Auto merged
mysql-test/mysql_test_run_new.c:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/r/variables.result:
  Resolve conflicts
mysql-test/t/variables.test:
  Resolve conflicts
sql/sql_acl.cc:
  Resolve conflicts
strings/ctype-simple.c:
  Resolve conflicts
strings/ctype-ucs2.c:
  Resolve conflicts
This commit is contained in:
unknown
2005-10-19 13:47:05 -07:00
parent f8bfae6b87 c3ac502ab1
commit 3d53c870d3
9 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -398,6 +398,21 @@ set character_set_results=NULL;
select ifnull(@@character_set_results,"really null");
set names latin1;
#
# Bug #9613: @@have_innodb
#
--replace_column 1 #
select @@have_innodb;
#
# Bug #13334: query_prealloc_size default less than minimum
#
set @test = @@query_prealloc_size;
set @@query_prealloc_size = @test;
select @@query_prealloc_size = @test;
# End of 4.1 tests
#
@ -429,13 +444,6 @@ select @@max_heap_table_size > 0;
set @@max_heap_table_size= 4294967296;
select @@max_heap_table_size > 0;
#
# Bug #9613: @@have_innodb
#
--replace_column 1 #
select @@have_innodb;
#
# Bug #11775 Variable character_set_system does not exist (sometimes)
#
@ -444,3 +452,5 @@ select @@character_set_system;
set global character_set_system = latin1;
--error 1238
set @@global.version_compile_os='234';
# End of 5.0 tests