diff options
| author | unknown <anozdrin/alik@quad.opbmk> | 2008-03-28 14:40:11 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@quad.opbmk> | 2008-03-28 14:40:11 +0300 |
| commit | 1abfb6e040c7c3b9b157d213cc4e46af3773ce20 (patch) | |
| tree | fe37fd28b0f89bc024512c0d2a69e82f3d7e2f5c /sql/sql_base.cc | |
| parent | f4c65a0193b4d65b2a451b5d825c3a7273f89db8 (diff) | |
| parent | 0cf83bbf56f13c4391e557cee5271259aff64d19 (diff) | |
| download | mariadb-git-1abfb6e040c7c3b9b157d213cc4e46af3773ce20.tar.gz | |
Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1
into quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
mysql-test/r/grant.result:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index ba4f695dcb8..3f0c1ee8a80 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -4866,7 +4866,7 @@ TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type lock_type, the third argument set appropriately. */ -bool open_and_lock_tables_derived(THD *thd, TABLE_LIST *tables, bool derived) +int open_and_lock_tables_derived(THD *thd, TABLE_LIST *tables, bool derived) { uint counter; bool need_reopen; |