Merge lp:~percona-dev/percona-server/release-5.1.49-12-fix-bug-610525 into lp:percona-server/release-5.1.49-12

[Oleg Tsarev]

fix bug 610525
https://bugs.launchpad.net/percona-server/+bug/610525

=== modified file 'i_s_innodb_buffer_pool_pages.patch'
--- i_s_innodb_buffer_pool_pages.patch	2010-07-26 16:29:05 +0000
+++ i_s_innodb_buffer_pool_pages.patch	2010-08-09 10:51:47 +0000
@@ -40,7 +40,7 @@
  }
  
  static const char plugin_author[] = "Innobase Oy";
-@@ -380,6 +381,709 @@
+@@ -380,6 +381,705 @@
  };
  
  
@@ -397,10 +397,6 @@
 +  ulint		n_chunks, n_blocks;
 +  dulint		index_id;
 +
-+  const char *p;
-+  char db_name_raw[NAME_LEN*5+1], db_name[NAME_LEN+1];
-+  char table_name_raw[NAME_LEN*5+1], table_name[NAME_LEN+1];
-+
 +	buf_chunk_t*	chunk;
 +
 +	DBUG_ENTER("i_s_innodb_buffer_pool_pages_index_fill");

=== modified file 'innodb_admin_command_base.patch'
--- innodb_admin_command_base.patch	2010-07-26 16:29:05 +0000
+++ innodb_admin_command_base.patch	2010-08-09 10:51:47 +0000
@@ -12,7 +12,7 @@
 diff -ruN a/storage/innodb_plugin/handler/i_s.cc b/storage/innodb_plugin/handler/i_s.cc
 --- a/storage/innodb_plugin/handler/i_s.cc	2010-04-30 10:49:58.000000000 +0900
 +++ b/storage/innodb_plugin/handler/i_s.cc	2010-04-30 14:36:22.000000000 +0900
-@@ -2951,3 +2951,140 @@
+@@ -2951,3 +2951,139 @@
  	STRUCT_FLD(system_vars, NULL),
  	STRUCT_FLD(__reserved1, NULL)
  };
@@ -49,11 +49,10 @@
 +	COND*		cond)
 +{
 +	TABLE*	i_s_table	= (TABLE *) tables->table;
-+	CHARSET_INFO *cs= system_charset_info;
 +	char**	query_str;
 +	char*	ptr;
 +	char	quote	= '\0';
-+	char*	command_head = "XTRA_";
++	const char*	command_head = "XTRA_";
 +
 +	DBUG_ENTER("i_s_innodb_admin_command_fill");
 +

=== modified file 'innodb_buffer_pool_shm.patch'
--- innodb_buffer_pool_shm.patch	2010-07-26 16:29:05 +0000
+++ innodb_buffer_pool_shm.patch	2010-08-09 10:51:47 +0000
@@ -95,7 +95,7 @@
  	byte*		frame;
 +	ulint		zip_hash_n = 0;
 +	ulint		zip_hash_mem_size = 0;
-+	hash_table_t*	zip_hash_tmp;
++	hash_table_t*	zip_hash_tmp = NULL;
  	ulint		i;
 +	buf_shm_info_t*	shm_info = NULL;
  

=== modified file 'innodb_expand_import.patch'
--- innodb_expand_import.patch	2010-07-26 16:29:05 +0000
+++ innodb_expand_import.patch	2010-08-09 10:51:47 +0000
@@ -1,7 +1,7 @@
 diff -ruN a/storage/innodb_plugin/fil/fil0fil.c b/storage/innodb_plugin/fil/fil0fil.c
 --- a/storage/innodb_plugin/fil/fil0fil.c	2010-04-29 15:44:28.000000000 +0900
 +++ b/storage/innodb_plugin/fil/fil0fil.c	2010-04-30 10:43:13.000000000 +0900
-@@ -40,6 +40,10 @@
+@@ -40,6 +40,12 @@
  #include "dict0dict.h"
  #include "page0page.h"
  #include "page0zip.h"
@@ -9,6 +9,8 @@
 +#include "trx0sys.h"
 +#include "pars0pars.h"
 +#include "row0mysql.h"
++#include "row0row.h"
++#include "que0que.h"
  #ifndef UNIV_HOTBACKUP
  # include "buf0lru.h"
  # include "ibuf0ibuf.h"
@@ -109,7 +111,7 @@
 +		for (i = 0; i < n_index; i++) {
 +			new_id[i] =
 +				dict_table_get_index_on_name(table,
-+						(page + (i + 1) * 512 + 12))->id;
++						(char*)(page + (i + 1) * 512 + 12))->id;
 +			old_id[i] = mach_read_from_8(page + (i + 1) * 512);
 +			root_page[i] = mach_read_from_4(page + (i + 1) * 512 + 8);
 +		}
@@ -133,7 +135,7 @@
 +			/* over write space id of all pages */
 +			rec_offs_init(offsets_);
 +
