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

merged 5.0-bugteam -> 5.1-bugteam

Browse Source
This commit is contained in:
Georgi Kodinov
2009-01-05 20:47:28 +02:00
parent f97ef7a40e 374f49b262
commit 6ff7a3264f
4 changed files with 4 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/r/lowercase_utf8.result
View File

@@ -1,9 +0,0 @@
set names utf8;
create table `Ö` (id int);
show tables from test like 'Ö';
Tables_in_test (Ö)
ö
show tables from test like 'ö';
Tables_in_test (ö)
ö
drop table `Ö`;

4
mysql-test/t/lowercase_utf8-master.opt
View File

@@ -1,4 +0,0 @@
--lower-case-table-names=1 --character-set-server=utf8

9
mysql-test/t/lowercase_utf8.test
View File

@@ -1,9 +0,0 @@
#
# Bug#25830 SHOW TABLE STATUS behaves differently depending on table name
#
set names utf8;
create table `Ö` (id int);
show tables from test like 'Ö';
show tables from test like 'ö';
drop table `Ö`;

13
sql/sql_show.cc
View File

@@ -468,17 +468,11 @@ find_files(THD *thd, List<LEX_STRING> *files, const char *db,
#ifndef NO_EMBEDDED_ACCESS_CHECKS #ifndef NO_EMBEDDED_ACCESS_CHECKS
uint col_access=thd->col_access; uint col_access=thd->col_access;
#endif #endif
uint wild_length= 0;
TABLE_LIST table_list; TABLE_LIST table_list;
DBUG_ENTER("find_files"); DBUG_ENTER("find_files");
if (wild) if (wild && !wild[0])
{
if (!wild[0])
wild=0; wild=0;
else
wild_length= strlen(wild);
}
bzero((char*) &table_list,sizeof(table_list)); bzero((char*) &table_list,sizeof(table_list));
@@ -543,10 +537,7 @@ find_files(THD *thd, List<LEX_STRING> *files, const char *db,
{ {
if (lower_case_table_names) if (lower_case_table_names)
{ {
if (my_wildcmp(files_charset_info, if (wild_case_compare(files_charset_info, uname, wild))
uname, uname + file_name_len,
wild, wild + wild_length,
wild_prefix, wild_one, wild_many))
continue; continue;
} }
else if (wild_compare(uname, wild, 0)) else if (wild_compare(uname, wild, 0))