- Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339 and 342

- Fix for QNX: UNIX sockets available since 6.2.1


include/my_global.h:
  Fix for QNX: UNIX sockets available since 6.2.1
mysql-test/r/variables.result:
  Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
mysql-test/t/variables.test:
  Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
sql/mysqld.cc:
  Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
sql/set_var.cc:
  Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
sql/set_var.h:
  Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339

2 files changed, 18 insertions, 14 deletions

diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 1cc48d2aeac..8a6791004ee 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -108,17 +108,14 @@ show global variables like 'table_type';
 Variable_name	Value
 table_type	INNODB
 set GLOBAL query_cache_size=100000;
-set myisam_max_sort_file_size=10000, GLOBAL myisam_max_sort_file_size=20000;
-show variables like 'myisam_max_sort_file_size';
-Variable_name	Value
-myisam_max_sort_file_size	10000
+set GLOBAL myisam_max_sort_file_size=2000000;
 show global variables like 'myisam_max_sort_file_size';
 Variable_name	Value
-myisam_max_sort_file_size	20000
-set myisam_max_sort_file_size=default;
+myisam_max_sort_file_size	1048576
+set GLOBAL myisam_max_sort_file_size=default;
 show variables like 'myisam_max_sort_file_size';
 Variable_name	Value
-myisam_max_sort_file_size	20000
+myisam_max_sort_file_size	2147483647
 set global net_retry_count=10, session net_retry_count=10;
 set global net_buffer_length=1024, net_write_timeout=200, net_read_timeout=300;
 set session net_buffer_length=2048, net_write_timeout=500, net_read_timeout=600;
@@ -211,6 +208,10 @@ set @@global.sql_auto_is_null=1;
 Variable 'sql_auto_is_null' is a LOCAL variable and can't be used with SET GLOBAL
 select @@global.sql_auto_is_null;
 Variable 'sql_auto_is_null' is a LOCAL variable and can't be used with SET GLOBAL
+set myisam_max_sort_file_size=100;
+Variable 'myisam_max_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
+set myisam_max_extra_sort_file_size=100;
+Variable 'myisam_max_extra_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
 set autocommit=1;
 set big_tables=1;
 select @@autocommit, @@big_tables;
@@ -264,11 +265,11 @@ select @@max_user_connections;
 @@max_user_connections
 100
 set global max_write_lock_count=100;
-set myisam_max_extra_sort_file_size=100;
+set global myisam_max_extra_sort_file_size=100;
 select @@myisam_max_extra_sort_file_size;
 @@myisam_max_extra_sort_file_size
 100
-set myisam_max_sort_file_size=100;
+set global myisam_max_sort_file_size=100;
 set myisam_sort_buffer_size=100;
 set net_buffer_length=100;
 set net_read_timeout=100;
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index 639a28edd38..c730f317fcb 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -69,10 +69,9 @@ show local variables like 'table_type';
 show global variables like 'table_type';
 set GLOBAL query_cache_size=100000;
 
-set myisam_max_sort_file_size=10000, GLOBAL myisam_max_sort_file_size=20000;
-show variables like 'myisam_max_sort_file_size';
+set GLOBAL myisam_max_sort_file_size=2000000;
 show global variables like 'myisam_max_sort_file_size';
-set myisam_max_sort_file_size=default;
+set GLOBAL myisam_max_sort_file_size=default;
 show variables like 'myisam_max_sort_file_size';
 
 set global net_retry_count=10, session net_retry_count=10;
@@ -137,6 +136,10 @@ set @@concurrent_insert=1;
 set @@global.sql_auto_is_null=1;
 --error 1228
 select @@global.sql_auto_is_null;
+--error 1229
+set myisam_max_sort_file_size=100;
+--error 1229
+set myisam_max_extra_sort_file_size=100;
 
 # Test setting all variables
 
@@ -181,9 +184,9 @@ set max_tmp_tables=100;
 set global max_user_connections=100;
 select @@max_user_connections;
 set global max_write_lock_count=100;
-set myisam_max_extra_sort_file_size=100;
+set global myisam_max_extra_sort_file_size=100;
 select @@myisam_max_extra_sort_file_size;
-set myisam_max_sort_file_size=100;
+set global myisam_max_sort_file_size=100;
 set myisam_sort_buffer_size=100;
 set net_buffer_length=100;
 set net_read_timeout=100;