Commit 55c61a6e authored by unknown's avatar unknown
Browse files

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.
parent cf749a7a

client/mysqldump.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

mysql-test/r/mysqldump.result

+173 −431

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/t/mysqldump.test

+90 −129

File changed.

Preview size limit exceeded, changes collapsed.