diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-08-28 06:43:55 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-08-28 06:43:55 +0300 |
| commit | bfe2213babce74eac616dd3be0c8ac5bce16f032 (patch) | |
| tree | 476d8d3dea118db2d3981f0e5754e23cc70924ab /sql/sql_show.cc | |
| parent | 30774b35493d3ad14ee40b73d4b9ffff51dd6cd1 (diff) | |
| download | mariadb-git-bfe2213babce74eac616dd3be0c8ac5bce16f032.tar.gz | |
Fixed that LOAD DATA INFILE works with transactions.
Fix for lower case filenames
BitKeeper/deleted/.del-select.tst~2e626fa07144d2c8:
Delete: mysql-test/misc/select.tst
Docs/manual.texi:
Better examples for sub selects
bdb/lock/lock_region.c:
Fixed not critical error
mysql-test/r/gemini.result:
Testcase for load data infile
mysql-test/t/gemini.test:
Testcase for load data infile
sql/sql_load.cc:
Fixed that LOAD DATA INFILE works with transactions
sql/sql_show.cc:
Fix for lower case filenames
sql/sql_string.cc:
cleanup
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 71ee60e1eca..5869feefdc3 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -182,6 +182,8 @@ mysql_find_files(THD *thd,List<char> *files, const char *db,const char *path, TABLE_LIST table_list; DBUG_ENTER("mysql_find_files"); + if (wild && !wild[0]) + wild=0; bzero((char*) &table_list,sizeof(table_list)); if (!(dirp = my_dir(path,MYF(MY_WME | (dir ? MY_WANT_STAT : 0))))) @@ -200,7 +202,7 @@ mysql_find_files(THD *thd,List<char> *files, const char *db,const char *path, #endif { if (file->name[0] == '.' || !MY_S_ISDIR(file->mystat.st_mode) || - (wild && wild[0] && wild_compare(file->name,wild))) + (wild && wild_compare(file->name,wild))) continue; } } @@ -211,8 +213,16 @@ mysql_find_files(THD *thd,List<char> *files, const char *db,const char *path, is_prefix(file->name,tmp_file_prefix)) continue; *ext=0; - if (wild && wild[0] && wild_compare(file->name,wild)) - continue; + if (wild) + { + if (lower_case_table_names) + { + if (wild_case_compare(file->name,wild)) + continue; + } + else if (wild_compare(file->name,wild)) + continue; + } } /* Don't show tables where we don't have any privileges */ if (db && !(col_access & TABLE_ACLS)) |