diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-04 15:40:55 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-04 15:40:55 +0200 |
| commit | 8ce6c9fc6c3091c43ab91980fe904ed5125ba597 (patch) | |
| tree | 49da2620373e1b4c73d505405819d5d7097786bc /mysql-test/t/variables.test | |
| parent | f67891c24422a223a50a2477883e587c520057ad (diff) | |
| parent | e229fe9801cc9fb7e3783cf708bc7cb695606c64 (diff) | |
| download | mariadb-git-8ce6c9fc6c3091c43ab91980fe904ed5125ba597.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/multi_update.result:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
mysys/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test/t/variables.test')
| -rw-r--r-- | mysql-test/t/variables.test | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 552777743f8..5863cb97d57 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -34,13 +34,15 @@ drop table t1; set max_join_size=100; show variables like 'max_join_size'; -# Removed, because it has different value with/without BIG_TABLES -#show global variables like 'max_join_size'; +--replace_result 18446744073709551615 HA_POS_ERROR 4294967295 HA_POS_ERROR +show global variables like 'max_join_size'; set GLOBAL max_join_size=2000; show global variables like 'max_join_size'; set max_join_size=DEFAULT; +--replace_result 18446744073709551615 HA_POS_ERROR 4294967295 HA_POS_ERROR show variables like 'max_join_size'; set GLOBAL max_join_size=DEFAULT; +--replace_result 18446744073709551615 HA_POS_ERROR 4294967295 HA_POS_ERROR show global variables like 'max_join_size'; set @@max_join_size=1000, @@global.max_join_size=2000; select @@local.max_join_size, @@global.max_join_size; |