1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge mysql.com:/usr/home/ram/work/4.1.b9613

into  mysql.com:/usr/home/ram/work/mysql-5.0


sql/ha_blackhole.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/r/variables.result:
  merging
mysql-test/t/variables.test:
  merging
This commit is contained in:
unknown
2005-08-31 10:25:00 +05:00
6 changed files with 37 additions and 4 deletions

View File

@ -395,6 +395,7 @@ SET GLOBAL table_cache=DEFAULT;
#
# Bug#6282 Packet error with SELECT INTO
#
create table t1 (a int);
select a into @x from t1;
show warnings;
@ -412,9 +413,17 @@ set @@global.error_count=1;
#
# Bug #10351: Setting ulong variable to > MAX_ULONG fails on 32-bit platform
#
set @@max_heap_table_size= 4294967296;
select @@max_heap_table_size > 0;
set global max_heap_table_size= 4294967296;
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;