diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-01-27 10:49:07 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-01-27 10:49:07 +0100 |
| commit | 7ee0c6b5cfa14d2f3ab9655d937ac20c0da0506b (patch) | |
| tree | ef0edf4b9c14460884d85ebaa6212e67e892a336 /mysql-test/r/variables.result | |
| parent | f300c891870c3b0874c3c4a1cfb70d116af17457 (diff) | |
| parent | 313ea47da4c20a89a5d1178ae4bec913126ad38f (diff) | |
| download | mariadb-git-7ee0c6b5cfa14d2f3ab9655d937ac20c0da0506b.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/rpl000001.result:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/r/rpl_loaddata_rule_m.result:
Auto merged
mysql-test/r/rpl_loaddata_rule_s.result:
Auto merged
mysql-test/r/rpl_misc_functions.result:
Auto merged
mysql-test/r/rpl_replicate_do.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/rpl000001.test:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
mysql-test/t/rpl_loaddata_rule_m.test:
Auto merged
mysql-test/t/rpl_loaddata_rule_s.test:
Auto merged
mysql-test/t/rpl_misc_functions.test:
Auto merged
mysql-test/t/rpl_replicate_do.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/trigger-compat.test:
Auto merged
mysql-test/r/trigger-compat.result:
Merge
Diffstat (limited to 'mysql-test/r/variables.result')
| -rw-r--r-- | mysql-test/r/variables.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 4f6a6569443..1b5532c334a 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -71,6 +71,7 @@ c_id c_name c_country 1 Bozo USA 4 Mr. Floppy GB drop table t1; +set GLOBAL max_join_size=10; set max_join_size=100; show variables like 'max_join_size'; Variable_name Value |