mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
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:
@ -518,6 +518,14 @@ select ifnull(@@character_set_results,"really null");
|
||||
ifnull(@@character_set_results,"really null")
|
||||
really null
|
||||
set names latin1;
|
||||
select @@have_innodb;
|
||||
@@have_innodb
|
||||
#
|
||||
set @test = @@query_prealloc_size;
|
||||
set @@query_prealloc_size = @test;
|
||||
select @@query_prealloc_size = @test;
|
||||
@@query_prealloc_size = @test
|
||||
1
|
||||
create table t1 (a int);
|
||||
select a into @x from t1;
|
||||
Warnings:
|
||||
@ -542,9 +550,6 @@ set @@max_heap_table_size= 4294967296;
|
||||
select @@max_heap_table_size > 0;
|
||||
@@max_heap_table_size > 0
|
||||
1
|
||||
select @@have_innodb;
|
||||
@@have_innodb
|
||||
#
|
||||
select @@character_set_system;
|
||||
@@character_set_system
|
||||
utf8
|
||||
|
Reference in New Issue
Block a user