Commit 7cf3b797 authored by unknown's avatar unknown
Browse files

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 

into zim.(none):/home/brian/mysql/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
parents c18eb55b 47ed1db7

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ bar@deer.(none) 
bar@gw.udmsearch.izhnet.ru

bar@mysql.com

bar@noter.intranet.mysql.r18.ru

bell@51.0.168.192.in-addr.arpa

bell@laptop.sanja.is.com.ua

bell@sanja.is.com.ua

bk@admin.bk

client/mysql.cc

+2 −2
Original line number Diff line number Diff line
@@ -2926,9 +2926,9 @@ com_status(String *buffer __attribute__((unused)), 
    MYSQL_ROW cur=mysql_fetch_row(result);

    if (cur)

    {

      tee_fprintf(stdout, "Server characterset:\t%s\n", cur[0] ? cur[0] : "");

      tee_fprintf(stdout, "Server characterset:\t%s\n", cur[2] ? cur[2] : "");

      tee_fprintf(stdout, "Db     characterset:\t%s\n", cur[3] ? cur[3] : "");

      tee_fprintf(stdout, "Client characterset:\t%s\n", cur[2] ? cur[2] : "");

      tee_fprintf(stdout, "Client characterset:\t%s\n", cur[0] ? cur[0] : "");

      tee_fprintf(stdout, "Conn.  characterset:\t%s\n", cur[1] ? cur[1] : "");

    }

    mysql_free_result(result);

client/mysqlbinlog.cc

+15 −0
Original line number Diff line number Diff line
@@ -1249,6 +1249,14 @@ int main(int argc, char** argv) 
    fprintf(result_file,

            "/*!32316 SET @OLD_SQL_LOG_BIN=@@SQL_LOG_BIN, SQL_LOG_BIN=0*/;\n");



  /*

    In mysqlbinlog|mysql, don't want mysql to be disconnected after each

    transaction (which would be the case with GLOBAL.COMPLETION_TYPE==2).

  */

  fprintf(result_file,

          "/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,"

          "COMPLETION_TYPE=0*/;\n");



  for (save_stop_position= stop_position, stop_position= ~(my_off_t)0 ;

       (--argc >= 0) && !stop_passed ; )

  {
@@ -1263,6 +1271,13 @@ int main(int argc, char** argv) 
    start_position= BIN_LOG_HEADER_SIZE;

  }



  /*

    Issue a ROLLBACK in case the last printed binlog was crashed and had half

    of transaction.

  */

  fprintf(result_file,

          "ROLLBACK;\n"

          "/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;\n");

  if (disable_log_bin)

    fprintf(result_file, "/*!32316 SET SQL_LOG_BIN=@OLD_SQL_LOG_BIN*/;\n");

client/mysqldump.c

+4 −1
Original line number Diff line number Diff line
@@ -493,7 +493,8 @@ static void write_header(FILE *sql_file, char *db_name) 
");

    }

    fprintf(sql_file,

	    "/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='%s%s%s' */;\n",

	    "/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='%s%s%s' */;\n"

	    "/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;\n",

	    path?"":"NO_AUTO_VALUE_ON_ZERO",compatible_mode_normal_str[0]==0?"":",",

	    compatible_mode_normal_str);

    check_io(sql_file);
@@ -522,6 +523,8 @@ static void write_footer(FILE *sql_file) 
"/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;\n"

"/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;\n"

"/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;\n");

    fprintf(sql_file,

	    "/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;\n");

    fputs("\n", sql_file);

    check_io(sql_file);

  }

extra/my_print_defaults.c

+13 −5
Original line number Diff line number Diff line
@@ -120,25 +120,33 @@ int main(int argc, char **argv) 
  int count, error;

  char **load_default_groups, *tmp_arguments[2],

       **argument, **arguments;

  char *defaults, *extra_defaults;

  MY_INIT(argv[0]);



  get_defaults_files(argc, argv, &defaults, &extra_defaults);



  /*

  ** Check out the args

  */

  if (get_options(&argc,&argv))

    exit(1);

  if (!(load_default_groups=(char**) my_malloc((argc+2)*sizeof(char*),

					       MYF(MY_WME))))

    exit(1);

  if (get_options(&argc,&argv))

    exit(1);



  for (count=0; *argv ; argv++,count++)

    load_default_groups[count]= *argv;

  load_default_groups[count]=0;



  count=1;

  count=0;

  arguments=tmp_arguments;

  arguments[0]=my_progname;

  arguments[1]=0;

  arguments[count++]=my_progname;

  if (extra_defaults)

    arguments[count++]= extra_defaults;

  if (defaults)

    arguments[count++]= defaults;

  arguments[count]= 0;



  if ((error= load_defaults(config_file, (const char **) load_default_groups,

			   &count, &arguments)))

  {