-+			fprintf(stderr, "InnoDB: Progress in %:");
++			fprintf(stderr, "InnoDB: Progress in %%:");
 +
 +			for (offset = 0; offset < size_bytes; offset += UNIV_PAGE_SIZE) {
 +				ulint		checksum_field;

=== modified file 'innodb_extend_slow.patch'
--- innodb_extend_slow.patch	2010-07-27 11:21:00 +0000
+++ innodb_extend_slow.patch	2010-08-09 10:51:47 +0000
@@ -31,9 +31,9 @@
 +	block_hash_byte = block_hash >> 3;
 +	block_hash_offset = (byte) block_hash & 0x07;
 +	if (block_hash_byte < 0 || block_hash_byte >= DPAH_SIZE)
-+		fprintf(stderr, "!!! block_hash_byte = %lu  block_hash_offset = %lu !!!\n", block_hash_byte, block_hash_offset);
++		fprintf(stderr, "!!! block_hash_byte = %lu  block_hash_offset = %d !!!\n", block_hash_byte, block_hash_offset);
 +	if (block_hash_offset < 0 || block_hash_offset > 7)
-+		fprintf(stderr, "!!! block_hash_byte = %lu  block_hash_offset = %lu !!!\n", block_hash_byte, block_hash_offset);
++		fprintf(stderr, "!!! block_hash_byte = %lu  block_hash_offset = %d !!!\n", block_hash_byte, block_hash_offset);
 +	if ((trx->distinct_page_access_hash[block_hash_byte] & ((byte) 0x01 << block_hash_offset)) == 0)
 +		trx->distinct_page_access++;
 +	trx->distinct_page_access_hash[block_hash_byte] |= (byte) 0x01 << block_hash_offset;

=== modified file 'innodb_files_extend.patch'
--- innodb_files_extend.patch	2010-07-27 11:21:00 +0000
+++ innodb_files_extend.patch	2010-08-09 10:51:47 +0000
@@ -37,7 +37,7 @@
 -		+ (UNIV_PAGE_SIZE / FSP_EXTENT_SIZE) * XDES_SIZE
 -#  error
 -# endif
-+//# if UNIV_PAGE_SIZE <= XDES_ARR_OFFSET \
++//# if UNIV_PAGE_SIZE <= XDES_ARR_OFFSET
 +//		+ (UNIV_PAGE_SIZE / FSP_EXTENT_SIZE) * XDES_SIZE
 +//#  error
 +//# endif
@@ -89,12 +89,12 @@
 +	srv_page_size_shift = 0;
 +
 +	if (innobase_page_size != (1 << 14)) {
-+		int n_shift;
++		uint n_shift;
 +
 +		fprintf(stderr,
 +			"InnoDB: Warning: innodb_page_size has been changed from default value 16384. (###EXPERIMENTAL### operation)\n");
 +		for (n_shift = 12; n_shift <= UNIV_PAGE_SIZE_SHIFT_MAX; n_shift++) {
-+			if (innobase_page_size == (1 << n_shift)) {
++			if (innobase_page_size == ((ulong)1 << n_shift)) {
 +				srv_page_size_shift = n_shift;
 +				srv_page_size = (1 << srv_page_size_shift);
 +				fprintf(stderr,
@@ -203,6 +203,18 @@
  					/*!< number of buddy sizes */
  
  /** twice the maximum block size of the buddy system;
+diff -ruN a/storage/innodb_plugin/include/mtr0log.ic b/storage/innodb_plugin/include/mtr0log.ic
+--- a/storage/innodb_plugin/include/mtr0log.ic	2010-08-02 17:53:38.107904828 +0900
++++ b/storage/innodb_plugin/include/mtr0log.ic	2010-08-02 17:55:56.452879919 +0900
+@@ -203,7 +203,7 @@
+ 	system tablespace */
+ 	if ((space == TRX_SYS_SPACE
+ 	     || (srv_doublewrite_file && space == TRX_DOUBLEWRITE_SPACE))
+-	    && offset >= FSP_EXTENT_SIZE && offset < 3 * FSP_EXTENT_SIZE) {
++	    && offset >= (ulint)FSP_EXTENT_SIZE && offset < 3 * (ulint)FSP_EXTENT_SIZE) {
+ 		if (trx_doublewrite_buf_is_being_created) {
+ 			/* Do nothing: we only come to this branch in an
+ 			InnoDB database creation. We do not redo log
 diff -ruN a/storage/innodb_plugin/include/page0types.h b/storage/innodb_plugin/include/page0types.h
 --- a/storage/innodb_plugin/include/page0types.h	2010-04-06 23:07:13.000000000 +0900
 +++ b/storage/innodb_plugin/include/page0types.h	2010-04-30 16:35:09.000000000 +0900

=== modified file 'innodb_io_patches.patch'
--- innodb_io_patches.patch	2010-07-26 16:29:05 +0000
+++ innodb_io_patches.patch	2010-08-09 10:51:47 +0000
@@ -555,7 +555,7 @@
 +/* Per thread buffer used for merged IO requests. Used by
 +os_aio_simulated_handle so that a buffer doesn't have to be allocated
 +for each request. */
-+static char* os_aio_thread_buffer[SRV_MAX_N_IO_THREADS];
++static byte* os_aio_thread_buffer[SRV_MAX_N_IO_THREADS];
 +static ulint os_aio_thread_buffer_size[SRV_MAX_N_IO_THREADS];
 +
  /** Number of asynchronous I/O segments.  Set by os_aio_init(). */

=== modified file 'innodb_pass_corrupt_table.patch'
--- innodb_pass_corrupt_table.patch	2010-07-26 16:29:05 +0000
+++ innodb_pass_corrupt_table.patch	2010-08-09 10:51:47 +0000
@@ -384,7 +384,7 @@
 +			if (srv_pass_corrupt_table && !trx_sys_sys_space(bpage->space)
 +			    && bpage->space < SRV_LOG_SPACE_FIRST_ID) {
 +				fprintf(stderr,
-+					"InnoDB: space %lu will be treated as corrupt.\n",
++					"InnoDB: space %u will be treated as corrupt.\n",
 +					bpage->space);
 +				fil_space_set_corrupt(bpage->space);
 +				if (trx && trx->dict_operation_lock_mode == 0) {
@@ -1212,6 +1212,43 @@
  	ptr = buf_block_get_frame(block) + addr.boffset;
  
  	buf_block_dbg_add_level(block, SYNC_NO_ORDER_CHECK);
+diff -ruN a/storage/innodb_plugin/include/page0page.h b/storage/innodb_plugin/include/page0page.h
+--- a/storage/innodb_plugin/include/page0page.h	2010-07-09 21:34:54.000000000 +0900
++++ b/storage/innodb_plugin/include/page0page.h	2010-08-02 19:05:07.080258292 +0900
+@@ -500,7 +500,7 @@
+ page_is_leaf(
+ /*=========*/
+ 	const page_t*	page)	/*!< in: page */
+-	__attribute__((nonnull, pure));
++	__attribute__((pure));
+ /************************************************************//**
+ Gets the pointer to the next record on the page.
+ @return	pointer to next record */
+diff -ruN a/storage/innodb_plugin/include/page0page.ic b/storage/innodb_plugin/include/page0page.ic
+--- a/storage/innodb_plugin/include/page0page.ic	2010-07-09 21:34:54.000000000 +0900
++++ b/storage/innodb_plugin/include/page0page.ic	2010-08-02 19:05:42.015905567 +0900
+@@ -275,6 +275,9 @@
+ /*=========*/
+ 	const page_t*	page)	/*!< in: page */
+ {
++	if (!page) {
++		return(FALSE);
++	}
+ 	return(!*(const uint16*) (page + (PAGE_HEADER + PAGE_LEVEL)));
+ }
+ 
+diff -ruN a/storage/innodb_plugin/include/page0zip.h b/storage/innodb_plugin/include/page0zip.h
+--- a/storage/innodb_plugin/include/page0zip.h	2010-07-09 21:34:54.000000000 +0900
++++ b/storage/innodb_plugin/include/page0zip.h	2010-08-02 19:05:58.348879795 +0900
+@@ -114,7 +114,7 @@
+ 	const page_t*	page,	/*!< in: uncompressed page */
+ 	dict_index_t*	index,	/*!< in: index of the B-tree node */
+ 	mtr_t*		mtr)	/*!< in: mini-transaction, or NULL */
+-	__attribute__((nonnull(1,2,3)));
++	__attribute__((nonnull(1,3)));
+ 
+ /**********************************************************************//**
+ Decompress a page.  This function should tolerate errors on the compressed
 diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
 --- a/storage/innodb_plugin/include/srv0srv.h	2010-04-30 15:46:35.000000000 +0900
 +++ b/storage/innodb_plugin/include/srv0srv.h	2010-04-30 15:49:22.000000000 +0900
@@ -1223,6 +1260,20 @@
  
  extern ulint	srv_extra_rsegments;
  extern ulint	srv_dict_size_limit;
+diff -ruN a/storage/innodb_plugin/page/page0zip.c b/storage/innodb_plugin/page/page0zip.c
+--- a/storage/innodb_plugin/page/page0zip.c	2010-07-09 21:34:57.000000000 +0900
++++ b/storage/innodb_plugin/page/page0zip.c	2010-08-02 19:06:34.347851182 +0900
+@@ -1153,6 +1153,10 @@
+ 	FILE*		logfile = NULL;
+ #endif
+ 
++	if (!page) {
++		return(FALSE);
++	}
++
+ 	ut_a(page_is_comp(page));
+ 	ut_a(fil_page_get_type(page) == FIL_PAGE_INDEX);
+ 	ut_ad(page_simple_validate_new((page_t*) page));
 diff -ruN a/storage/innodb_plugin/row/row0ins.c b/storage/innodb_plugin/row/row0ins.c
 --- a/storage/innodb_plugin/row/row0ins.c	2010-04-06 23:07:14.000000000 +0900
 +++ b/storage/innodb_plugin/row/row0ins.c	2010-04-30 15:49:22.000000000 +0900

=== modified file 'innodb_recovery_patches.patch'
--- innodb_recovery_patches.patch	2010-07-26 16:29:05 +0000
+++ innodb_recovery_patches.patch	2010-08-09 10:51:47 +0000
@@ -349,12 +349,11 @@
  	}
  
  	mutex_exit(&(recv_sys->mutex));
-@@ -3255,6 +3313,84 @@
+@@ -3255,6 +3313,83 @@
  	}
  #endif /* UNIV_DEBUG */
  
 +	if (recv_needed_recovery && srv_recovery_stats) {
-+		FILE*	file = stderr;
 +		ulint	i;
 +
 +		fprintf(stderr,

=== modified file 'innodb_separate_doublewrite.patch'
--- innodb_separate_doublewrite.patch	2010-07-27 11:21:00 +0000
+++ innodb_separate_doublewrite.patch	2010-08-09 10:51:47 +0000
@@ -840,7 +840,7 @@
  			   && ((page_no >= block1
  				&& page_no
  				< block1 + TRX_SYS_DOUBLEWRITE_BLOCK_SIZE)
-@@ -980,6 +1133,87 @@
+@@ -980,6 +1133,83 @@
  }
  
  /*****************************************************************//**
@@ -852,12 +852,8 @@
 +	ulint	space,
 +	mtr_t*	mtr)
 +{
-+	trx_sysf_t*	sys_header;
-+	ulint		slot_no;
 +	buf_block_t*	block;
 +	page_t*		page;
-+	ulint		page_no;
-+	ulint		i;
 +
 +	ut_ad(mtr);
 +

=== modified file 'innodb_show_status.patch'
--- innodb_show_status.patch	2010-07-26 16:29:05 +0000
+++ innodb_show_status.patch	2010-08-09 10:51:47 +0000
@@ -211,14 +211,13 @@
  /** Maximum number of times allowed to conditionally acquire
  mutex before switching to blocking wait on the mutex */
  #define MAX_MUTEX_NOWAIT	20
-@@ -1700,6 +1703,14 @@
+@@ -1700,6 +1703,13 @@
  	ulint	n_reserved;
  	ibool	ret;
  
 +	ulint	btr_search_sys_subtotal;
 +	ulint	lock_sys_subtotal;
 +	ulint	recv_sys_subtotal;
-+	ulint	io_counter_subtotal;
 +
 +	ulint	i;
 +	trx_t*	trx;

=== modified file 'innodb_split_buf_pool_mutex.patch'
--- innodb_split_buf_pool_mutex.patch	2010-07-26 16:29:05 +0000
+++ innodb_split_buf_pool_mutex.patch	2010-08-09 10:51:47 +0000
@@ -4081,18 +4081,23 @@
  #ifdef UNIV_DEBUG
  	mutex->magic_n = MUTEX_MAGIC_N;
  #endif /* UNIV_DEBUG */
-@@ -436,10 +436,18 @@
- 					the value is stored to memory */
- 	ut_ad(mutex);
- 
+@@ -432,6 +432,15 @@
+ 	mutex_t*	mutex,	/*!< in: mutex */
+ 	ulint		n)	/*!< in: value to set */
+ {
 +#ifdef INNODB_RW_LOCKS_USE_ATOMICS
++	ut_ad(mutex);
++
 +	if (n) {
 +		os_compare_and_swap_ulint(&mutex->waiters, 0, 1);
 +	} else {
 +		os_compare_and_swap_ulint(&mutex->waiters, 1, 0);
 +	}
 +#else
- 	ptr = &(mutex->waiters);
+ 	volatile ulint*	ptr;		/* declared volatile to ensure that
+ 					the value is stored to memory */
+ 	ut_ad(mutex);
+@@ -440,6 +449,7 @@
  
  	*ptr = n;		/* Here we assume that the write of a single
  				word in memory is atomic */

=== modified file 'innodb_stats.patch'
--- innodb_stats.patch	2010-07-27 11:21:00 +0000
+++ innodb_stats.patch	2010-08-09 10:51:47 +0000
@@ -133,7 +133,7 @@
 +	ibool		diverged_lot;
 +	ulint		divergence_level;
 +	ulint		n_pages;
-+	ulint		i,j;
++	ulint		i;
 +	mtr_t		mtr;
 +	mem_heap_t*	heap;
 +
@@ -2056,7 +2056,7 @@
  	}
  }
  
-@@ -2012,6 +2015,46 @@
+@@ -2012,6 +2015,45 @@
  }
  
  /*********************************************************************//**
@@ -2072,7 +2072,6 @@
 +	mem_heap_t*	heap;
 +	que_thr_t*	thr;
 +	ulint		err;
-+	ulint		i;
 +
 +	ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
 +

=== modified file 'mysql-test/percona_query_response_time.result'
--- mysql-test/percona_query_response_time.result	2010-07-20 13:16:43 +0000
+++ mysql-test/percona_query_response_time.result	2010-08-09 10:51:47 +0000
@@ -59,10 +59,10 @@
  131072.000000
  262144.000000
  524288.000000
-1048576.000000
-2097152.000000
-4194304.000000
-8388608.000000
+ 1048576.00000
+ 2097152.00000
+ 4194304.00000
+ 8388608.00000
 TOO LONG QUERY
 SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
 SELECT SLEEP(0.31);
@@ -178,10 +178,10 @@
  131072.000000
  262144.000000
  524288.000000
-1048576.000000
-2097152.000000
-4194304.000000
-8388608.000000
+ 1048576.00000
+ 2097152.00000
+ 4194304.00000
+ 8388608.00000
 TOO LONG QUERY
 SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
 Variable_name	Value
@@ -276,7 +276,7 @@
    1000.000000
   10000.000000
  100000.000000
-1000000.000000
+ 1000000.00000
 TOO LONG QUERY
 SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
 Variable_name	Value
@@ -374,7 +374,7 @@
   16807.000000
  117649.000000
  823543.000000
-5764801.000000
+ 5764801.00000
 TOO LONG QUERY
 SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
 Variable_name	Value
@@ -462,7 +462,7 @@
       1.000000
     156.000000
   24336.000000
-3796416.000000
+ 3796416.00000
 TOO LONG QUERY
 SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
 Variable_name	Value
@@ -549,7 +549,7 @@
       0.001000
       1.000000
    1000.000000
-1000000.000000
+ 1000000.00000
 TOO LONG QUERY
 SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
 Variable_name	Value

=== modified file 'response-time-distribution.patch'
--- response-time-distribution.patch	2010-08-03 12:39:09 +0000
+++ response-time-distribution.patch	2010-08-09 10:51:47 +0000
@@ -203,7 +203,7 @@
 +
 +#define do_xstr(s) do_str(s)
 +#define do_str(s) #s
-+#define do_format(filler,width) "%" filler width "llu"
++#define do_format(filler,width) "%" filler width "lld"
 +/*
 +  Format strings for snprintf. Generate from:
 +  POSITIVE_POWER_FILLER and STRING_POSITIVE_POWER_LENGTH
@@ -340,7 +340,7 @@
 +
 +      for(int i= 0, count= m_utility->bound_count(); i < count; ++i)
 +      {
-+	ulonglong value  = m_utility->bound(i);
++	longlong value  = (longlong)m_utility->bound(i);
 +	char*     result = (char*)m_bound[i];
 +        if(0 > snprintf(result,STRING_BUFFER_LENGTH,STRING_FORMAT,(value / million),(value % million)))
 +        {

=== modified file 'slow_extended.patch'
--- slow_extended.patch	2010-08-03 13:22:23 +0000
+++ slow_extended.patch	2010-08-09 10:51:47 +0000
@@ -389,6 +389,7 @@
    /*
      As a disk space optimization, future masters will not log an event for
      LAST_INSERT_ID() if that function returned 0 (and thus they will be able
+<<<<<<< TREE
 diff -Nur a/sql/log.h b/sql/log.h
 --- a/sql/log.h	2010-08-03 16:24:06.609042572 +0400
 +++ b/sql/log.h	2010-08-03 16:24:22.637800704 +0400
@@ -428,6 +429,47 @@
                          time_t query_start_arg, const char *user_host,
                          uint user_host_len, ulonglong query_utime,
                          ulonglong lock_utime, bool is_command,
+=======
+diff -Nur a/sql/log.h b/sql/log.h
+--- a/sql/log.h	2010-07-09 21:34:57.000000000 +0900
++++ b/sql/log.h	2010-07-26 18:04:33.879030230 +0900
+@@ -211,7 +211,7 @@
+              uint user_host_len, int thread_id,
+              const char *command_type, uint command_type_len,
+              const char *sql_text, uint sql_text_len);
+-  bool write(THD *thd, time_t current_time, time_t query_start_arg,
++  bool write(THD *thd, ulonglong current_utime, time_t query_start_arg,
+              const char *user_host, uint user_host_len,
+              ulonglong query_utime, ulonglong lock_utime, bool is_command,
+              const char *sql_text, uint sql_text_len);
+@@ -424,7 +424,7 @@
+   virtual bool init()= 0;
+   virtual void cleanup()= 0;
+ 
+-  virtual bool log_slow(THD *thd, time_t current_time,
++  virtual bool log_slow(THD *thd, ulonglong current_utime,
+                         time_t query_start_arg, const char *user_host,
+                         uint user_host_len, ulonglong query_utime,
+                         ulonglong lock_utime, bool is_command,
+@@ -453,7 +453,7 @@
+   virtual bool init();
+   virtual void cleanup();
+ 
+-  virtual bool log_slow(THD *thd, time_t current_time,
++  virtual bool log_slow(THD *thd, ulonglong current_utime,
+                         time_t query_start_arg, const char *user_host,
+                         uint user_host_len, ulonglong query_utime,
+                         ulonglong lock_utime, bool is_command,
+@@ -485,7 +485,7 @@
+   virtual bool init();
+   virtual void cleanup();
+ 
+-  virtual bool log_slow(THD *thd, time_t current_time,
++  virtual bool log_slow(THD *thd, ulonglong current_utime,
+                         time_t query_start_arg, const char *user_host,
+                         uint user_host_len, ulonglong query_utime,
+                         ulonglong lock_utime, bool is_command,
+>>>>>>> MERGE-SOURCE
 diff -Nur a/sql/mysqld.cc b/sql/mysqld.cc
 --- a/sql/mysqld.cc	2010-08-03 16:24:06.599042136 +0400
 +++ b/sql/mysqld.cc	2010-08-03 16:24:23.947815330 +0400
@@ -554,6 +596,7 @@
    case OPT_SERVER_ID:
      server_id_supplied = 1;
      break;
+<<<<<<< TREE
 diff -Nur a/sql/mysql_priv.h b/sql/mysql_priv.h
 --- a/sql/mysql_priv.h	2010-08-03 16:24:06.619042449 +0400
 +++ b/sql/mysql_priv.h	2010-08-03 16:24:23.867829161 +0400
@@ -675,6 +718,129 @@
  extern my_bool sp_automatic_privileges, opt_noacl;
  extern my_bool opt_old_style_user_limits, trust_function_creators;
  extern uint opt_crash_binlog_innodb;
+=======
+diff -Nur a/sql/mysql_priv.h b/sql/mysql_priv.h
+--- a/sql/mysql_priv.h	2010-07-26 18:04:18.711114116 +0900
++++ b/sql/mysql_priv.h	2010-07-26 18:04:33.901113370 +0900
+@@ -613,6 +613,106 @@
+ 
+ #define STRING_BUFFER_USUAL_SIZE 80
+ 
++/* Slow log */
++
++struct msl_opts
++{
++  ulong val;
++  const char *name;
++};
++
++/* use global log slow control */
++#define SLOG_UG_NONE                        1 << 0
++#define SLOG_UG_LOG_SLOW_FILTER             1 << 1
++#define SLOG_UG_LOG_SLOW_RATE_LIMIT         1 << 2
++#define SLOG_UG_LOG_SLOW_VERBOSITY          1 << 3
++#define SLOG_UG_LONG_QUERY_TIME             1 << 4
++#define SLOG_UG_MIN_EXAMINED_ROW_LIMIT      1 << 5
++#define SLOG_UG_ALL                         SLOG_UG_LOG_SLOW_FILTER | SLOG_UG_LOG_SLOW_RATE_LIMIT | SLOG_UG_LOG_SLOW_VERBOSITY | SLOG_UG_LONG_QUERY_TIME | SLOG_UG_MIN_EXAMINED_ROW_LIMIT
++/* ... */
++#define SLOG_UG_INVALID                     1##UL << 31
++
++static const struct msl_opts slog_use_global[]=
++  {
++    /* Basic flags */
++    { SLOG_UG_NONE                      , "none" },
++    { SLOG_UG_LOG_SLOW_FILTER           , "log_slow_filter" },
++    { SLOG_UG_LOG_SLOW_RATE_LIMIT       , "log_slow_rate_limit" },
++    { SLOG_UG_LOG_SLOW_VERBOSITY        , "log_slow_verbosity" },
++    { SLOG_UG_LONG_QUERY_TIME           , "long_query_time" },
++    { SLOG_UG_MIN_EXAMINED_ROW_LIMIT    , "min_examined_row_limit" },
++    /* ... */
++    { 0, "" },
++    /* Complex flags */
++    { SLOG_UG_ALL                       , "all" },
++    /* ... */
++    { SLOG_UG_INVALID                   , (char*)0 }
++  };
++
++#define SLOG_V_MICROTIME      1 << 0
++#define SLOG_V_QUERY_PLAN     1 << 1
++#define SLOG_V_INNODB         1 << 2
++/* ... */
++#define SLOG_V_INVALID        1##UL << 31
++#define SLOG_V_NONE           SLOG_V_MICROTIME
++
++static const struct msl_opts slog_verb[]= 
++{
++  /* Basic flags */
++
++  { SLOG_V_MICROTIME, "microtime" },
++  { SLOG_V_QUERY_PLAN, "query_plan" },
++  { SLOG_V_INNODB, "innodb" },
++
++  /* End of baisc flags */
++
++  { 0, "" },
++
++  /* Complex flags */
++
++  { SLOG_V_MICROTIME, "minimal" },
++  { SLOG_V_MICROTIME|SLOG_V_QUERY_PLAN, "standard" },
++  { SLOG_V_MICROTIME|SLOG_V_QUERY_PLAN|SLOG_V_INNODB, "full" },
++
++  /* End of complex flags */
++
++  { SLOG_V_INVALID, (char *)0 }
++};
++
++#define QPLAN_NONE            0
++#define QPLAN_QC              1 << 0
++#define QPLAN_QC_NO           1 << 1
++#define QPLAN_FULL_SCAN       1 << 2
++#define QPLAN_FULL_JOIN       1 << 3
++#define QPLAN_TMP_TABLE       1 << 4
++#define QPLAN_TMP_DISK        1 << 5
++#define QPLAN_FILESORT        1 << 6
++#define QPLAN_FILESORT_DISK   1 << 7
++/* ... */
++#define QPLAN_MAX             1 << 31
++
++#define SLOG_F_QC_NO          QPLAN_QC_NO
++#define SLOG_F_FULL_SCAN      QPLAN_FULL_SCAN
++#define SLOG_F_FULL_JOIN      QPLAN_FULL_JOIN
++#define SLOG_F_TMP_TABLE      QPLAN_TMP_TABLE
++#define SLOG_F_TMP_DISK       QPLAN_TMP_DISK
++#define SLOG_F_FILESORT       QPLAN_FILESORT
++#define SLOG_F_FILESORT_DISK  QPLAN_FILESORT_DISK
++#define SLOG_F_INVALID        1##UL << 31
++#define SLOG_F_NONE           0
++
++static const struct msl_opts slog_filter[]= 
++{
++  { SLOG_F_QC_NO,         "qc_miss" },
++  { SLOG_F_FULL_SCAN,     "full_scan" },
++  { SLOG_F_FULL_JOIN,     "full_join" },
++  { SLOG_F_TMP_TABLE,     "tmp_table" },
++  { SLOG_F_TMP_DISK,      "tmp_table_on_disk" },
++  { SLOG_F_FILESORT,      "filesort" },
++  { SLOG_F_FILESORT_DISK, "filesort_on_disk" },
++  { SLOG_F_INVALID,       (char *)0 }
++};
++
+ /*
+   Some defines for exit codes for ::is_equal class functions.
+ */
+@@ -1971,6 +2071,10 @@
+ extern my_bool opt_secure_auth;
+ extern char* opt_secure_file_priv;
+ extern my_bool opt_log_slow_admin_statements, opt_log_slow_slave_statements;
++extern my_bool opt_log_slow_sp_statements;
++extern my_bool opt_log_slow_timestamp_every;
++extern my_bool opt_use_global_long_query_time;
++extern my_bool opt_slow_query_log_microseconds_timestamp;
+ extern my_bool sp_automatic_privileges, opt_noacl;
+ extern my_bool opt_old_style_user_limits, trust_function_creators;
+ extern uint opt_crash_binlog_innodb;
+>>>>>>> MERGE-SOURCE
 diff -Nur a/sql/set_var.cc b/sql/set_var.cc
 --- a/sql/set_var.cc	2010-08-03 16:24:06.599042136 +0400
 +++ b/sql/set_var.cc	2010-08-03 16:24:23.979041934 +0400
@@ -1424,7 +1590,7 @@
    share->db_record_offset= 1;
    DBUG_RETURN(0);
   err:
-@@ -10847,6 +10855,14 @@
+@@ -10847,5 +10855,13 @@
    save_proc_info=thd->proc_info;
    thd_proc_info(thd, "removing tmp table");
  
@@ -1438,6 +1604,7 @@
 +
    // Release latches since this can take a long time
    ha_release_temporary_latches(thd);
+<<<<<<< TREE
  
 diff -Nur a/sql/sql_show.cc b/sql/sql_show.cc
 --- a/sql/sql_show.cc	2010-08-03 16:24:06.609042572 +0400
@@ -1458,3 +1625,5 @@
        /* STATE */
  #ifndef EMBEDDED_LIBRARY
        val= (char*) (tmp->locked ? "Locked" :
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'userstat.patch'
--- userstat.patch	2010-08-03 14:08:54 +0000
+++ userstat.patch	2010-08-09 10:51:47 +0000
@@ -207,13 +207,13 @@
 +  if (!table->s || !table->s->table_cache_key.str || !table->s->table_name.str) return;
 +
 +  if (!opt_userstat_running) {
-+    for (int x = 0; x < table->s->keys; x++) {
++    for (uint x = 0; x < table->s->keys; x++) {
 +      index_rows_read[x] = 0;
 +    }
 +    return;
 +  }
 +
-+  for (int x = 0; x < table->s->keys; x++) {
++  for (uint x = 0; x < table->s->keys; x++) {
 +    if (index_rows_read[x]) {
 +      // Rows were read using this index.
 +      KEY* key_info = &table->key_info[x];
@@ -282,13 +282,14 @@
    /**
      next_insert_id is the next value which should be inserted into the
      auto_increment column: in a inserting-multi-row statement (like INSERT
-@@ -1156,8 +1163,10 @@
+@@ -1155,9 +1162,11 @@
+     ref_length(sizeof(my_off_t)),
      ft_handler(0), inited(NONE),
      locked(FALSE), implicit_emptied(0),
-     pushed_cond(0), next_insert_id(0), insert_id_for_cur_row(0),
--    auto_inc_intervals_count(0)
+-    pushed_cond(0), next_insert_id(0), insert_id_for_cur_row(0),
++    pushed_cond(0), rows_read(0), rows_changed(0), next_insert_id(0), insert_id_for_cur_row(0),
+     auto_inc_intervals_count(0)
 -    {}
-+    auto_inc_intervals_count(0), rows_read(0), rows_changed(0)
 +    {
 +      memset(index_rows_read, 0, sizeof(index_rows_read));
 +    }
@@ -2440,92 +2441,15 @@
      my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
               sctx->priv_user, sctx->host_or_ip, dbname);
      general_log_print(thd,COM_INIT_DB,ER(ER_DBACCESS_DENIED_ERROR),
+<<<<<<< TREE
 @@ -2371,6 +2401,360 @@
+=======
+@@ -2366,6 +2401,279 @@
+>>>>>>> MERGE-SOURCE
    DBUG_RETURN(res);
  }
  
 +/*
-+   Aggregate values for mapped_user entries by their role.
-+
-+   SYNOPSIS
-+     aggregate_user_stats
-+       all_user_stats - input to aggregate
-+       agg_user_stats - returns aggregated values
-+
-+   RETURN
-+     0 - OK
-+     1 - error
-+ */
-+static int
-+aggregate_user_stats(HASH *all_user_stats, HASH *agg_user_stats)
-+{
-+  DBUG_ENTER("aggregate_user_stats");
-+  if (hash_init(agg_user_stats, system_charset_info,
-+                max(all_user_stats->records, 1),
-+                0, 0, (hash_get_key)get_key_user_stats,
-+                (hash_free_key)free_user_stats, 0))
-+  {
-+    sql_print_error("Malloc in aggregate_user_stats failed");
-+    DBUG_RETURN(1);
-+  }
-+
-+  for (int i = 0; i < all_user_stats->records; ++i) {
-+    USER_STATS *user = (USER_STATS*)hash_element(all_user_stats, i);
-+    USER_STATS *agg_user;
-+    if (!(agg_user = (USER_STATS*)hash_search(agg_user_stats,
-+                                              (uchar*)user->priv_user,
-+                                              strlen(user->priv_user))))
-+    {
-+      // First entry for this role.
-+      if (!(agg_user =
-+            (USER_STATS*) my_malloc(sizeof(USER_STATS), MYF(MY_WME | MY_ZEROFILL))))
-+      {
-+        sql_print_error("Malloc in aggregate_user_stats failed");
-+        DBUG_RETURN(1);
-+      }
-+
-+      init_user_stats(agg_user, user->priv_user, user->priv_user,
-+                      user->total_connections, user->concurrent_connections,
-+                      user->connected_time, user->busy_time, user->cpu_time,
-+                      user->bytes_received, user->bytes_sent,
-+                      user->binlog_bytes_written,
-+                      user->rows_fetched, user->rows_updated, user->rows_read,
-+                      user->select_commands, user->update_commands,
-+                      user->other_commands,
-+                      user->commit_trans, user->rollback_trans,
-+                      user->denied_connections, user->lost_connections,
-+                      user->access_denied_errors, user->empty_queries);
-+
-+      if (my_hash_insert(agg_user_stats, (uchar*)agg_user))
-+      {
-+        // Out of memory.
-+        my_free((char*)agg_user, 0);
-+        sql_print_error("Malloc in aggregate_user_stats failed");
-+        DBUG_RETURN(1);
-+      }
-+    }
-+    else
-+    {
-+      // Aggregate with existing values for this role.
-+      add_user_stats(agg_user,
-+                     user->total_connections, user->concurrent_connections,
-+                     user->connected_time, user->busy_time, user->cpu_time,
-+                     user->bytes_received, user->bytes_sent,
-+                     user->binlog_bytes_written,
-+                     user->rows_fetched, user->rows_updated, user->rows_read,
-+                     user->select_commands, user->update_commands,
-+                     user->other_commands,
-+                     user->commit_trans, user->rollback_trans,
-+                     user->denied_connections, user->lost_connections,
-+                     user->access_denied_errors, user->empty_queries);
-+    }
-+  }
-+  DBUG_PRINT("exit", ("aggregated %d input into %d output entries",
-+                      all_user_stats->records, agg_user_stats->records));
-+  DBUG_RETURN(0);
-+}
-+
-+/*
 +   Write result to network for SHOW USER_STATISTICS
 +
 +   SYNOPSIS
@@ -2540,7 +2464,7 @@
 +int send_user_stats(THD* thd, HASH *all_user_stats, TABLE *table)
 +{
 +  DBUG_ENTER("send_user_stats");
-+  for (int i = 0; i < all_user_stats->records; ++i) {
++  for (uint i = 0; i < all_user_stats->records; ++i) {
 +    restore_record(table, s->default_values);
 +    USER_STATS *user_stats = (USER_STATS*)hash_element(all_user_stats, i);
 +      table->field[0]->store(user_stats->user, strlen(user_stats->user), system_charset_info);
@@ -2576,7 +2500,7 @@
 +int send_thread_stats(THD* thd, HASH *all_thread_stats, TABLE *table)
 +{
 +  DBUG_ENTER("send_thread_stats");
-+  for (int i = 0; i < all_thread_stats->records; ++i) {
++  for (uint i = 0; i < all_thread_stats->records; ++i) {
 +    restore_record(table, s->default_values);
 +    THREAD_STATS *user_stats = (THREAD_STATS*)hash_element(all_thread_stats, i);
 +      table->field[0]->store((longlong)user_stats->id);
@@ -2721,7 +2645,7 @@
 +  char *table_full_name, *table_schema;
 +
 +  pthread_mutex_lock(&LOCK_global_table_stats);
-+  for (int i = 0; i < global_table_stats.records; ++i) {
++  for (uint i = 0; i < global_table_stats.records; ++i) {
 +    restore_record(table, s->default_values);
 +    TABLE_STATS *table_stats = 
 +      (TABLE_STATS*)hash_element(&global_table_stats, i);
@@ -2764,7 +2688,7 @@
 +  char *index_full_name, *table_schema, *table_name;
 +
 +  pthread_mutex_lock(&LOCK_global_index_stats);
-+  for (int i = 0; i < global_index_stats.records; ++i) {
++  for (uint i = 0; i < global_index_stats.records; ++i) {
 +    restore_record(table, s->default_values);
 +    INDEX_STATS *index_stats =
 +      (INDEX_STATS*)hash_element(&global_index_stats, i);
@@ -3421,7 +3345,7 @@
 +  if (!error) {
 +    rows_read++;
 +
-+    int inx = (active_index == -1) ? file->lastinx : active_index;
++    int inx = (active_index == MAX_KEY) ? file->lastinx : active_index;
 +    if (inx >= 0 && inx < MAX_KEY)
 +      index_rows_read[inx]++;
 +  }
@@ -3449,7 +3373,7 @@
 +  if (!error) {
 +    rows_read++;
 +
-+    int inx = (active_index == -1) ? file->lastinx : active_index;
++    int inx = (active_index == MAX_KEY) ? file->lastinx : active_index;
 +    if (inx >= 0 && inx < MAX_KEY)
 +      index_rows_read[inx]++;
 +  }
@@ -3463,7 +3387,7 @@
 +  if (!error) {
 +    rows_read++;
 +
-+    int inx = (active_index == -1) ? file->lastinx : active_index;
++    int inx = (active_index == MAX_KEY) ? file->lastinx : active_index;
 +    if (inx >= 0 && inx < MAX_KEY)
 +      index_rows_read[inx]++;
 +  }
@@ -3477,7 +3401,7 @@
 +  if (!error) {
 +    rows_read++;
 +
-+    int inx = (active_index == -1) ? file->lastinx : active_index;
++    int inx = (active_index == MAX_KEY) ? file->lastinx : active_index;
 +    if (inx >= 0 && inx < MAX_KEY)
 +      index_rows_read[inx]++;
 +  }
@@ -3491,7 +3415,7 @@
 +  if (!error) {
 +    rows_read++;
 +
-+    int inx = (active_index == -1) ? file->lastinx : active_index;
++    int inx = (active_index == MAX_KEY) ? file->lastinx : active_index;
 +    if (inx >= 0 && inx < MAX_KEY)
 +      index_rows_read[inx]++;
 +  }
@@ -3505,7 +3429,7 @@
 +  if (!error) {
 +    rows_read++;
 +
-+    int inx = (active_index == -1) ? file->lastinx : active_index;
++    int inx = (active_index == MAX_KEY) ? file->lastinx : active_index;
 +    if (inx >= 0 && inx < MAX_KEY)
 +      index_rows_read[inx]++;
 +  }
@@ -3519,7 +3443,7 @@
 +  if (!error) {
 +    rows_read++;
 +
-+    int inx = (active_index == -1) ? file->lastinx : active_index;
++    int inx = (active_index == MAX_KEY) ? file->lastinx : active_index;
 +    if (inx >= 0 && inx < MAX_KEY)
 +      index_rows_read[inx]++;
 +  }