Commit 0a6f3aad authored by unknown's avatar unknown
Browse files

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


extra/yassl/src/ssl.cpp:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
parents b230225b dce2086a

mysql-test/r/innodb.result

+1 −1
Original line number Diff line number Diff line
@@ -1830,7 +1830,7 @@ innodb_thread_concurrency 1000 
set global innodb_thread_concurrency=0;

show variables like "innodb_thread_concurrency";

Variable_name	Value

innodb_thread_concurrency	1

innodb_thread_concurrency	0

set global innodb_thread_concurrency=16;

show variables like "innodb_thread_concurrency";

Variable_name	Value

sql/ha_innodb.cc

+3 −4
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ char* innobase_unix_file_flush_method = NULL; 
/* Below we have boolean-valued start-up parameters, and their default

values */



uint	innobase_flush_log_at_trx_commit	= 1;

ulong	innobase_fast_shutdown			= 1;

my_bool innobase_log_archive			= FALSE;/* unused */

my_bool innobase_use_doublewrite		= TRUE;
@@ -1174,7 +1173,8 @@ innobase_print_identifier( 
/*======================*/

	FILE*		f,	/* in: output stream */

	trx_t*		trx,	/* in: transaction */

	ibool		table_id,/* in: TRUE=decode table name */

	ibool		table_id,/* in: TRUE=print a table name,

				FALSE=print other identifier */

	const char*	name,	/* in: name to print */

	ulint		namelen)/* in: length of name */

{
@@ -1516,7 +1516,6 @@ innobase_init(void) 
	srv_log_archive_on = (ulint) innobase_log_archive;

#endif /* UNIV_LOG_ARCHIVE */

	srv_log_buffer_size = (ulint) innobase_log_buffer_size;

	srv_flush_log_at_trx_commit = (ulint) innobase_flush_log_at_trx_commit;



	/* We set srv_pool_size here in units of 1 kB. InnoDB internally

	changes the value so that it becomes the number of database pages. */
@@ -1973,7 +1972,7 @@ innobase_commit_complete( 


		trx->active_trans = 0;



		if (srv_flush_log_at_trx_commit == 0) {

		if (UNIV_UNLIKELY(srv_flush_log_at_trx_commit == 0)) {



			return(0);

		}

sql/ha_innodb.h

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ class ha_innobase: public handler 
};



extern SHOW_VAR innodb_status_variables[];

extern uint innobase_flush_log_at_trx_commit;

extern ulong innobase_fast_shutdown;

extern ulong innobase_large_page_size;

extern long innobase_mirrored_log_groups, innobase_log_files_in_group;
@@ -243,6 +242,7 @@ extern ulong srv_n_free_tickets_to_enter; 
extern ulong srv_thread_sleep_delay;

extern ulong srv_thread_concurrency;

extern ulong srv_commit_concurrency;

extern ulong srv_flush_log_at_trx_commit;

}



int innobase_init(void);

sql/mysqld.cc

+7 −4
Original line number Diff line number Diff line
@@ -402,6 +402,7 @@ extern ulong srv_n_free_tickets_to_enter; 
extern ulong srv_thread_sleep_delay;

extern ulong srv_thread_concurrency;

extern ulong srv_commit_concurrency;

extern ulong srv_flush_log_at_trx_commit;

}

#endif

