diff options
| author | unknown <jimw@rama.(none)> | 2006-08-31 20:53:34 -0700 |
|---|---|---|
| committer | unknown <jimw@rama.(none)> | 2006-08-31 20:53:34 -0700 |
| commit | 55c61a6ea6a26ba736d2d85d76871ae40043deba (patch) | |
| tree | b2821b90d3d2d59fc35d892d93fd249c5ba7af8e /client/mysqldump.c | |
| parent | cf749a7aa9a9a645a5cfd1f062552bc69ce779a6 (diff) | |
| download | mariadb-git-55c61a6ea6a26ba736d2d85d76871ae40043deba.tar.gz | |
Restore bug fix lost in merge of client/mysqldump.c, and clean up mysqldump.test
so that 4.1 and 5.0 tests are all in the right place and no tests are duplicated.
client/mysqldump.c:
Restore fix for bug 21215 accidently removed during merge
mysql-test/r/mysqldump.result:
Update results
mysql-test/t/mysqldump.test:
Fix order of tests so that all the tests new to the 5.0 tree come after
"End of 4.1 tests", and so that each leaves things in the state it found
them (particularly by returning to the 'test' database. Also remove some
tests that were duplicated.
Diffstat (limited to 'client/mysqldump.c')
| -rw-r--r-- | client/mysqldump.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 990253aa48c..d6f89022e32 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -882,6 +882,7 @@ static int mysql_query_with_error_report(MYSQL *mysql_con, MYSQL_RES **res, fprintf(stderr, "%s: Couldn't execute '%s': %s (%d)\n", my_progname, query, mysql_error(mysql_con), mysql_errno(mysql_con)); + safe_exit(EX_MYSQLERR); return 1; } return 0; |