summaryrefslogtreecommitdiff
path: root/sql/sql_help.cc
diff options
context:
space:
mode:
authorbell@sanja.is.com.ua <>2004-08-31 10:06:38 +0300
committerbell@sanja.is.com.ua <>2004-08-31 10:06:38 +0300
commit392c306969d8d07b9d3f5d0f1a77d531752f7371 (patch)
tree5f2f79152aa536016bbf28ae6e6b0e70d5087d25 /sql/sql_help.cc
parent7682b10ee84461f03a33cacbcec1bbe36f6e3f87 (diff)
downloadmariadb-git-392c306969d8d07b9d3f5d0f1a77d531752f7371.tar.gz
fixed open_and_lock_tables result processing (all open_and_lock_tables revision)
fixed printing of COLLATE operation (BUG#5155)
Diffstat (limited to 'sql/sql_help.cc')
-rw-r--r--sql/sql_help.cc5
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