diff options
author | unknown <monty@mysql.com> | 2004-05-11 12:21:38 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-05-11 12:21:38 +0300 |
commit | 19f41e6e0df2d875cff2404f9bbbab30d81b72b1 (patch) | |
tree | 0752eb9dfe0f1e306cf9a542e09d9cc646c11a0f /sql/sp.cc | |
parent | cb24e8b9b29f1aa3edfc4d7a61a9d842cb48ca69 (diff) | |
parent | f3d691a970627f34ed825a9cf7b84520dcdd43b3 (diff) | |
download | mariadb-git-19f41e6e0df2d875cff2404f9bbbab30d81b72b1.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql-bench/limits/mysql-4.0.cfg:
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 2e36f985832..30f99a4af75 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -560,7 +560,7 @@ db_show_routine_status(THD *thd, int type, const char *wild) } /* Init fields */ - setup_tables(&tables, 0); + setup_tables(&tables); for (used_field= &used_fields[0]; used_field->field_name; used_field++) |