diff options
author | unknown <malff/marcsql@weblab.(none)> | 2007-07-27 12:22:00 -0600 |
---|---|---|
committer | unknown <malff/marcsql@weblab.(none)> | 2007-07-27 12:22:00 -0600 |
commit | ced93a5cc8fb3822e63a20359aa68cc54ffb2d4a (patch) | |
tree | 00a61c4cc45ca89121a957283226b4b666b7a0fc /sql/sp.cc | |
parent | 5a03bfbbce3f8bb9b7a3e9655d167ea6625e654e (diff) | |
parent | cc5b3745661bdf5328c87e7045abe8ec7d9b1522 (diff) | |
download | mariadb-git-ced93a5cc8fb3822e63a20359aa68cc54ffb2d4a.tar.gz |
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into weblab.(none):/home/marcsql/TREE/mysql-5.1-25422-d
client/mysqldump.c:
Auto merged
mysql-test/r/log_state.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/t/show_check.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sp.cc:
Auto merged
Diffstat (limited to 'sql/sp.cc')
-rw-r--r-- | sql/sp.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index 335811000c2..372aa9c6780 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -1067,7 +1067,7 @@ sp_show_status_routine(THD *thd, int type, const char *name_pattern) tables.db= (char*)"mysql"; tables.table_name= tables.alias= (char*)"proc"; - if (! (table= open_ltable(thd, &tables, TL_READ))) + if (! (table= open_ltable(thd, &tables, TL_READ, 0))) { res= SP_OPEN_TABLE_FAILED; goto done; |