diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-08-31 10:06:38 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-08-31 10:06:38 +0300 |
| commit | a64a56374cd658b2d5082d7fcc71ef08ccc8c973 (patch) | |
| tree | 5f2f79152aa536016bbf28ae6e6b0e70d5087d25 /sql/sql_help.cc | |
| parent | 2aa6ddca6d0cf559ec9ae309777378dd19fda81e (diff) | |
| download | mariadb-git-a64a56374cd658b2d5082d7fcc71ef08ccc8c973.tar.gz | |
fixed open_and_lock_tables result processing (all open_and_lock_tables revision)
fixed printing of COLLATE operation
(BUG#5155)
mysql-test/r/case.result:
fixed printing of COLLATE operation
mysql-test/r/func_if.result:
fixed printing of COLLATE operation
mysql-test/r/func_in.result:
fixed printing of COLLATE operation
mysql-test/r/func_str.result:
fixed printing of COLLATE operation
mysql-test/r/func_test.result:
fixed printing of COLLATE operation
mysql-test/r/view.result:
VIEW with collation
mysql-test/t/view.test:
VIEW with collation
sql/item_strfunc.cc:
fixed printing of COLLATE operation
sql/item_strfunc.h:
fixed printing of COLLATE operation
sql/sp_head.cc:
fixed open_and_lock_tables result processing
sql/sql_base.cc:
fixed open_and_lock_tables result processing
sql/sql_delete.cc:
fixed open_and_lock_tables result processing
sql/sql_help.cc:
fixed open_and_lock_tables result processing
sql/sql_load.cc:
fixed open_and_lock_tables result processing
sql/sql_parse.cc:
fixed open_and_lock_tables result processing
sql/sql_prepare.cc:
fixed open_and_lock_tables result processing
sql/sql_show.cc:
fixed open_and_lock_tables result processing
sql/sql_update.cc:
fixed open_and_lock_tables result processing
Diffstat (limited to 'sql/sql_help.cc')
| -rw-r--r-- | sql/sql_help.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/sql_help.cc b/sql/sql_help.cc index 85d5271d4c3..8fc0671c808 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -640,11 +640,8 @@ int mysqld_help(THD *thd, const char *mask) uint mlen= strlen(mask); MEM_ROOT *mem_root= &thd->mem_root; - if (open_and_lock_tables(thd, tables)) - { - res= -1; + if (res= open_and_lock_tables(thd, tables)) goto end; - } /* Init tables and fields to be usable from items |