Commit df4e28e7 authored by unknown's avatar unknown

Merge gleb.loc:/home/uchum/work/bk/5.0-opt-31077

into  gleb.loc:/home/uchum/work/bk/5.0-opt

parents 2071d63d 853e4da8
......@@ -634,7 +634,7 @@ static void write_footer(FILE *sql_file)
time_str);
}
else
fprintf(sql_file, "-- Dump completed");
fprintf(sql_file, "-- Dump completed\n");
}
check_io(sql_file);
}
......
......@@ -3548,11 +3548,23 @@ DROP TABLE t1,t2;
# "Dump completed on"
#
# --skip-dump-date:
--
-- Dump completed
# --dump-date:
-- Dump completed on -- ::
--
-- Dump completed on x-x-x x:x:x
# --dump-date (default):
-- Dump completed on -- ::
--
-- Dump completed on x-x-x x:x:x
#
# End of 5.0 tests
#
......@@ -1582,13 +1582,16 @@ DROP TABLE t1,t2;
--echo #
--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:
--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):
--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 # End of 5.0 tests
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment