Merge branch 'mysql-5.5' into mysql-5.6

Author: Arun Kuruvila

mysql-test/r/lowercase_fs_on.result

@@ -0,0 +1,3 @@
+#
+# Bug#20198490 : LOWER_CASE_TABLE_NAMES=0 ON WINDOWS LEADS TO PROBLEMS
+#

mysql-test/r/lowercase_table3.result

@@ -2,6 +2,10 @@
 # Bug #13083023 - 60229: BROKEN COMPATIBILITY: ERROR WHILE CREATE TABLE
 # WITH FOREIGN KEY CONSTRAINT.
 
+#Server variable option 'lower_case_table_names' sets '0' as default value
+#in case sensitive filesystem. Using 'lower_case_table_names=0' in case of
+#insensitive filsystem is not allowed.
+-- source include/have_case_sensitive_file_system.inc
 -- source include/have_innodb.inc
 
 CREATE TABLE PERSON (

mysql-test/suite/innodb/t/innodb_bug60229-master.opt

@@ -1,3 +1,7 @@
+#Server variable option 'lower_case_table_names' sets '0' as default value
+#in case sensitive filesystem. Using 'lower_case_table_names=0' in case of
+#insensitive filsystem is not allowed.
+-- source include/have_case_sensitive_file_system.inc
 --source include/have_sjis.inc
 --source include/have_innodb.inc
 --character_set sjis

mysql-test/suite/innodb/t/innodb_bug60229.test

@@ -1,3 +1,7 @@
+#Server variable option 'lower_case_table_names' sets '0' as default value
+#in case sensitive filesystem. Using 'lower_case_table_names=0' in case of
+#insensitive filsystem is not allowed.
+-- source include/have_case_sensitive_file_system.inc
 --source include/have_ucs2.inc
 --source include/have_innodb.inc
 

mysql-test/suite/jp/t/jp_enum_sjis-master.opt

@@ -1,3 +1,7 @@
+#Server variable option 'lower_case_table_names' sets '0' as default value
+#in case sensitive filesystem. Using 'lower_case_table_names=0' in case of
+#insensitive filsystem is not allowed.
+-- source include/have_case_sensitive_file_system.inc
 --source include/have_ujis.inc
 --source include/have_innodb.inc
 

mysql-test/suite/jp/t/jp_enum_sjis.test

@@ -1,3 +1,7 @@
+#Server variable option 'lower_case_table_names' sets '0' as default value
+#in case sensitive filesystem. Using 'lower_case_table_names=0' in case of
+#insensitive filsystem is not allowed.
+-- source include/have_case_sensitive_file_system.inc
 --source include/have_utf8.inc
 --source include/have_innodb.inc
 --disable_warnings

mysql-test/suite/jp/t/jp_enum_ucs2-master.opt

@@ -1,3 +1,7 @@
+#Server variable option 'lower_case_table_names' sets '0' as default value
+#in case sensitive filesystem. Using 'lower_case_table_names=0' in case of
+#insensitive filsystem is not allowed.
+-- source include/have_case_sensitive_file_system.inc
 -- source include/have_ndb.inc
 -- source include/have_binlog_format_mixed_or_row.inc
 

mysql-test/suite/jp/t/jp_enum_ucs2.test

@@ -1 +1 @@
---replicate-do-db=MYDB --replicate-do-table=mydb.T1 --replicate-do-table=mydb.t2 --lower_case_table_names=0
+--replicate-do-db=MYDB --replicate-do-table=mydb.T1 --replicate-do-table=mydb.t2

mysql-test/suite/jp/t/jp_enum_ujis-master.opt

@@ -5,6 +5,10 @@
 # sensitive when setting lower_case_table_name = 0
 #
 
+#Server variable option 'lower_case_table_names' sets '0' as default value
+#in case sensitive filesystem. Using 'lower_case_table_names=0' in case of
+#insensitive filsystem is not allowed.
+-- source include/have_case_sensitive_file_system.inc
 -- source include/not_gtid_enabled.inc
 -- source include/master-slave.inc
 -- source include/have_binlog_format_statement.inc

mysql-test/suite/jp/t/jp_enum_ujis.test

@@ -1 +1 @@
---replicate-do-db=mydb --replicate-do-table=mydb.Ţ1 --replicate-do-table=mydb.t2 --lower_case_table_names=0
+--replicate-do-db=mydb --replicate-do-table=mydb.Ţ1 --replicate-do-table=mydb.t2

mysql-test/suite/jp/t/jp_enum_utf8-master.opt

@@ -5,5 +5,10 @@
 # sensitive and accent sensitive when setting
 # lower_case_table_name == 0
 #
+
+#Server variable option 'lower_case_table_names' sets '0' as default value
+#in case sensitive filesystem. Using 'lower_case_table_names=0' in case of
+#insensitive filsystem is not allowed.
+-- source include/have_case_sensitive_file_system.inc
 --source include/not_gtid_enabled.inc
 --source extra/rpl_tests/rpl_do_table_filter_sensitive.inc

mysql-test/suite/jp/t/jp_enum_utf8.test

@@ -1 +1 @@
---replicate-do-db=mydb --replicate-do-table=mydb.Ţ1 --replicate-do-table=mydb.t2 --lower_case_table_names=0
+--replicate-do-db=mydb --replicate-do-table=mydb.Ţ1 --replicate-do-table=mydb.t2

mysql-test/suite/ndb_binlog/t/ndb_binlog_restore-master.opt

@@ -5,5 +5,10 @@
 # sensitive and accent sensitive when setting
 # lower_case_table_name == 0
 #
+
+#Server variable option 'lower_case_table_names' sets '0' as default value
+#in case sensitive filesystem. Using 'lower_case_table_names=0' in case of
+#insensitive filsystem is not allowed.
+-- source include/have_case_sensitive_file_system.inc
 --source include/have_gtid.inc
 --source extra/rpl_tests/rpl_do_table_filter_sensitive.inc

mysql-test/suite/ndb_binlog/t/ndb_binlog_restore.test

@@ -1 +1 @@
---replicate-do-db=mydb --replicate-wild-ignore-table=my%.Ţ1 --replicate-ignore-table=mydb.t2 --replicate-ignore-table=mydb.t3 --lower_case_table_names=0
+--replicate-do-db=mydb --replicate-wild-ignore-table=my%.Ţ1 --replicate-ignore-table=mydb.t2 --replicate-ignore-table=mydb.t3

mysql-test/suite/rpl/t/rpl_do_db_filter-slave.opt

@@ -4,6 +4,11 @@
 # the setting of lower_case_table_name to be case sensitive
 # and accent sensitive when setting lower_case_table_name=0
 #
+
+#Server variable option 'lower_case_table_names' sets '0' as default value
+#in case sensitive filesystem. Using 'lower_case_table_names=0' in case of
+#insensitive filsystem is not allowed.
+-- source include/have_case_sensitive_file_system.inc
 --source include/have_gtid.inc
 --source extra/rpl_tests/rpl_ignore_table_filter_sensitive.inc
 

mysql-test/suite/rpl/t/rpl_do_db_filter.test

@@ -1 +1 @@
---replicate-do-db=mydb --replicate-wild-ignore-table=my%.Ţ1 --replicate-ignore-table=mydb.t2 --replicate-ignore-table=mydb.t3 --lower_case_table_names=0
+--replicate-do-db=mydb --replicate-wild-ignore-table=my%.Ţ1 --replicate-ignore-table=mydb.t2 --replicate-ignore-table=mydb.t3

mysql-test/suite/rpl/t/rpl_do_table_filter_sensitive-master.opt

@@ -4,5 +4,10 @@
 # the setting of lower_case_table_name to be case sensitive
 # and accent sensitive when setting lower_case_table_name=0
 #
+
+#Server variable option 'lower_case_table_names' sets '0' as default value
+#in case sensitive filesystem. Using 'lower_case_table_names=0' in case of
+#insensitive filsystem is not allowed.
+-- source include/have_case_sensitive_file_system.in
 --source include/not_gtid_enabled.inc
 --source extra/rpl_tests/rpl_ignore_table_filter_sensitive.inc

mysql-test/suite/rpl/t/rpl_do_table_filter_sensitive-slave.opt

@@ -0,0 +1,38 @@
+#
+# Specific tests for case-insensitive file systems
+# i.e. lower_case_filesystem=ON
+#
+-- source include/have_case_insensitive_file_system.inc
+# Embedded server does not support restarting.
+--source include/not_embedded.inc
+
+--echo #
+--echo # Bug#20198490 : LOWER_CASE_TABLE_NAMES=0 ON WINDOWS LEADS TO PROBLEMS
+--echo #
+
+let SEARCH_FILE= $MYSQLTEST_VARDIR/log/my_restart.err;
+
+--error 0,1
+--remove_file $SEARCH_FILE
+
+#Shutdown the server
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server
+--source include/wait_until_disconnected.inc
+
+#Start the server with --lower_case_table_names=0 in Windows.
+--enable_reconnect
+--error 1
+--exec $MYSQLD_CMD --lower_case_table_names=0 > $SEARCH_FILE  2>&1
+
+#Search for the error messege in the server error log.
+let SEARCH_PATTERN= \[ERROR\] The server option \'lower_case_table_names\' is configured to use case sensitive table names but the data directory is on a case-insensitive file system which is an unsupported combination\. Please consider either using a case sensitive file system for your data directory or switching to a case-insensitive table name mode\.;
+--source include/search_pattern_in_file.inc
+
+#Restart the server
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+
+#Cleanup
+--error 0,1
+--remove_file $SEARCH_FILE

mysql-test/suite/rpl/t/rpl_do_table_filter_sensitive.test

@@ -4123,13 +4123,14 @@ int init_common_variables()
   {
     if (lower_case_table_names_used)
     {
-      if (log_warnings)
-  sql_print_warning("\
-You have forced lower_case_table_names to 0 through a command-line \
-option, even though your file system '%s' is case insensitive.  This means \
-that you can corrupt a MyISAM table by accessing it with different cases. \
-You should consider changing lower_case_table_names to 1 or 2",
-      mysql_real_data_home);
+      sql_print_error("The server option 'lower_case_table_names' is "
+                      "configured to use case sensitive table names but the "
+                      "data directory is on a case-insensitive file system "
+                      "which is an unsupported combination. Please consider "
+                      "either using a case sensitive file system for your data "
+                      "directory or switching to a case-insensitive table name "
+                      "mode.");
+      return 1;
     }
     else
     {