Skip to content

Commit 534e424

Browse files
committed
fix lowercase* tests labrador
1 parent 2a471e8 commit 534e424

File tree

5 files changed

+8
-12
lines changed

5 files changed

+8
-12
lines changed

mysql-test/r/lowercase_fs_on.result

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
#
22
# Bug#20198490 : LOWER_CASE_TABLE_NAMES=0 ON WINDOWS LEADS TO PROBLEMS
33
#
4+
FOUND /\[ERROR\] The server option \'lower_case_table_names\' is configured to use case sensitive table names/ in my_restart.err

mysql-test/r/lowercase_table4.result

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
#
55
CREATE DATABASE XY;
66
USE XY;
7+
set @old_table_open_cache=@@table_open_cache;
8+
set global table_open_cache = 512;
9+
set global table_open_cache = @old_table_open_cache;
710
DROP DATABASE XY;
811
USE TEST;
912
#

mysql-test/t/lowercase_fs_on.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ let SEARCH_FILE= $MYSQLTEST_VARDIR/log/my_restart.err;
2626
--exec $MYSQLD_CMD --lower_case_table_names=0 > $SEARCH_FILE 2>&1
2727

2828
#Search for the error messege in the server error log.
29-
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\.;
29+
let SEARCH_PATTERN= \[ERROR\] The server option \'lower_case_table_names\' is configured to use case sensitive table names;
3030
--source include/search_pattern_in_file.inc
3131

3232
#Restart the server

mysql-test/t/lowercase_table4.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
CREATE DATABASE XY;
1010
USE XY;
11+
set @old_table_open_cache=@@table_open_cache;
12+
set global table_open_cache = 512;
1113

1214
#
1315
# Logs are disabled, since the number of creates tables
@@ -52,6 +54,7 @@ eval SELECT * FROM XY.T_$tcs LIMIT 1;
5254

5355
--enable_query_log
5456
--enable_result_log
57+
set global table_open_cache = @old_table_open_cache;
5558
DROP DATABASE XY;
5659
USE TEST;
5760

sql/mysqld.cc

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4556,23 +4556,12 @@ static int init_common_variables()
45564556
{
45574557
if (lower_case_table_names_used)
45584558
{
4559-
#if MYSQL_VERSION_ID < 100100
4560-
if (global_system_variables.log_warnings)
4561-
sql_print_warning("You have forced lower_case_table_names to 0 through "
4562-
"a command-line option, even though your file system "
4563-
"'%s' is case insensitive. This means that you can "
4564-
"corrupt your tables if you access them using names "
4565-
"with different letter case. You should consider "
4566-
"changing lower_case_table_names to 1 or 2",
4567-
mysql_real_data_home);
4568-
#else
45694559
sql_print_error("The server option 'lower_case_table_names' is "
45704560
"configured to use case sensitive table names but the "
45714561
"data directory resides on a case-insensitive file system. "
45724562
"Please use a case sensitive file system for your data "
45734563
"directory or switch to a case-insensitive table name "
45744564
"mode.");
4575-
#endif
45764565
return 1;
45774566
}
45784567
else

0 commit comments

Comments
 (0)