#ifdef WITH_BERKELEY_STORAGE_ENGINE
@@ -5127,8 +5128,8 @@ Disable with --skip-innodb-doublewrite.", (gptr*) &innobase_use_doublewrite, 
   (gptr*) &innobase_file_per_table, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"innodb_flush_log_at_trx_commit", OPT_INNODB_FLUSH_LOG_AT_TRX_COMMIT,

   "Set to 0 (write and flush once per second), 1 (write and flush at each commit) or 2 (write at commit, flush once per second).",

   (gptr*) &innobase_flush_log_at_trx_commit,

   (gptr*) &innobase_flush_log_at_trx_commit,

   (gptr*) &srv_flush_log_at_trx_commit,

   (gptr*) &srv_flush_log_at_trx_commit,

   0, GET_ULONG, OPT_ARG,  1, 0, 2, 0, 0, 0},

  {"innodb_flush_method", OPT_INNODB_FLUSH_METHOD,

   "With which method to flush data.", (gptr*) &innobase_unix_file_flush_method,
@@ -5899,9 +5900,11 @@ log and this option does nothing anymore.", 
   (gptr*) &srv_n_spin_wait_rounds,

   0, GET_LONG, REQUIRED_ARG, 20L, 0L, ~0L, 0, 1L, 0},

  {"innodb_thread_concurrency", OPT_INNODB_THREAD_CONCURRENCY,

   "Helps in performance tuning in heavily concurrent environments.",

   "Helps in performance tuning in heavily concurrent environments. "

   "Sets the maximum number of threads allowed inside InnoDB. Value 0"

   " will disable the thread throttling.",

   (gptr*) &srv_thread_concurrency, (gptr*) &srv_thread_concurrency,

   0, GET_LONG, REQUIRED_ARG, 8, 1, 1000, 0, 1, 0},

   0, GET_LONG, REQUIRED_ARG, 8, 0, 1000, 0, 1, 0},

  {"innodb_thread_sleep_delay", OPT_INNODB_THREAD_SLEEP_DELAY,

   "Time of innodb thread sleeping before joining InnoDB queue (usec). Value 0"

    " disable a sleep",

sql/set_var.cc

+5 −1
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ extern ulong srv_n_free_tickets_to_enter; 
extern ulong srv_thread_sleep_delay;

extern ulong srv_thread_concurrency;

extern ulong srv_commit_concurrency;

extern ulong srv_flush_log_at_trx_commit;

}



/* WITH_NDBCLUSTER_STORAGE_ENGINE */
@@ -516,6 +517,9 @@ sys_var_long_ptr sys_innodb_thread_concurrency("innodb_thread_concurrency", 
                                                &srv_thread_concurrency);

sys_var_long_ptr  sys_innodb_commit_concurrency("innodb_commit_concurrency",

                                                &srv_commit_concurrency);

sys_var_long_ptr  sys_innodb_flush_log_at_trx_commit(

                                        "innodb_flush_log_at_trx_commit",

                                        &srv_flush_log_at_trx_commit);



/* Condition pushdown to storage engine */

sys_var_thd_bool
@@ -840,7 +844,6 @@ SHOW_VAR init_vars[]= { 
  {sys_innodb_fast_shutdown.name,(char*) &sys_innodb_fast_shutdown, SHOW_SYS},

  {"innodb_file_io_threads", (char*) &innobase_file_io_threads, SHOW_LONG },

  {"innodb_file_per_table", (char*) &innobase_file_per_table, SHOW_MY_BOOL},

  {"innodb_flush_log_at_trx_commit", (char*) &innobase_flush_log_at_trx_commit, SHOW_INT},

  {"innodb_flush_method",    (char*) &innobase_unix_file_flush_method, SHOW_CHAR_PTR},

  {"innodb_force_recovery", (char*) &innobase_force_recovery, SHOW_LONG },

  {"innodb_lock_wait_timeout", (char*) &innobase_lock_wait_timeout, SHOW_LONG },
@@ -860,6 +863,7 @@ SHOW_VAR init_vars[]= { 
  {sys_innodb_table_locks.name, (char*) &sys_innodb_table_locks, SHOW_SYS},

  {sys_innodb_thread_concurrency.name, (char*) &sys_innodb_thread_concurrency, SHOW_SYS},

  {sys_innodb_thread_sleep_delay.name, (char*) &sys_innodb_thread_sleep_delay, SHOW_SYS},

  {sys_innodb_flush_log_at_trx_commit.name, (char*) &sys_innodb_flush_log_at_trx_commit, SHOW_SYS},

  {sys_interactive_timeout.name,(char*) &sys_interactive_timeout,   SHOW_SYS},

  {sys_join_buffer_size.name,   (char*) &sys_join_buffer_size,	    SHOW_SYS},

  {sys_key_buffer_size.name,	(char*) &sys_key_buffer_size,	    SHOW_SYS},