Manual merge from mysql-next-mr.

Conflicts:
  - sql/log_event.cc
  - sql/sql_class.h

1 files changed, 17 insertions, 8 deletions

diff --git a/mysql-test/suite/sys_vars/t/lower_case_table_names_basic.test b/mysql-test/suite/sys_vars/t/lower_case_table_names_basic.test
index 8d6a3bb5ca6..eaa6c95974e 100644
--- a/mysql-test/suite/sys_vars/t/lower_case_table_names_basic.test
+++ b/mysql-test/suite/sys_vars/t/lower_case_table_names_basic.test
@@ -1,17 +1,26 @@
 #
 # only global
 #
+# 2010-01-20 OBN - Modified to include check for valid values
+#                - Added check for variable value matching I_S tables
+#
+
 select @@global.lower_case_table_names=20;
 --error ER_INCORRECT_GLOBAL_LOCAL_VAR
 select @@session.lower_case_table_names;
---replace_column 2 #
-show global variables like 'lower_case_table_names';
---replace_column 2 #
-show session variables like 'lower_case_table_names';
---replace_column 2 #
-select * from information_schema.global_variables where variable_name='lower_case_table_names';
---replace_column 2 #
-select * from information_schema.session_variables where variable_name='lower_case_table_names';
+
+# Show variable has a valid value
+SELECT @@global.lower_case_table_names in (0,1,2);
+
+# Show that value of the variable matches the value in the GLOBAL I_S table
+SELECT @@global.lower_case_table_names = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='lower_case_table_names';
+
+# Show that value of the variable matches the value in the SESSION I_S table
+SELECT @@global.lower_case_table_names = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='lower_case_table_names';
 
 #
 # show that it's read-only