diff options
| author | unknown <monty@mysql.com> | 2005-01-06 16:59:29 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-01-06 16:59:29 +0200 |
| commit | 615cd4ff75a848f2fcda88b60052082d6ec9d9b2 (patch) | |
| tree | 52613241dc7c0cb3ac99bd8da61be5bf2aa09faa /sql/sql_prepare.cc | |
| parent | 8ff8867251ccfefed1785efb50e56bc80aaf7663 (diff) | |
| download | mariadb-git-615cd4ff75a848f2fcda88b60052082d6ec9d9b2.tar.gz | |
Fixed a bug in prepared statements error handling
After merge fixes
libmysql/libmysql.c:
Fixed a bug in prepared statements error handling introduced by me on a recent patch
mysql-test/r/delayed.result:
Updated results
mysql-test/t/delayed.test:
Bigger timeout needed when using --ps-protocol (don't understand why yet)
Added output of not_flushed_dealyed_rows for easier debugging
sql/sql_base.cc:
USE tables_share fix for prepared statements
sql/sql_prepare.cc:
After merge fix
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 3afe810321e..6364d5ae039 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -935,7 +935,7 @@ static bool mysql_test_insert(Prepared_statement *stmt, { my_error(ER_ILLEGAL_HA, MYF(0), (table_list->view ? table_list->view_name.str : - table_list->real_name)); + table_list->table_name)); goto error; } while ((values= its++)) @@ -1445,7 +1445,7 @@ static bool mysql_insert_select_prepare_tester(THD *thd) and item_list belong to SELECT */ first_select->resolve_mode= SELECT_LEX::SELECT_MODE; - mysql_insert_select_prepare(thd); + return mysql_insert_select_prepare(thd); } |