database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
Georgi Kodinov
2010-07-21 18:20:29 +03:00
parent eb366b8c36 e24abd9091
commit bbe3e4bdb6
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/lowercase_table2.result
View File

@@ -56,6 +56,7 @@ CREATE DATABASE `TEST_$1`;
SHOW DATABASES LIKE "TEST%"; SHOW DATABASES LIKE "TEST%";
Database (TEST%) Database (TEST%)
TEST_$1 TEST_$1
test
DROP DATABASE `test_$1`; DROP DATABASE `test_$1`;
CREATE TABLE T1 (a int) engine=innodb; CREATE TABLE T1 (a int) engine=innodb;
INSERT INTO T1 VALUES (1); INSERT INTO T1 VALUES (1);
@@ -171,7 +172,7 @@ create table myUC (i int);
select TABLE_SCHEMA,TABLE_NAME FROM information_schema.TABLES select TABLE_SCHEMA,TABLE_NAME FROM information_schema.TABLES
where TABLE_SCHEMA ='mysqltest_LC2'; where TABLE_SCHEMA ='mysqltest_LC2';
TABLE_SCHEMA TABLE_NAME TABLE_SCHEMA TABLE_NAME
mysqltest_LC2 myUC mysqltest_lc2 myUC
use test; use test;
drop database mysqltest_LC2; drop database mysqltest_LC2;
# End of 5.1 tests # End of 5.1 tests

15
sql/sql_show.cc
View File

@@ -460,8 +460,19 @@ find_files(THD *thd, List<LEX_STRING> *files, const char *db,
continue; continue;
file_name_len= filename_to_tablename(file->name, uname, sizeof(uname)); file_name_len= filename_to_tablename(file->name, uname, sizeof(uname));
if (wild && wild_compare(uname, wild, 0)) if (wild)
continue; {
if (lower_case_table_names)
{
if (my_wildcmp(files_charset_info,
uname, uname + file_name_len,
wild, wild + wild_length,
wild_prefix, wild_one,wild_many))
continue;
}
else if (wild_compare(uname, wild, 0))
continue;
}
if (!(file_name= if (!(file_name=
thd->make_lex_string(file_name, uname, file_name_len, TRUE))) thd->make_lex_string(file_name, uname, file_name_len, TRUE)))
{ {