summaryrefslogtreecommitdiff
path: root/sql/sql_db.cc
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-09-21 15:28:28 +0200
committerunknown <msvensson@neptunus.(none)>2005-09-21 15:28:28 +0200
commitd770fdce660c48247c66259782c1c4d2e3a0d08b (patch)
treef535db4d6c5fc06bfea751c89631aa6286b97857 /sql/sql_db.cc
parentfbe338f4b009c8f0057645bdfae9b981a346dbc3 (diff)
downloadmariadb-git-d770fdce660c48247c66259782c1c4d2e3a0d08b.tar.gz
Bug #13231 mysqltest: fails to dectect when mysql_next_result fails
- Added functionality to check errors returned from mysql_next_result - Exit from mysqltest when and unexpected error occurs. - The above fixes reveal problems with rpl000009, sp-error and query_cache- - Fix sp-error by adding an expected error - Fix rpl000009 by not sending "ok" from mysql_create_db when called with silent flag from load_master_data - Fix query_cache in separate patch client/mysqltest.c: Check and handle error after mysql_next_result Change several verbose_msg to die so that the error is properly reported Clean up of error handling code in run_query_stmt, check all errors and use common function handle_error. mysql-test/r/mysqltest.result: mysqltest now dies when a query fails with wrong errno mysql-test/r/sp-error.result: Update test result to match the expected error from calling the sp closing a cursor that is not open. mysql-test/t/sp-error.test: Add missing --error 1326 before call to sp that closes a already closed cursor. Add test for bug9367 sql/sql_db.cc: Don't send ok in mysql_create_db if silent flag is set.
Diffstat (limited to 'sql/sql_db.cc')
-rw-r--r--sql/sql_db.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index 69ccbe690db..e8fb8d9ce16 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -440,7 +440,8 @@ bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
ER_DB_CREATE_EXISTS, ER(ER_DB_CREATE_EXISTS), db);
error= 0;
- send_ok(thd);
+ if (!silent)
+ send_ok(thd);
goto exit;
}
else