diff options
author | unknown <jimw@mysql.com> | 2005-07-29 09:25:11 -0700 |
---|---|---|
committer | unknown <jimw@mysql.com> | 2005-07-29 09:25:11 -0700 |
commit | c7908e787bdd94c53b3e95ab6cb6b3eec322fb45 (patch) | |
tree | dd2fce300eb958ff625502bcc4544a2474f6dcf9 /mysql-test/t/variables.test | |
parent | 68cd99bd9966a4738feb0fa55fd3b71a52d3c1a9 (diff) | |
parent | 120e80f1d9d182fa0a7c52b27b1f4a9d4ffa4760 (diff) | |
download | mariadb-git-c7908e787bdd94c53b3e95ab6cb6b3eec322fb45.tar.gz |
Merge mysql.com:/home/jimw/my/mysql-5.0-10351
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/t/select_safe.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/variables.test')
-rw-r--r-- | mysql-test/t/variables.test | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 1dae1812347..d6dd6017a16 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -410,11 +410,9 @@ set @@warning_count=1; set @@global.error_count=1; # -# Bug #10351: Setting max_heap_table_size to 4G fails +# Bug #10351: Setting ulong variable to > MAX_ULONG fails on 32-bit platform # set @@max_heap_table_size= 4294967296; -select @@max_heap_table_size; +select @@max_heap_table_size > 0; set global max_heap_table_size= 4294967296; -select @@max_heap_table_size; -set @@max_heap_table_size= 4294967296; -select @@max_heap_table_size; +select @@global.max_heap_table_size > 0; |