diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-02-07 17:57:26 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-02-07 17:57:26 +0100 |
| commit | 0522905ac3270e5ddcef79e96169d1d972d1fc13 (patch) | |
| tree | 4a5ae6ef2c5f066164a167c072e40d4b207f10da /mysql-test/t/variables.test | |
| parent | 59bd66d36905e21db4c3080d359452aaefa97279 (diff) | |
| parent | 3b8004329627ea643f9c59c9ee683b38dd976d4f (diff) | |
| download | mariadb-git-0522905ac3270e5ddcef79e96169d1d972d1fc13.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/rpl_loaddata_m.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/read_only.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/trigger-compat.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
mysql-test/r/trigger-compat.result:
Merge 5.0 -> 5.1
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 76761f9177d..fec47e6aaf0 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -48,7 +48,7 @@ drop table t1; # # Test system variables # - +set GLOBAL max_join_size=10; set max_join_size=100; show variables like 'max_join_size'; --replace_result 18446744073709551615 HA_POS_ERROR 4294967295 HA_POS_ERROR |