Commit c3ffd4ac authored by gshchepa/uchum@gleb.loc's avatar gshchepa/uchum@gleb.loc
Browse files

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

into  gleb.loc:/home/uchum/work/bk/5.0-opt
parents c6e97422 5fc81ee8

client/client_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -51,5 +51,5 @@ enum options_client 
  OPT_TRIGGERS,

  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,

  OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_SSL_VERIFY_SERVER_CERT,

  OPT_DEBUG_INFO, OPT_ERROR_LOG_FILE

  OPT_DEBUG_INFO, OPT_ERROR_LOG_FILE, OPT_DUMP_DATE

};

client/mysqldump.c

+13 −5
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static my_bool verbose= 0, opt_no_create_info= 0, opt_no_data= 0, 
                opt_drop=1,opt_keywords=0,opt_lock=1,opt_compress=0,

                opt_delayed=0,create_options=1,opt_quoted=0,opt_databases=0,

                opt_alldbs=0,opt_create_db=0,opt_lock_all_tables=0,

                opt_set_charset=0,

                opt_set_charset=0, opt_dump_date=1,

                opt_autocommit=0,opt_disable_keys=1,opt_xml=0,

                opt_delete_master_logs=0, tty_password=0,

                opt_single_transaction=0, opt_comments= 0, opt_compact= 0,
@@ -402,6 +402,9 @@ static struct my_option my_long_options[] = 
   "automatically turns off --lock-tables.",

   (gptr*) &opt_single_transaction, (gptr*) &opt_single_transaction, 0,

   GET_BOOL, NO_ARG,  0, 0, 0, 0, 0, 0},

  {"dump-date", OPT_DUMP_DATE, "Put a dump date to the end of the output.",

   (gptr*) &opt_dump_date, (gptr*) &opt_dump_date, 0,

   GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},

  {"skip-opt", OPT_SKIP_OPTIMIZATION,

   "Disable --opt. Disables --add-drop-table, --add-locks, --create-options, --quick, --extended-insert, --lock-tables, --set-charset, and --disable-keys.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -622,12 +625,17 @@ static void write_footer(FILE *sql_file) 
            "/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;\n");

    fputs("\n", sql_file);

    if (opt_comments)

    {

      if (opt_dump_date)

      {

        char time_str[20];

        get_date(time_str, GETDATE_DATE_TIME, 0);

        fprintf(sql_file, "-- Dump completed on %s\n",

                time_str);

      }

      else

        fprintf(sql_file, "-- Dump completed");

    }

    check_io(sql_file);

  }

} /* write_footer */

mysql-test/r/mysqldump.result

+10 −0
Original line number Diff line number Diff line
@@ -3544,5 +3544,15 @@ c1 
2

DROP TABLE t1,t2;

#

# Bug#29815: new option for suppressing last line of mysqldump:

#            "Dump completed on"

#

# --skip-dump-date:

-- Dump completed

# --dump-date:

-- Dump completed on -- ::

# --dump-date (default):

-- Dump completed on -- ::

#

# End of 5.0 tests

#

mysql-test/t/mysqldump.test

+14 −0
Original line number Diff line number Diff line
@@ -1576,6 +1576,20 @@ SELECT * FROM t2; 


DROP TABLE t1,t2;



--echo #

--echo # Bug#29815: new option for suppressing last line of mysqldump:

--echo #            "Dump completed on"

--echo #



--echo # --skip-dump-date:

--exec $MYSQL_DUMP --skip-dump-date test | grep 'Dump completed'



--echo # --dump-date:

--exec $MYSQL_DUMP --dump-date test | grep 'Dump completed' | tr -d '[0-9]'



--echo # --dump-date (default):

--exec $MYSQL_DUMP test | grep 'Dump completed' | tr -d '[0-9]'



--echo #

--echo # End of 5.0 tests

--echo #