diff options
| author | dlenev@mysql.com <> | 2005-08-09 11:43:55 +0400 |
|---|---|---|
| committer | dlenev@mysql.com <> | 2005-08-09 11:43:55 +0400 |
| commit | 0c38d3350755e1b46e26e5339afebcb90425b687 (patch) | |
| tree | bb9c0e1f9064cb7937fea43d87cf1464768b9e25 /sql/sql_prepare.cc | |
| parent | 10e5ee5196408cda111a29c124216660b91e8121 (diff) | |
| parent | 615baa9f237b30ec590a4405ecb222643d1792a5 (diff) | |
| download | mariadb-git-0c38d3350755e1b46e26e5339afebcb90425b687.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-is
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 0861bd1b0b2..c196bf76dda 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -928,7 +928,7 @@ static bool mysql_test_insert(Prepared_statement *stmt, If we would use locks, then we have to ensure we are not using TL_WRITE_DELAYED as having two such locks can cause table corruption. */ - if (open_normal_and_derived_tables(thd, table_list)) + if (open_normal_and_derived_tables(thd, table_list, 0)) goto error; if ((values= its++)) @@ -1008,7 +1008,7 @@ static int mysql_test_update(Prepared_statement *stmt, if (update_precheck(thd, table_list)) goto error; - if (open_tables(thd, &table_list, &table_count)) + if (open_tables(thd, &table_list, &table_count, 0)) goto error; if (table_list->multitable_view) |