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

Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1

Browse Source 
into  moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-bug9953
This commit is contained in:
kroki/tomash@moonlight.home
2007-03-09 13:17:46 +03:00
parent b641bd7b19 c19affef54
commit 7bbea96754
35 changed files with 430 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_help.cc
View File

@@ -655,8 +655,9 @@ bool mysqld_help(THD *thd, const char *mask)
tables[3].lock_type= TL_READ;
tables[0].db= tables[1].db= tables[2].db= tables[3].db= (char*) "mysql";
if (open_and_lock_tables(thd, tables))
goto error;
Open_tables_state open_tables_state_backup;
if (open_system_tables_for_read(thd, tables, &open_tables_state_backup))
goto error2;
/*
Init tables and fields to be usable from items
@@ -781,8 +782,13 @@ bool mysqld_help(THD *thd, const char *mask)
}
send_eof(thd);
close_system_tables(thd, &open_tables_state_backup);
DBUG_RETURN(FALSE);
error:
close_system_tables(thd, &open_tables_state_backup);
error2:
DBUG_RETURN(TRUE);
}