Commit dd8a33c0 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


BitKeeper/etc/collapsed:
  auto-union
BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
include/m_ctype.h:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/binlog_row_mix_innodb_myisam.result:
  Auto merged
mysql-test/r/csv.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
vio/viosocket.c:
  Auto merged
parents e1ff81bb 30996224

BitKeeper/etc/collapsed

+8 −0
Original line number Diff line number Diff line
@@ -5,5 +5,13 @@ 
45001f7c3b2hhCXDKfUvzkX9TNe6VA

45002051rHJfMEXAIMiAZV0clxvKSA

4513d8e4Af4dQWuk13sArwofRgFDQw

45143312u0Tz4r0wPXCbUKwdHa2jWA

45143b90ewOQuTW8-jrB3ZSAQvMRJw

45184588w9U72A6KX1hUFeAC4shSHA

45185df8mZbxfp85FbA0VxUXkmDewA

4519a6c5BVUxEHTf5iJnjZkixMBs8g

451ab499rgdjXyOnUDqHu-wBDoS-OQ

451b110a3ZV6MITl93ehXk2wxrbW7g

45214442pBGT9KuZEGixBH71jTzbOA

45214a07hVsIGwvwa-WrO-jpeaSwVw

452a92d0-31-8wSzSfZi165fcGcXPA

client/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ mysqladmin_SOURCES = mysqladmin.cc 
mysql_LDADD =			@readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)

mysqltest_SOURCES=		mysqltest.c $(top_srcdir)/mysys/my_getsystime.c \

				$(yassl_dummy_link_fix)

mysqltest_LDADD =		$(top_builddir)/regex/libregex.a $(LDADD)

mysqltest_LDADD =		$(top_builddir)/regex/libregex.a $(LDADD) \

				$(top_builddir)/mysys/libmysys.a

mysqlbinlog_SOURCES =		mysqlbinlog.cc $(top_srcdir)/mysys/mf_tempdir.c \

				$(top_srcdir)/mysys/my_new.cc \

				$(top_srcdir)/mysys/my_bit.c \

client/mysql.cc

+15 −0
Original line number Diff line number Diff line
@@ -386,6 +386,21 @@ int main(int argc,char *argv[]) 
  else

    status.add_to_history=1;

  status.exit_status=1;



  {

    /* 

     The file descriptor-layer may be out-of-sync with the file-number layer,

     so we make sure that "stdout" is really open.  If its file is closed then

     explicitly close the FD layer. 

    */

    int stdout_fileno_copy;

    stdout_fileno_copy= dup(fileno(stdout)); /* Okay if fileno fails. */

    if (stdout_fileno_copy == -1)

      fclose(stdout);

    else

      close(stdout_fileno_copy);             /* Clean up dup(). */

  }



  load_defaults("my",load_default_groups,&argc,&argv);

  defaults_argv=argv;

  if (get_options(argc, (char **) argv))

client/mysqldump.c

+3 −5
Original line number Diff line number Diff line
@@ -3405,7 +3405,7 @@ static int do_reset_master(MYSQL *mysql_con) 
}





static int start_transaction(MYSQL *mysql_con, my_bool consistent_read_now)

static int start_transaction(MYSQL *mysql_con)

{

  /*

    We use BEGIN for old servers. --single-transaction --master-data will fail
@@ -3420,10 +3420,8 @@ static int start_transaction(MYSQL *mysql_con, my_bool consistent_read_now) 
                                        "SET SESSION TRANSACTION ISOLATION "

                                        "LEVEL REPEATABLE READ") ||

          mysql_query_with_error_report(mysql_con, 0,

                                        consistent_read_now ?

                                        "START TRANSACTION "

                                        "WITH CONSISTENT SNAPSHOT" :

                                        "BEGIN"));

                                        "/*!40100 WITH CONSISTENT SNAPSHOT */"));

}
@@ -3913,7 +3911,7 @@ int main(int argc, char **argv) 
  if ((opt_lock_all_tables || opt_master_data) &&

      do_flush_tables_read_lock(mysql))

    goto err;

  if (opt_single_transaction && start_transaction(mysql, test(opt_master_data)))

  if (opt_single_transaction && start_transaction(mysql))

      goto err;

  if (opt_delete_master_logs && do_reset_master(mysql))

    goto err;

client/mysqltest.c

+3381 −2572

File changed.

Preview size limit exceeded, changes collapsed.