database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Manual merge 5.0->5.1. Post-merge fixes.

Browse Source
This commit is contained in:
kostja@bodhi.local
2006-08-14 13:27:11 +04:00
parent 04c97488f9
commit 5dfdc8bfce
30 changed files with 116 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_show.cc
View File

@ -716,22 +716,6 @@ bool mysqld_show_create_db(THD *thd, char *dbname,
}
else
{
(void) sprintf(path,"%s/%s",mysql_data_home, dbname);
length=unpack_dirname(path,path); // Convert if not unix
found_libchar= 0;
if (length && path[length-1] == FN_LIBCHAR)
{
found_libchar= 1;
path[length-1]=0; // remove ending '\'
}
if (access(path,F_OK))
length= build_table_filename(path, sizeof(path), dbname, "", "");
found_libchar= 0;
if (length && path[length-1] == FN_LIBCHAR)
{
found_libchar= 1;
path[length-1]=0; // remove ending '\'
}
if (check_db_dir_existence(dbname))
{
my_error(ER_BAD_DB_ERROR, MYF(0), dbname);
@ -2603,7 +2587,7 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond)
may have dropped database, and we may still have a name
for that directory.
*/
if (res == FIND_FILES_DIR && lex->orig_sql_command == SQLCOM_END)
if (res == FIND_FILES_DIR && lex->sql_command == SQLCOM_END)
{
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
thd->net.last_errno, thd->net.last_error);