diff options
| author | monty@mashka.mysql.fi <> | 2002-12-20 14:58:27 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-12-20 14:58:27 +0200 |
| commit | b5aa9ae0c768c92321e99939f5533bcce8382366 (patch) | |
| tree | 1cf172e757bfa6aca7ae5af20ed7b0c727016120 /mysql-test | |
| parent | e2e5d5986672928d6e01f2bb7815ec5a1bf7c374 (diff) | |
| download | mariadb-git-b5aa9ae0c768c92321e99939f5533bcce8382366.tar.gz | |
Changed thd variables max_join_size and select_limit to type ha_rows.
This fixed some optimization problems when using -DBIG_TABLES
Portabilty fixes for OpenUnix and HPUX
Added C and C++ version numbers to mysqlbug
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/variables.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/variables.test | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index f8ac13477a9..ed477a8519b 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -50,7 +50,7 @@ Variable_name Value max_join_size 100 show global variables like 'max_join_size'; Variable_name Value -max_join_size 4294967295 +max_join_size HA_POS_ERROR set GLOBAL max_join_size=2000; show global variables like 'max_join_size'; Variable_name Value @@ -62,7 +62,7 @@ max_join_size 2000 set GLOBAL max_join_size=DEFAULT; show global variables like 'max_join_size'; Variable_name Value -max_join_size 4294967295 +max_join_size HA_POS_ERROR set @@max_join_size=1000, @@global.max_join_size=2000; select @@local.max_join_size, @@global.max_join_size; @@session.max_join_size @@global.max_join_size diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index e21fbd975e6..5863cb97d57 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -34,12 +34,15 @@ drop table t1; set max_join_size=100; show 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; |