diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-01-31 12:47:22 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-01-31 12:47:22 +0100 |
| commit | e840ce7f830ae99af7c4682c315cb5c7860fb969 (patch) | |
| tree | 27ff8ec6afcb1b831bc6326f441011525e4b1bf1 /client/mysqltest.c | |
| parent | d42cd143ad74f9ac93b2f1a70c7498fd62ae0b6d (diff) | |
| download | mariadb-git-e840ce7f830ae99af7c4682c315cb5c7860fb969.tar.gz | |
Bug #15302 LOAD DATA FROM MASTER -> Packets out of order (Found: 2, expected 1)
- Change "mysql_create_db" to not call "send_ok" if in silent mode i.e. called from "load_master_data"
- Change mysqltest to detect when there aren't as many warnings available as was reported.
client/mysqltest.c:
Call "die" if warnings were reported but there weren't any warnings to retrieve
sql/sql_db.cc:
Don't call "send_ok" if in silent mode.
Diffstat (limited to 'client/mysqltest.c')
| -rw-r--r-- | client/mysqltest.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index d10ad054798..613c4e12763 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -2966,8 +2966,8 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags) warn_res= mysql_store_result(mysql); } if (!warn_res) - verbose_msg("Warning count is %u but didn't get any warnings\n", - count); + die("Warning count is %u but didn't get any warnings\n", + count); else { dynstr_append_mem(ds, "Warnings:\n", 10); @@ -3446,8 +3446,8 @@ static void run_query_stmt_handle_warnings(MYSQL *mysql, DYNAMIC_STRING *ds) { MYSQL_RES *warn_res= mysql_store_result(mysql); if (!warn_res) - verbose_msg("Warning count is %u but didn't get any warnings\n", - count); + die("Warning count is %u but didn't get any warnings\n", + count); else { dynstr_append_mem(ds, "Warnings:\n", 10); |