database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

mysqldump.c, mysqldump.test, mysqldump.result:

Browse Source 
Bug #31077: post-commit fix.
This commit is contained in:
gshchepa/uchum@gleb.loc
2007-10-03 02:50:38 +05:00
parent 5fc81ee88e
commit c81751adba
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysqldump.c
View File

@ -634,7 +634,7 @@ static void write_footer(FILE *sql_file)
time_str); time_str);
} }
else else
fprintf(sql_file, "-- Dump completed"); fprintf(sql_file, "-- Dump completed\n");
} }
check_io(sql_file); check_io(sql_file);
} }

16
mysql-test/r/mysqldump.result
View File

@ -3548,11 +3548,23 @@ DROP TABLE t1,t2;
# "Dump completed on" # "Dump completed on"
# #
# --skip-dump-date: # --skip-dump-date:
--
-- Dump completed -- Dump completed
# --dump-date: # --dump-date:
-- Dump completed on -- :: --
-- Dump completed on x-x-x x:x:x
# --dump-date (default): # --dump-date (default):
-- Dump completed on -- :: --
-- Dump completed on x-x-x x:x:x
# #
# End of 5.0 tests # End of 5.0 tests
# #

9
mysql-test/t/mysqldump.test
View File

@ -1582,13 +1582,16 @@ DROP TABLE t1,t2;
--echo # --echo #
--echo # --skip-dump-date: --echo # --skip-dump-date:
--exec $MYSQL_DUMP --skip-dump-date test | grep 'Dump completed' --replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*//
--exec $MYSQL_DUMP --skip-dump-date test
--echo # --dump-date: --echo # --dump-date:
--exec $MYSQL_DUMP --dump-date test | grep 'Dump completed' | tr -d '[0-9]' --replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// /[0-9]+/x/
--exec $MYSQL_DUMP --dump-date test
--echo # --dump-date (default): --echo # --dump-date (default):
--exec $MYSQL_DUMP test | grep 'Dump completed' | tr -d '[0-9]' --replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// /[0-9]+/x/
--exec $MYSQL_DUMP test
--echo # --echo #
--echo # End of 5.0 tests --echo # End of 5.0 tests