diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-02 01:48:43 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-02 01:48:43 +0100 |
| commit | 6a72267d05ba24953345b9fe516d6bff2f77e8eb (patch) | |
| tree | 2cc4962b85af835d461cb0c5c5759ff69ea5b687 /mysql-test/t/variables.test | |
| parent | e26804399bf57d20f9bd37aebd143ca225daf3f0 (diff) | |
| parent | 89a208850a714d5653207cffa2d654e86063a7e7 (diff) | |
| download | mariadb-git-6a72267d05ba24953345b9fe516d6bff2f77e8eb.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/misc/mysql/31177/50-31177
client/mysql.cc:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/type_bit.result:
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index a8f0a3425df..e21e10d3052 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -126,7 +126,7 @@ set GLOBAL query_cache_size=100000; set GLOBAL myisam_max_sort_file_size=2000000; show global variables like 'myisam_max_sort_file_size'; set GLOBAL myisam_max_sort_file_size=default; ---replace_result 2147483647 FILE_SIZE 9223372036854775807 FILE_SIZE +--replace_result 2147482624 FILE_SIZE 2146435072 FILE_SIZE show variables like 'myisam_max_sort_file_size'; set global net_retry_count=10, session net_retry_count=10; |