Commit bb00abb0 authored by unknown's avatar unknown
Browse files

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

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
storage/ndb/include/transporter/TransporterRegistry.hpp:
  Auto merged
storage/ndb/src/common/transporter/SCI_Transporter.cpp:
  Auto merged
storage/ndb/src/common/transporter/SCI_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Buffer.hpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.cpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/SendBuffer.cpp:
  Auto merged
storage/ndb/src/common/transporter/SendBuffer.hpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
  Auto merged
storage/ndb/test/tools/hugoLoad.cpp:
  Auto merged
storage/ndb/test/tools/hugoPkUpdate.cpp:
  Auto merged
storage/ndb/test/tools/hugoScanRead.cpp:
  Auto merged
storage/ndb/test/tools/hugoScanUpdate.cpp:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
parents a4e96888 c7787f8a

mysql-test/t/ndb_restore.test

+1 −1
Original line number Diff line number Diff line
@@ -214,4 +214,4 @@ drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c; 
# Test BUG#10287

#



--exec $NDB_TOOLS_DIR/ndb_select_all -d sys -D , SYSTAB_0 | grep 520093696
 
--exec $NDB_TOOLS_DIR/ndb_select_all --no-defaults -d sys -D , SYSTAB_0 | grep 520093696

scripts/Makefile.am

+1 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ bin_SCRIPTS = @server_scripts@ \ 
			mysqldumpslow \

			mysql_explain_log \

			mysqld_multi \

			make_win_src_distribution \

			make_win_binary_distribution \

			mysql_create_system_tables



EXTRA_SCRIPTS =		make_binary_distribution.sh \
@@ -84,6 +82,7 @@ CLEANFILES = @server_scripts@ \ 
			mysqldumpslow \

			mysqld_multi \

			make_win_src_distribution \

			make_win_binary_distribution \

			mysql_create_system_tables



DISTCLEANFILES =        mysqlbug

sql/log.cc

+7 −3
Original line number Diff line number Diff line
@@ -2372,7 +2372,7 @@ void sql_print_information(const char *format, ...) 
  DBUG_VOID_RETURN;

}



#ifdef HAVE_MMAP



/********* transaction coordinator log for 2pc - mmap() based solution *******/



/*
@@ -2410,13 +2410,17 @@ void sql_print_information(const char *format, ...) 
  new xid is added into it. Removing a xid from a page does not make it

  dirty - we don't sync removals to disk.

*/



ulong tc_log_page_waits= 0;



#ifdef HAVE_MMAP



#define TC_LOG_HEADER_SIZE (sizeof(tc_log_magic)+1)



static const char tc_log_magic[]={(char) 254, 0x23, 0x05, 0x74};



ulong opt_tc_log_size= TC_LOG_MIN_SIZE;

ulong tc_log_max_pages_used=0, tc_log_page_size=0,

      tc_log_page_waits=0, tc_log_cur_pages_used=0;

ulong tc_log_max_pages_used=0, tc_log_page_size=0, tc_log_cur_pages_used=0;



int TC_LOG_MMAP::open(const char *opt_name)

{

sql/mysql_priv.h

+2 −0
Original line number Diff line number Diff line
@@ -1087,6 +1087,8 @@ extern ulong rpl_recovery_rank, thread_cache_size; 
extern ulong back_log;

extern ulong specialflag, current_pid;

extern ulong expire_logs_days, sync_binlog_period, sync_binlog_counter;

extern ulong opt_tc_log_size, tc_log_max_pages_used, tc_log_page_size;

extern ulong tc_log_page_waits;

extern my_bool relay_log_purge, opt_innodb_safe_binlog, opt_innodb;

extern uint test_flags,select_errors,ha_open_options;

extern uint protocol_version, mysqld_port, dropping_tables;

sql/mysqld.cc

+4 −0
Original line number Diff line number Diff line
@@ -4673,9 +4673,11 @@ Disable with --skip-innodb-doublewrite.", (gptr*) &innobase_use_doublewrite, 
   "more than one storage engine, when binary log is disabled)",

   (gptr*) &opt_tc_log_file, (gptr*) &opt_tc_log_file, 0, GET_STR,

   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

#ifdef HAVE_MMAP

  {"log-tc-size", OPT_LOG_TC_SIZE, "Size of transaction coordinator log.",

   (gptr*) &opt_tc_log_size, (gptr*) &opt_tc_log_size, 0, GET_ULONG,

   REQUIRED_ARG, TC_LOG_MIN_SIZE, TC_LOG_MIN_SIZE, ~0L, 0, TC_LOG_PAGE_SIZE, 0},

#endif

  {"log-update", OPT_UPDATE_LOG,

   "The update log is deprecated since version 5.0, is replaced by the binary \

log and this option justs turns on --log-bin instead.",
@@ -5817,9 +5819,11 @@ struct show_var_st status_vars[]= { 
#endif /* HAVE_OPENSSL */

  {"Table_locks_immediate",    (char*) &locks_immediate,        SHOW_LONG},

  {"Table_locks_waited",       (char*) &locks_waited,           SHOW_LONG},

#ifdef HAVE_MMAP

  {"Tc_log_max_pages_used",    (char*) &tc_log_max_pages_used,  SHOW_LONG},

  {"Tc_log_page_size",         (char*) &tc_log_page_size,       SHOW_LONG},

  {"Tc_log_page_waits",        (char*) &tc_log_page_waits,      SHOW_LONG},

#endif

  {"Threads_cached",           (char*) &cached_thread_count,    SHOW_LONG_CONST},

  {"Threads_connected",        (char*) &thread_count,           SHOW_INT_CONST},

  {"Threads_created",	       (char*) &thread_created,		SHOW_LONG_CONST},