SHOW VARIABLES LIKE ... are now case insensitive

Fixed stack overflow checking with crash-me with gcc 3.0.4
Using @@unknown_variable doesn't hang client anymore
Added @@VERSION variable

6 files changed, 22 insertions, 6 deletions

diff --git a/mysql-test/r/identity.result b/mysql-test/r/identity.result
deleted file mode 100644
index 45968248d26..00000000000
--- a/mysql-test/r/identity.result
+++ /dev/null
@@ -1,4 +0,0 @@
-last_insert_id(345)
-345
-@@IDENTITY	last_insert_id()
-345	345
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index 099ea2fa109..419b2b4ce7e 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -47,6 +47,8 @@ test.t1	optimize	status	Table is already up to date
 Variable_name	Value
 wait_timeout	28800
 Variable_name	Value
+wait_timeout	28800
+Variable_name	Value
 Name	Type	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Create_options	Comment
 Database
 mysql
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index ab60d5042b0..adf8100f052 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -23,3 +23,11 @@ c_id	c_name	c_country
 c_id	c_name	c_country
 1	Bozo	USA
 4	Mr. Floppy	GB
+@@VERSION=version()
+1
+last_insert_id(345)
+345
+@@IDENTITY	last_insert_id()
+345	345
+@@IDENTITY
+345
diff --git a/mysql-test/t/identity.test b/mysql-test/t/identity.test
deleted file mode 100644
index 37183fd3b35..00000000000
--- a/mysql-test/t/identity.test
+++ /dev/null
@@ -1,2 +0,0 @@
-select last_insert_id(345);
-select @@IDENTITY,last_insert_id();
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
index 0f07d577c0c..0981b85c91e 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -33,6 +33,7 @@ drop table t1;
 
 #show variables;
 show variables like "wait_timeout%";
+show variables like "WAIT_timeout%";
 show variables like "this_doesn't_exists%";
 show table status from test like "this_doesn't_exists%";
 show databases;
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index 0499263467c..b3127402238 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -27,3 +27,14 @@ SELECT * FROM t1 WHERE c_id=@min_cid OR c_id=@max_cid OR c_id=666;
 ALTER TABLE t1 DROP PRIMARY KEY;
 select * from t1 where c_id=@min_cid OR c_id=@max_cid;
 drop table t1;
+
+#
+# Test system variables
+#
+
+select @@VERSION=version();
+select last_insert_id(345);
+select @@IDENTITY,last_insert_id();
+select @@identity;
+--error 1193
+select @@unknown_variable;