[packages/percona-server/v5.0.x: 102/202] - updated by Eero Hänninen <eero.hanninen#delfi.ee>
glen
glen at pld-linux.org
Wed Oct 21 16:17:36 CEST 2015
commit dcc72bc60ba9d8d1535158e551575451afc843fb
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Tue Feb 3 16:46:11 2009 +0000
- updated by Eero Hänninen <eero.hanninen#delfi.ee>
Changed files:
mysql-innodb_io_patches.patch -> 1.1.2.2
mysql-innodb_locks_held.patch -> 1.1.2.2
mysql-microsec_process.patch -> 1.1.2.2
mysql-microslow_innodb.patch -> 1.1.2.4
mysql-userstatv2.patch -> 1.1.2.4
mysql-innodb_io_patches.patch | 333 +++++++++++++----
mysql-innodb_locks_held.patch | 51 +++
mysql-microsec_process.patch | 2 +-
mysql-microslow_innodb.patch | 68 +++-
mysql-userstatv2.patch | 805 +++++++++++++++++++++---------------------
5 files changed, 767 insertions(+), 492 deletions(-)
---
diff --git a/mysql-innodb_io_patches.patch b/mysql-innodb_io_patches.patch
index 90af625..0b3ccef 100644
--- a/mysql-innodb_io_patches.patch
+++ b/mysql-innodb_io_patches.patch
@@ -1,17 +1,38 @@
-diff -r 45683461331d innobase/buf/buf0rea.c
---- a/innobase/buf/buf0rea.c Mon Dec 22 00:31:16 2008 -0800
-+++ b/innobase/buf/buf0rea.c Mon Dec 22 00:32:02 2008 -0800
-@@ -188,6 +188,10 @@
- ulint low, high;
+diff -ruN a/innobase/buf/buf0flu.c b/innobase/buf/buf0flu.c
+--- a/innobase/buf/buf0flu.c 2008-12-19 02:19:35.000000000 +0900
++++ b/innobase/buf/buf0flu.c 2009-01-09 15:51:10.000000000 +0900
+@@ -898,10 +898,17 @@
+
+ old_page_count = page_count;
+
++ if (srv_flush_neighbor_pages) {
+ /* Try to flush also all the neighbors */
+ page_count +=
+ buf_flush_try_neighbors(space, offset,
+ flush_type);
++ } else {
++ /* Try to flush the page only */
++ page_count +=
++ buf_flush_try_page(space, offset,
++ flush_type);
++ }
+ /* fprintf(stderr,
+ "Flush type %lu, page no %lu, neighb %lu\n",
+ flush_type, offset,
+diff -ruN a/innobase/buf/buf0rea.c b/innobase/buf/buf0rea.c
+--- a/innobase/buf/buf0rea.c 2009-01-09 15:40:22.000000000 +0900
++++ b/innobase/buf/buf0rea.c 2009-01-09 15:40:46.000000000 +0900
+@@ -189,6 +189,10 @@
ulint err;
ulint i;
-+
+
+ if (!(srv_read_ahead & 1)) {
+ return(0);
+ }
-
++
if (srv_startup_is_before_trx_rollback_phase) {
/* No read-ahead to avoid thread deadlocks */
+ return(0);
@@ -396,6 +400,10 @@
ulint err;
ulint i;
@@ -23,9 +44,38 @@ diff -r 45683461331d innobase/buf/buf0rea.c
if (srv_startup_is_before_trx_rollback_phase) {
/* No read-ahead to avoid thread deadlocks */
return(0);
-diff -r 45683461331d innobase/include/os0file.h
---- a/innobase/include/os0file.h Mon Dec 22 00:31:16 2008 -0800
-+++ b/innobase/include/os0file.h Mon Dec 22 00:32:02 2008 -0800
+diff -ruN a/innobase/ibuf/ibuf0ibuf.c b/innobase/ibuf/ibuf0ibuf.c
+--- a/innobase/ibuf/ibuf0ibuf.c 2008-12-19 02:19:35.000000000 +0900
++++ b/innobase/ibuf/ibuf0ibuf.c 2009-01-09 15:53:18.000000000 +0900
+@@ -370,8 +370,9 @@
+ grow in size, as the references on the upper levels of the tree can
+ change */
+
+- ibuf->max_size = buf_pool_get_curr_size() / UNIV_PAGE_SIZE
+- / IBUF_POOL_SIZE_PER_MAX_SIZE;
++ ibuf->max_size = ut_min( buf_pool_get_curr_size() / UNIV_PAGE_SIZE
++ / IBUF_POOL_SIZE_PER_MAX_SIZE, (ulint) srv_ibuf_max_size / UNIV_PAGE_SIZE);
++ srv_ibuf_max_size = (long long) ibuf->max_size * UNIV_PAGE_SIZE;
+ ibuf->meter = IBUF_THRESHOLD + 1;
+
+ UT_LIST_INIT(ibuf->data_list);
+@@ -2258,11 +2259,13 @@
+
+ mutex_enter(&ibuf_mutex);
+
++ if (!srv_ibuf_active_contract) {
+ if (ibuf->size < ibuf->max_size + IBUF_CONTRACT_ON_INSERT_NON_SYNC) {
+ mutex_exit(&ibuf_mutex);
+
+ return;
+ }
++ }
+
+ sync = FALSE;
+
+diff -ruN a/innobase/include/os0file.h b/innobase/include/os0file.h
+--- a/innobase/include/os0file.h 2009-01-09 15:40:22.000000000 +0900
++++ b/innobase/include/os0file.h 2009-01-09 15:40:46.000000000 +0900
@@ -551,8 +551,10 @@
/*========*/
ulint n, /* in: maximum number of pending aio operations
@@ -39,9 +89,9 @@ diff -r 45683461331d innobase/include/os0file.h
ulint n_slots_sync); /* in: number of slots in the sync aio array */
/***********************************************************************
Requests an asynchronous i/o operation. */
-diff -r 45683461331d innobase/include/srv0srv.h
---- a/innobase/include/srv0srv.h Mon Dec 22 00:31:16 2008 -0800
-+++ b/innobase/include/srv0srv.h Mon Dec 22 00:32:02 2008 -0800
+diff -ruN a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h
+--- a/innobase/include/srv0srv.h 2009-01-09 15:40:22.000000000 +0900
++++ b/innobase/include/srv0srv.h 2009-01-09 15:54:33.000000000 +0900
@@ -89,6 +89,8 @@
extern ulint srv_lock_table_size;
@@ -51,20 +101,24 @@ diff -r 45683461331d innobase/include/srv0srv.h
#ifdef UNIV_LOG_ARCHIVE
extern ibool srv_log_archive_on;
-@@ -133,6 +135,10 @@
+@@ -133,6 +135,14 @@
extern ulong srv_max_purge_lag;
extern ibool srv_use_awe;
extern ibool srv_use_adaptive_hash_indexes;
+
+extern ulint srv_io_capacity;
-+extern ulint srv_read_ahead;
++extern long long srv_ibuf_max_size;
++extern ulint srv_ibuf_active_contract;
++extern ulint srv_ibuf_accel_rate;
++extern ulint srv_flush_neighbor_pages;
++extern uint srv_read_ahead;
+extern ulint srv_adaptive_checkpoint;
/*-------------------------------------------*/
extern ulint srv_n_rows_inserted;
-diff -r 45683461331d innobase/log/log0log.c
---- a/innobase/log/log0log.c Mon Dec 22 00:31:16 2008 -0800
-+++ b/innobase/log/log0log.c Mon Dec 22 00:32:02 2008 -0800
+diff -ruN a/innobase/log/log0log.c b/innobase/log/log0log.c
+--- a/innobase/log/log0log.c 2008-12-19 02:19:36.000000000 +0900
++++ b/innobase/log/log0log.c 2009-01-09 15:40:46.000000000 +0900
@@ -3326,6 +3326,15 @@
(ulong) ut_dulint_get_high(log_sys->last_checkpoint_lsn),
(ulong) ut_dulint_get_low(log_sys->last_checkpoint_lsn));
@@ -81,9 +135,9 @@ diff -r 45683461331d innobase/log/log0log.c
current_time = time(NULL);
time_elapsed = 0.001 + difftime(current_time,
-diff -r 45683461331d innobase/os/os0file.c
---- a/innobase/os/os0file.c Mon Dec 22 00:31:16 2008 -0800
-+++ b/innobase/os/os0file.c Mon Dec 22 00:32:02 2008 -0800
+diff -ruN a/innobase/os/os0file.c b/innobase/os/os0file.c
+--- a/innobase/os/os0file.c 2009-01-09 15:40:23.000000000 +0900
++++ b/innobase/os/os0file.c 2009-01-09 15:40:46.000000000 +0900
@@ -2877,8 +2877,10 @@
/*========*/
ulint n, /* in: maximum number of pending aio operations
@@ -131,7 +185,7 @@ diff -r 45683461331d innobase/os/os0file.c
loop:
os_mutex_enter(array->mutex);
-@@ -3198,12 +3209,23 @@
+@@ -3198,6 +3209,16 @@
goto loop;
}
@@ -148,16 +202,17 @@ diff -r 45683461331d innobase/os/os0file.c
for (i = 0;; i++) {
slot = os_aio_array_get_nth_slot(array, i);
- if (slot->reserved == FALSE) {
+@@ -3205,6 +3226,7 @@
break;
}
-+ }
}
++ }
array->n_reserved++;
-diff -r 45683461331d innobase/srv/srv0srv.c
---- a/innobase/srv/srv0srv.c Mon Dec 22 00:31:16 2008 -0800
-+++ b/innobase/srv/srv0srv.c Mon Dec 22 00:32:02 2008 -0800
+
+diff -ruN a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c
+--- a/innobase/srv/srv0srv.c 2009-01-09 15:40:23.000000000 +0900
++++ b/innobase/srv/srv0srv.c 2009-01-09 15:58:36.000000000 +0900
@@ -167,6 +167,8 @@
ulint srv_lock_table_size = ULINT_MAX;
@@ -167,7 +222,7 @@ diff -r 45683461331d innobase/srv/srv0srv.c
#ifdef UNIV_LOG_ARCHIVE
ibool srv_log_archive_on = FALSE;
-@@ -324,6 +326,15 @@
+@@ -324,6 +326,22 @@
ibool srv_use_awe = FALSE;
ibool srv_use_adaptive_hash_indexes = TRUE;
@@ -178,12 +233,19 @@ diff -r 45683461331d innobase/srv/srv0srv.c
+where max is srv_io_capacity. */
+#define PCT_IO(pct) ((ulint) (srv_io_capacity * ((double) pct / 100.0)))
+
-+ulint srv_read_ahead = 3; /* 1: random 2: linear 3: Both */
++long long srv_ibuf_max_size = 0;
++ulint srv_ibuf_active_contract = 0; /* 0:disable 1:enable */
++ulint srv_ibuf_accel_rate = 100;
++#define PCT_IBUF_IO(pct) ((ulint) (srv_io_capacity * srv_ibuf_accel_rate * ((double) pct / 10000.0)))
++
++ulint srv_flush_neighbor_pages = 1; /* 0:disable 1:enable */
++
++uint srv_read_ahead = 3; /* 1: random 2: linear 3: Both */
+ulint srv_adaptive_checkpoint = 0; /* 0:disable 1:enable */
/*-------------------------------------------*/
ulong srv_n_spin_wait_rounds = 20;
ulong srv_n_free_tickets_to_enter = 500;
-@@ -2214,6 +2225,8 @@
+@@ -2214,6 +2232,8 @@
ibool skip_sleep = FALSE;
ulint i;
@@ -192,7 +254,7 @@ diff -r 45683461331d innobase/srv/srv0srv.c
#ifdef UNIV_DEBUG_THREAD_CREATION
fprintf(stderr, "Master thread starts, id %lu\n",
os_thread_pf(os_thread_get_curr_id()));
-@@ -2302,9 +2315,9 @@
+@@ -2302,9 +2322,9 @@
+ log_sys->n_pending_writes;
n_ios = log_sys->n_log_ios + buf_pool->n_pages_read
+ buf_pool->n_pages_written;
@@ -200,11 +262,11 @@ diff -r 45683461331d innobase/srv/srv0srv.c
+ if (n_pend_ios < 3 && (n_ios - n_ios_old < PCT_IO(5))) {
srv_main_thread_op_info = "doing insert buffer merge";
- ibuf_contract_for_n_pages(TRUE, 5);
-+ ibuf_contract_for_n_pages(TRUE, PCT_IO(5));
++ ibuf_contract_for_n_pages(TRUE, PCT_IBUF_IO(5));
srv_main_thread_op_info = "flushing log";
-@@ -2317,7 +2330,7 @@
+@@ -2317,7 +2337,7 @@
/* Try to keep the number of modified pages in the
buffer pool under the limit wished by the user */
@@ -213,7 +275,7 @@ diff -r 45683461331d innobase/srv/srv0srv.c
ut_dulint_max);
/* If we had to do the flush, it may have taken
-@@ -2326,6 +2339,44 @@
+@@ -2326,6 +2346,49 @@
iteration of this loop. */
skip_sleep = TRUE;
@@ -231,6 +293,11 @@ diff -r 45683461331d innobase/srv/srv0srv.c
+
+ } else {
+ if (ut_dulint_minus(log_sys->lsn, oldest_lsn)
++ > (log_sys->max_checkpoint_age) - ((log_sys->max_checkpoint_age) / 8)) {
++ /* LOG_POOL_PREFLUSH_RATIO_ASYNC is exceeded. */
++ /* We should not flush from here. */
++ mutex_exit(&(log_sys->mutex));
++ } else if (ut_dulint_minus(log_sys->lsn, oldest_lsn)
+ > (log_sys->max_checkpoint_age) - ((log_sys->max_checkpoint_age) / 4)) {
+
+ /* 2nd defence line (max_checkpoint_age * 3/4) */
@@ -258,7 +325,7 @@ diff -r 45683461331d innobase/srv/srv0srv.c
}
if (srv_activity_count == old_activity_count) {
-@@ -2352,10 +2403,10 @@
+@@ -2352,10 +2415,10 @@
n_pend_ios = buf_get_n_pending_ios() + log_sys->n_pending_writes;
n_ios = log_sys->n_log_ios + buf_pool->n_pages_read
+ buf_pool->n_pages_written;
@@ -271,16 +338,16 @@ diff -r 45683461331d innobase/srv/srv0srv.c
srv_main_thread_op_info = "flushing log";
log_buffer_flush_to_disk();
-@@ -2365,7 +2416,7 @@
+@@ -2365,7 +2428,7 @@
even if the server were active */
srv_main_thread_op_info = "doing insert buffer merge";
- ibuf_contract_for_n_pages(TRUE, 5);
-+ ibuf_contract_for_n_pages(TRUE, PCT_IO(5));
++ ibuf_contract_for_n_pages(TRUE, PCT_IBUF_IO(5));
srv_main_thread_op_info = "flushing log";
log_buffer_flush_to_disk();
-@@ -2407,14 +2458,14 @@
+@@ -2407,14 +2470,14 @@
(> 70 %), we assume we can afford reserving the disk(s) for
the time it requires to flush 100 pages */
@@ -297,16 +364,16 @@ diff -r 45683461331d innobase/srv/srv0srv.c
ut_dulint_max);
}
-@@ -2503,7 +2554,7 @@
+@@ -2503,7 +2566,7 @@
if (srv_fast_shutdown && srv_shutdown_state > 0) {
n_bytes_merged = 0;
} else {
- n_bytes_merged = ibuf_contract_for_n_pages(TRUE, 20);
-+ n_bytes_merged = ibuf_contract_for_n_pages(TRUE, PCT_IO(100));
++ n_bytes_merged = ibuf_contract_for_n_pages(TRUE, PCT_IBUF_IO(100));
}
srv_main_thread_op_info = "reserving kernel mutex";
-@@ -2520,7 +2571,7 @@
+@@ -2520,7 +2583,7 @@
if (srv_fast_shutdown < 2) {
n_pages_flushed =
@@ -315,9 +382,9 @@ diff -r 45683461331d innobase/srv/srv0srv.c
} else {
/* In the fastest shutdown we do not flush the buffer pool
to data files: we set n_pages_flushed to 0 artificially. */
-diff -r 45683461331d innobase/srv/srv0start.c
---- a/innobase/srv/srv0start.c Mon Dec 22 00:31:16 2008 -0800
-+++ b/innobase/srv/srv0start.c Mon Dec 22 00:32:02 2008 -0800
+diff -ruN a/innobase/srv/srv0start.c b/innobase/srv/srv0start.c
+--- a/innobase/srv/srv0start.c 2008-12-19 02:19:37.000000000 +0900
++++ b/innobase/srv/srv0start.c 2009-01-09 15:40:46.000000000 +0900
@@ -1205,24 +1205,28 @@
return(DB_ERROR);
}
@@ -351,22 +418,24 @@ diff -r 45683461331d innobase/srv/srv0start.c
SRV_MAX_N_PENDING_SYNC_IOS);
}
-diff -r 45683461331d patch_info/innodb_io_patches.info
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/patch_info/innodb_io_patches.info Mon Dec 22 00:32:02 2008 -0800
-@@ -0,0 +1,9 @@
+diff -ruN a/patch_info/innodb_io_patches.info b/patch_info/innodb_io_patches.info
+--- /dev/null 1970-01-01 09:00:00.000000000 +0900
++++ b/patch_info/innodb_io_patches.info 2009-01-09 15:59:05.000000000 +0900
+@@ -0,0 +1,11 @@
+File=innodb_io_patches.patch
+Name=Cluster of past InnoDB IO patches
-+Version=1.0
++Version=1.1
+Author=Percona
+License=GPL
+Comment=This patch contains fixed (control_flush_and_merge_and_read, control_io-threads, adaptive_flush)
+ChangeLog=
+2008-11-06
+YK: Initial release
-diff -r 45683461331d sql/ha_innodb.cc
---- a/sql/ha_innodb.cc Mon Dec 22 00:31:16 2008 -0800
-+++ b/sql/ha_innodb.cc Mon Dec 22 00:32:02 2008 -0800
++2009-01-09
++YK: Some parameters are added
+diff -ruN a/sql/ha_innodb.cc b/sql/ha_innodb.cc
+--- a/sql/ha_innodb.cc 2009-01-09 15:40:23.000000000 +0900
++++ b/sql/ha_innodb.cc 2009-01-09 15:40:46.000000000 +0900
@@ -149,6 +149,7 @@
innobase_lock_wait_timeout, innobase_force_recovery,
innobase_open_files;
@@ -384,9 +453,9 @@ diff -r 45683461331d sql/ha_innodb.cc
srv_lock_wait_timeout = (ulint) innobase_lock_wait_timeout;
srv_force_recovery = (ulint) innobase_force_recovery;
-diff -r 45683461331d sql/ha_innodb.h
---- a/sql/ha_innodb.h Mon Dec 22 00:31:16 2008 -0800
-+++ b/sql/ha_innodb.h Mon Dec 22 00:32:02 2008 -0800
+diff -ruN a/sql/ha_innodb.h b/sql/ha_innodb.h
+--- a/sql/ha_innodb.h 2009-01-09 15:40:23.000000000 +0900
++++ b/sql/ha_innodb.h 2009-01-09 15:59:41.000000000 +0900
@@ -204,6 +204,7 @@
extern long innobase_additional_mem_pool_size;
extern long innobase_buffer_pool_awe_mem_mb;
@@ -395,24 +464,32 @@ diff -r 45683461331d sql/ha_innodb.h
extern long innobase_force_recovery;
extern long innobase_open_files;
extern char *innobase_data_home_dir, *innobase_data_file_path;
-@@ -234,6 +235,9 @@
+@@ -234,6 +235,13 @@
extern ulong srv_thread_concurrency;
extern ulong srv_commit_concurrency;
extern ulong srv_flush_log_at_trx_commit;
+extern ulong srv_io_capacity;
-+extern ulong srv_read_ahead;
++extern long long srv_ibuf_max_size;
++extern ulong srv_ibuf_active_contract;
++extern ulong srv_ibuf_accel_rate;
++extern ulong srv_flush_neighbor_pages;
++extern uint srv_read_ahead;
+extern ulong srv_adaptive_checkpoint;
}
bool innobase_init(void);
-diff -r 45683461331d sql/mysqld.cc
---- a/sql/mysqld.cc Mon Dec 22 00:31:16 2008 -0800
-+++ b/sql/mysqld.cc Mon Dec 22 00:32:02 2008 -0800
-@@ -5036,6 +5036,11 @@
+diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
+--- a/sql/mysqld.cc 2009-01-09 15:40:23.000000000 +0900
++++ b/sql/mysqld.cc 2009-01-09 16:01:25.000000000 +0900
+@@ -5036,6 +5036,15 @@
OPT_INNODB_ROLLBACK_ON_TIMEOUT,
OPT_SECURE_FILE_PRIV,
OPT_KEEP_FILES_ON_CREATE,
+ OPT_INNODB_IO_CAPACITY,
++ OPT_INNODB_IBUF_MAX_SIZE,
++ OPT_INNODB_IBUF_ACTIVE_CONTRACT,
++ OPT_INNODB_IBUF_ACCEL_RATE,
++ OPT_INNODB_FLUSH_NEIGHBOR_PAGES,
+ OPT_INNODB_READ_AHEAD,
+ OPT_INNODB_ADAPTIVE_CHECKPOINT,
+ OPT_INNODB_READ_IO_THREADS,
@@ -420,7 +497,7 @@ diff -r 45683461331d sql/mysqld.cc
OPT_INNODB_ADAPTIVE_HASH_INDEX,
OPT_FEDERATED
};
-@@ -5344,6 +5349,26 @@
+@@ -5344,6 +5353,41 @@
(gptr*) &global_system_variables.innodb_table_locks,
(gptr*) &global_system_variables.innodb_table_locks,
0, GET_BOOL, OPT_ARG, 1, 0, 0, 0, 0, 0},
@@ -428,12 +505,27 @@ diff -r 45683461331d sql/mysqld.cc
+ "Number of IO operations per second the server can do. Tunes background IO rate.",
+ (gptr*) &srv_io_capacity, (gptr*) &srv_io_capacity,
+ 0, GET_ULONG, REQUIRED_ARG, 100, 100, 999999999, 0, 0, 0},
++ {"innodb_ibuf_max_size", OPT_INNODB_IBUF_MAX_SIZE,
++ "The maximum size of the insert buffer. (in bytes)",
++ (gptr*) &srv_ibuf_max_size, (gptr*) &srv_ibuf_max_size, 0,
++ GET_LL, REQUIRED_ARG, LONGLONG_MAX, 0, LONGLONG_MAX, 0, 0, 0},
++ {"innodb_ibuf_active_contract", OPT_INNODB_IBUF_ACTIVE_CONTRACT,
++ "Enable/Disable active_contract of insert buffer. 0:disable 1:enable",
++ (gptr*) &srv_ibuf_active_contract, (gptr*) &srv_ibuf_active_contract,
++ 0, GET_ULONG, REQUIRED_ARG, 0, 0, 1, 0, 0, 0},
++ {"innodb_ibuf_accel_rate", OPT_INNODB_IBUF_ACCEL_RATE,
++ "Tunes amount of insert buffer processing of background, in addition to innodb_io_capacity. (in percentage)",
++ (gptr*) &srv_ibuf_accel_rate, (gptr*) &srv_ibuf_accel_rate,
++ 0, GET_ULONG, REQUIRED_ARG, 100, 100, 999999999, 0, 0, 0},
++ {"innodb_flush_neighbor_pages", OPT_INNODB_FLUSH_NEIGHBOR_PAGES,
++ "Enable/Disable flushing also neighbor pages. 0:disable 1:enable",
++ (gptr*) &srv_flush_neighbor_pages, (gptr*) &srv_flush_neighbor_pages,
++ 0, GET_ULONG, REQUIRED_ARG, 1, 0, 1, 0, 0, 0},
+ {"innodb_read_ahead", OPT_INNODB_READ_AHEAD,
-+ "Enable/Diasable read aheads bit0:random bit1:linear",
-+ (gptr*) &srv_read_ahead, (gptr*) &srv_read_ahead,
-+ 0, GET_ULONG, REQUIRED_ARG, 3, 0, 3, 0, 0, 0},
++ "Control read ahead activity. (none, random, linear, [both])",
++ 0, 0, 0, GET_ULONG, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+ {"innodb_adaptive_checkpoint", OPT_INNODB_ADAPTIVE_CHECKPOINT,
-+ "Enable/Diasable flushing along modified age 0:disable 1:enable",
++ "Enable/Diasable flushing along modified age. 0:disable 1:enable",
+ (gptr*) &srv_adaptive_checkpoint, (gptr*) &srv_adaptive_checkpoint,
+ 0, GET_ULONG, REQUIRED_ARG, 0, 0, 1, 0, 0, 0},
+ {"innodb_read_io_threads", OPT_INNODB_READ_IO_THREADS,
@@ -447,37 +539,92 @@ diff -r 45683461331d sql/mysqld.cc
#endif /* End HAVE_INNOBASE_DB */
{"isam", OPT_ISAM, "Obsolete. ISAM storage engine is no longer supported.",
(gptr*) &opt_isam, (gptr*) &opt_isam, 0, GET_BOOL, NO_ARG, 0, 0, 0,
-diff -r 45683461331d sql/set_var.cc
---- a/sql/set_var.cc Mon Dec 22 00:31:16 2008 -0800
-+++ b/sql/set_var.cc Mon Dec 22 00:32:02 2008 -0800
-@@ -484,6 +484,12 @@
+@@ -7637,6 +7636,22 @@
+ case OPT_INNODB_LOG_ARCHIVE:
+ innobase_log_archive= argument ? test(atoi(argument)) : 1;
+ break;
++ case OPT_INNODB_READ_AHEAD:
++ if (argument == disabled_my_option)
++ srv_read_ahead = 0;
++ else if (! argument)
++ srv_read_ahead = 3;
++ else
++ {
++ int type;
++ if ((type=find_type(argument, &innodb_read_ahead_typelib, 2)) <= 0)
++ {
++ fprintf(stderr,"Unknown innodb_read_ahead type: %s\n",argument);
++ exit(1);
++ }
++ srv_read_ahead = (uint) ((type - 1) & 3);
++ }
++ break;
+ #endif /* HAVE_INNOBASE_DB */
+ case OPT_MYISAM_RECOVER:
+ {
+diff -ruN a/sql/set_var.cc b/sql/set_var.cc
+--- a/sql/set_var.cc 2009-01-09 15:40:23.000000000 +0900
++++ b/sql/set_var.cc 2009-01-09 16:05:22.000000000 +0900
+@@ -484,6 +484,37 @@
sys_var_long_ptr sys_innodb_flush_log_at_trx_commit(
"innodb_flush_log_at_trx_commit",
&srv_flush_log_at_trx_commit);
+sys_var_long_ptr sys_innodb_io_capacity("innodb_io_capacity",
+ &srv_io_capacity);
-+sys_var_long_ptr sys_innodb_read_ahead("innodb_read_ahead",
-+ &srv_read_ahead);
++sys_var_long_ptr sys_innodb_ibuf_active_contract("innodb_ibuf_active_contract",
++ &srv_ibuf_active_contract);
++sys_var_long_ptr sys_innodb_ibuf_accel_rate("innodb_ibuf_accel_rate",
++ &srv_ibuf_accel_rate);
++sys_var_long_ptr sys_innodb_flush_neighbor_pages("innodb_flush_neighbor_pages",
++ &srv_flush_neighbor_pages);
++
++const char *innodb_read_ahead_names[]=
++{
++ "none", /* 0 */
++ "random",
++ "linear",
++ "both", /* 3 */
++ /* For compatibility of the older patch */
++ "0", /* 4 ("none" + 4) */
++ "1",
++ "2",
++ "3", /* 7 ("both" + 4) */
++ NullS
++};
++TYPELIB innodb_read_ahead_typelib=
++{
++ array_elements(innodb_read_ahead_names) - 1, "innodb_read_ahead_typelib",
++ innodb_read_ahead_names, NULL
++};
++sys_var_enum sys_innodb_read_ahead("innodb_read_ahead", &srv_read_ahead,
++ &innodb_read_ahead_typelib, fix_innodb_read_ahead);
+sys_var_long_ptr sys_innodb_adaptive_checkpoint("innodb_adaptive_checkpoint",
+ &srv_adaptive_checkpoint);
sys_var_const_os_str_ptr sys_innodb_data_file_path("innodb_data_file_path",
&innobase_data_file_path);
sys_var_const_os_str_ptr sys_innodb_data_home_dir("innodb_data_home_dir",
-@@ -847,6 +853,9 @@
+@@ -847,6 +859,12 @@
&sys_innodb_thread_concurrency,
&sys_innodb_commit_concurrency,
&sys_innodb_flush_log_at_trx_commit,
+ &sys_innodb_io_capacity,
++ &sys_innodb_ibuf_active_contract,
++ &sys_innodb_ibuf_accel_rate,
++ &sys_innodb_flush_neighbor_pages,
+ &sys_innodb_read_ahead,
+ &sys_innodb_adaptive_checkpoint,
#endif
&sys_trust_routine_creators,
&sys_trust_function_creators,
-@@ -982,6 +991,11 @@
+@@ -982,6 +1000,15 @@
{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_io_capacity.name, (char*) &sys_innodb_io_capacity, SHOW_SYS},
++ {"innodb_ibuf_max_size", (char*) &srv_ibuf_max_size, SHOW_LONGLONG},
++ {sys_innodb_ibuf_active_contract.name, (char*) &sys_innodb_ibuf_active_contract, SHOW_SYS},
++ {sys_innodb_ibuf_accel_rate.name, (char*) &sys_innodb_ibuf_accel_rate, SHOW_SYS},
++ {sys_innodb_flush_neighbor_pages.name, (char*) &sys_innodb_flush_neighbor_pages, SHOW_SYS},
+ {sys_innodb_read_ahead.name, (char*) &sys_innodb_read_ahead, SHOW_SYS},
+ {sys_innodb_adaptive_checkpoint.name, (char*) &sys_innodb_adaptive_checkpoint, SHOW_SYS},
+ {"innodb_read_io_threads", (char*) &innobase_read_io_threads, SHOW_LONG},
@@ -485,3 +632,41 @@ diff -r 45683461331d sql/set_var.cc
#endif
{sys_interactive_timeout.name,(char*) &sys_interactive_timeout, SHOW_SYS},
{sys_join_buffer_size.name, (char*) &sys_join_buffer_size, SHOW_SYS},
+@@ -1482,6 +1501,13 @@
+ }
+ }
+
++#ifdef HAVE_INNOBASE_DB
++extern void fix_innodb_read_ahead(THD *thd, enum_var_type type)
++{
++ srv_read_ahead &= 3;
++}
++#endif /* HAVE_INNOBASE_DB */
++
+ static void fix_max_binlog_size(THD *thd, enum_var_type type)
+ {
+ DBUG_ENTER("fix_max_binlog_size");
+diff -ruN a/sql/set_var.h b/sql/set_var.h
+--- a/sql/set_var.h 2009-01-12 11:20:31.000000000 +0900
++++ b/sql/set_var.h 2009-01-12 15:26:35.000000000 +0900
+@@ -31,6 +31,10 @@
+
+ extern TYPELIB bool_typelib, delay_key_write_typelib, sql_mode_typelib;
+
++#ifdef HAVE_INNOBASE_DB
++extern TYPELIB innodb_read_ahead_typelib;
++#endif /* HAVE_INNOBASE_DB */
++
+ typedef int (*sys_check_func)(THD *, set_var *);
+ typedef bool (*sys_update_func)(THD *, set_var *);
+ typedef void (*sys_after_update_func)(THD *,enum_var_type);
+@@ -1114,6 +1118,9 @@
+ int sql_set_variables(THD *thd, List<set_var_base> *var_list);
+ bool not_all_support_one_shot(List<set_var_base> *var_list);
+ void fix_delay_key_write(THD *thd, enum_var_type type);
++#ifdef HAVE_INNOBASE_DB
++void fix_innodb_read_ahead(THD *thd, enum_var_type type);
++#endif /* HAVE_INNOBASE_DB */
+ ulong fix_sql_mode(ulong sql_mode);
+ extern sys_var_const_str sys_charset_system;
+ extern sys_var_str sys_init_connect;
diff --git a/mysql-innodb_locks_held.patch b/mysql-innodb_locks_held.patch
index 416d50e..18c99f4 100644
--- a/mysql-innodb_locks_held.patch
+++ b/mysql-innodb_locks_held.patch
@@ -62,6 +62,57 @@ diff -r ae6708ab17e5 innobase/srv/srv0srv.c
byte srv_latin1_ordering[256] /* The sort order table of the latin1
character set. The following table is
+@@ -1694,24 +1696,6 @@
+
+ mutex_exit(&dict_foreign_err_mutex);
+
+- lock_print_info_summary(file);
+- if (trx_start) {
+- long t = ftell(file);
+- if (t < 0) {
+- *trx_start = ULINT_UNDEFINED;
+- } else {
+- *trx_start = (ulint) t;
+- }
+- }
+- lock_print_info_all_transactions(file);
+- if (trx_end) {
+- long t = ftell(file);
+- if (t < 0) {
+- *trx_end = ULINT_UNDEFINED;
+- } else {
+- *trx_end = (ulint) t;
+- }
+- }
+ fputs("--------\n"
+ "FILE I/O\n"
+ "--------\n", file);
+@@ -1805,6 +1789,25 @@
+ srv_n_rows_deleted_old = srv_n_rows_deleted;
+ srv_n_rows_read_old = srv_n_rows_read;
+
++ lock_print_info_summary(file);
++ if (trx_start) {
++ long t = ftell(file);
++ if (t < 0) {
++ *trx_start = ULINT_UNDEFINED;
++ } else {
++ *trx_start = (ulint) t;
++ }
++ }
++ lock_print_info_all_transactions(file);
++ if (trx_end) {
++ long t = ftell(file);
++ if (t < 0) {
++ *trx_end = ULINT_UNDEFINED;
++ } else {
++ *trx_end = (ulint) t;
++ }
++ }
++
+ fputs("----------------------------\n"
+ "END OF INNODB MONITOR OUTPUT\n"
+ "============================\n", file);
diff -r ae6708ab17e5 libmysqld/set_var.cc
--- a/libmysqld/set_var.cc Mon Dec 22 00:32:07 2008 -0800
+++ b/libmysqld/set_var.cc Mon Dec 22 00:32:58 2008 -0800
diff --git a/mysql-microsec_process.patch b/mysql-microsec_process.patch
index 440f509..0e094e5 100644
--- a/mysql-microsec_process.patch
+++ b/mysql-microsec_process.patch
@@ -173,7 +173,7 @@ diff -r 327ce7a34c91 sql/sql_show.cc
+ table->field[4]->store(command_name[tmp->command],
+ strlen(command_name[tmp->command]), cs);
+ /* MYSQL_TIME */
-+ const ulonglong utime= tmp->start_timer ? current_timer - tmp->start_timer : 0;
++ const ulonglong utime= (tmp->start_timer && current_timer) ? current_timer - tmp->start_timer : 0;
+ table->field[5]->store(utime / 1000000, TRUE);
+ /* STATE */
+#ifndef EMBEDDED_LIBRARY
diff --git a/mysql-microslow_innodb.patch b/mysql-microslow_innodb.patch
index 1613b48..763981f 100644
--- a/mysql-microslow_innodb.patch
+++ b/mysql-microslow_innodb.patch
@@ -878,7 +878,7 @@ diff -r 25523be1816e patch_info/microslow_innodb.info
@@ -0,0 +1,15 @@
+File=microslow_innodb.patch
+Name=Extended statistics in slow.log
-+Version=1.1
++Version=1.2
+Author=Percona <info at percona.com>
+License=GPL
+Comment=
@@ -939,8 +939,8 @@ diff -r 25523be1816e sql-common/my_time.c
+ newtime= (GetTickCount() * 1000; /* GetTickCount only returns milliseconds */
+#else
+ struct timeval t;
-+ gettimeofday(&t, NULL);
-+ newtime= (ulonglong)t.tv_sec * 1000000 + t.tv_usec;
++ if (gettimeofday(&t, NULL) != -1)
++ newtime= (ulonglong)t.tv_sec * 1000000 + t.tv_usec;
+#endif
+ if (ltime)
+ *ltime= newtime;
@@ -1151,7 +1151,7 @@ diff -r 25523be1816e sql/log.cc
{
VOID(pthread_mutex_unlock(&LOCK_log));
DBUG_RETURN(0);
-@@ -2273,22 +2275,71 @@
+@@ -2273,22 +2275,72 @@
if (my_b_printf(&log_file, "# User at Host: %s[%s] @ %s [%s]\n",
sctx->priv_user ?
sctx->priv_user : "",
@@ -1167,11 +1167,12 @@ diff -r 25523be1816e sql/log.cc
{
+ char buf[5][20];
+ ulonglong current_timer= my_timer(¤t_timer, frequency);
-+ sprintf(buf[0], "%.6f", (current_timer - query_start_timer) / 1000000.0);
-+ sprintf(buf[1], "%.6f", (thd->timer_after_lock - query_start_timer) / 1000000.0);
++ snprintf(buf[0], 20, "%.6f", (current_timer ? (current_timer - query_start_timer):0) / 1000000.0);
++ snprintf(buf[1], 20, "%.6f", (thd->timer_after_lock - query_start_timer) / 1000000.0);
+ if (!query_length)
+ {
+ thd->sent_row_count= thd->examined_row_count= 0;
++ thd->row_count= 0;
+ thd->innodb_was_used= FALSE;
+ thd->query_plan_flags= QPLAN_NONE;
+ thd->query_plan_fsort_passes= 0;
@@ -1207,9 +1208,9 @@ diff -r 25523be1816e sql/log.cc
+ tmp_errno=errno;
+ if ((thd->variables.log_slow_verbosity & SLOG_V_INNODB) && thd->innodb_was_used)
+ {
-+ sprintf(buf[2], "%.6f", thd->innodb_io_reads_wait_timer / 1000000.0);
-+ sprintf(buf[3], "%.6f", thd->innodb_lock_que_wait_timer / 1000000.0);
-+ sprintf(buf[4], "%.6f", thd->innodb_innodb_que_wait_timer / 1000000.0);
++ snprintf(buf[2], 20, "%.6f", thd->innodb_io_reads_wait_timer / 1000000.0);
++ snprintf(buf[3], 20, "%.6f", thd->innodb_lock_que_wait_timer / 1000000.0);
++ snprintf(buf[4], 20, "%.6f", thd->innodb_innodb_que_wait_timer / 1000000.0);
+ if (my_b_printf(&log_file,
+ "# InnoDB_IO_r_ops: %lu InnoDB_IO_r_bytes: %lu InnoDB_IO_r_wait: %s\n" \
+ "# InnoDB_rec_lock_wait: %s InnoDB_queue_wait: %s\n" \
@@ -1330,12 +1331,13 @@ diff -r 25523be1816e sql/mysql_priv.h
extern bool opt_disable_networking, opt_skip_show_db;
extern my_bool opt_character_set_client_handshake;
extern bool volatile abort_loop, shutdown_in_progress, grant_option;
-@@ -1356,7 +1429,7 @@
+@@ -1356,7 +1429,8 @@
extern my_bool opt_enable_named_pipe, opt_sync_frm, opt_allow_suspicious_udfs;
extern my_bool opt_secure_auth;
extern char* opt_secure_file_priv;
-extern my_bool opt_log_slow_admin_statements;
+extern my_bool opt_log_slow_admin_statements, opt_log_slow_slave_statements;
++extern my_bool opt_use_global_long_query_time;
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;
@@ -1350,11 +1352,12 @@ diff -r 25523be1816e sql/mysqld.cc
#ifdef _AIX41
int initgroups(const char *,unsigned int);
-@@ -409,10 +408,12 @@
+@@ -409,10 +408,13 @@
my_bool opt_secure_auth= 0;
char* opt_secure_file_priv= 0;
my_bool opt_log_slow_admin_statements= 0;
+my_bool opt_log_slow_slave_statements= 0;
++my_bool opt_use_global_long_query_time= 0;
my_bool lower_case_file_system= 0;
my_bool opt_large_pages= 0;
uint opt_large_page_size= 0;
@@ -1398,7 +1401,7 @@ diff -r 25523be1816e sql/mysqld.cc
OPT_LOWER_CASE_TABLE_NAMES, OPT_MAX_ALLOWED_PACKET,
OPT_MAX_BINLOG_CACHE_SIZE, OPT_MAX_BINLOG_SIZE,
OPT_MAX_CONNECTIONS, OPT_MAX_CONNECT_ERRORS,
-@@ -4992,11 +4996,17 @@
+@@ -4992,11 +4996,18 @@
OPT_TIMED_MUTEXES,
OPT_OLD_STYLE_USER_LIMITS,
OPT_LOG_SLOW_ADMIN_STATEMENTS,
@@ -1413,6 +1416,7 @@ diff -r 25523be1816e sql/mysqld.cc
OPT_PROFILING,
+ OPT_SLOW_LOG,
+ OPT_SLOW_QUERY_LOG_FILE,
++ OPT_USE_GLOBAL_LONG_QUERY_TIME,
OPT_INNODB_ROLLBACK_ON_TIMEOUT,
OPT_SECURE_FILE_PRIV,
OPT_KEEP_FILES_ON_CREATE,
@@ -1444,7 +1448,7 @@ diff -r 25523be1816e sql/mysqld.cc
{"socket", OPT_SOCKET, "Socket file to use for connection.",
(gptr*) &mysqld_unix_port, (gptr*) &mysqld_unix_port, 0, GET_STR,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-@@ -6055,11 +6077,27 @@
+@@ -6055,11 +6077,31 @@
(gptr*) 0,
0, (GET_ULONG | GET_ASK_ADDR) , REQUIRED_ARG, 100,
1, 100, 0, 1, 0},
@@ -1474,6 +1478,10 @@ diff -r 25523be1816e sql/mysqld.cc
+ (gptr*) &global_system_variables.min_examined_row_limit,
+ (gptr*) &max_system_variables.min_examined_row_limit, 0, GET_ULONG,
+ REQUIRED_ARG, 0, 0, LONG_MAX, 0, 1L, 0},
++ {"use_global_long_query_time", OPT_USE_GLOBAL_LONG_QUERY_TIME,
++ "Control always use global long_query_time or local long_query_time.",
++ (gptr*) &opt_use_global_long_query_time, (gptr*) &opt_use_global_long_query_time,
++ 0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 1, 0},
{"lower_case_table_names", OPT_LOWER_CASE_TABLE_NAMES,
"If set to 1 table names are stored in lowercase on disk and table names will be case-insensitive. Should be set to 2 if you are using a case insensitive file system",
(gptr*) &lower_case_table_names,
@@ -1547,13 +1555,15 @@ diff -r 25523be1816e sql/mysqld.cc
diff -r 25523be1816e sql/set_var.cc
--- a/sql/set_var.cc Mon Dec 22 00:25:06 2008 -0800
+++ b/sql/set_var.cc Mon Dec 22 00:26:39 2008 -0800
-@@ -217,9 +217,11 @@
+@@ -217,9 +217,13 @@
sys_log_queries_not_using_indexes("log_queries_not_using_indexes",
&opt_log_queries_not_using_indexes);
sys_var_thd_ulong sys_log_warnings("log_warnings", &SV::log_warnings);
-sys_var_thd_ulong sys_long_query_time("long_query_time",
+sys_var_thd_microtime sys_long_query_time("long_query_time",
&SV::long_query_time);
++sys_var_bool_ptr sys_use_global_long_query_time("use_global_long_query_time",
++ &opt_use_global_long_query_time);
sys_var_bool_const_ptr sys_log_slow("log_slow_queries", &opt_slow_log);
+sys_var_log_slow sys_slow_query_log("slow_query_log", &opt_slow_log);
+sys_var_const_str_ptr sys_slow_query_log_file("slow_query_log_file", &opt_slow_logname);
@@ -1590,13 +1600,14 @@ diff -r 25523be1816e sql/set_var.cc
sys_var_long_ptr sys_rpl_recovery_rank("rpl_recovery_rank",
&rpl_recovery_rank);
sys_var_long_ptr sys_query_cache_size("query_cache_size",
-@@ -694,6 +712,9 @@
+@@ -694,6 +712,10 @@
&sys_log_off,
&sys_log_queries_not_using_indexes,
&sys_log_slow,
+ &sys_log_slow_filter,
+ &sys_log_slow_rate_limit,
+ &sys_log_slow_verbosity,
++ &sys_use_global_long_query_time,
&sys_log_update,
&sys_log_warnings,
&sys_long_query_time,
@@ -1647,6 +1658,14 @@ diff -r 25523be1816e sql/set_var.cc
#ifdef HAVE_SYS_UN_H
{"socket", (char*) &mysqld_unix_port, SHOW_CHAR_PTR},
#endif
+@@ -1141,6 +1171,7 @@
+ {sys_tx_isolation.name, (char*) &sys_tx_isolation, SHOW_SYS},
+ {sys_updatable_views_with_limit.name,
+ (char*) &sys_updatable_views_with_limit,SHOW_SYS},
++ {sys_use_global_long_query_time.name, (char*) &sys_use_global_long_query_time, SHOW_SYS},
+ {sys_version.name, (char*) &sys_version, SHOW_SYS},
+ #ifdef HAVE_BERKELEY_DB
+ {sys_version_bdb.name, (char*) &sys_version_bdb, SHOW_SYS},
@@ -1769,6 +1799,17 @@
}
@@ -2144,9 +2163,9 @@ diff -r 25523be1816e sql/sql_class.cc
}
-diff -r ea2366a3ea79 sql/sql_class.h
---- a/sql/sql_class.h Thu Dec 04 00:30:51 2008 -0800
-+++ b/sql/sql_class.h Thu Dec 04 00:32:56 2008 -0800
+diff -r 25523be1816e sql/sql_class.h
+--- a/sql/sql_class.h Mon Dec 22 00:25:06 2008 -0800
++++ b/sql/sql_class.h Mon Dec 22 00:26:39 2008 -0800
@@ -43,6 +43,7 @@
extern char internal_table_name[2];
extern char empty_c_string[1];
@@ -2288,7 +2307,7 @@ diff -r 25523be1816e sql/sql_parse.cc
while (!net->error && net->vio != 0 &&
!(thd->killed == THD::KILL_CONNECTION))
{
-@@ -2353,27 +2363,53 @@
+@@ -2353,27 +2363,55 @@
return; // Don't set time for sub stmt
start_of_query= thd->start_time;
@@ -2309,6 +2328,8 @@ diff -r 25523be1816e sql/sql_parse.cc
+ limit, if one of them takes long enough (>= 1 second) it will be sensible
+ to make an exception and write to slow log anyway.
+ */
++ if (opt_use_global_long_query_time)
++ thd->variables.long_query_time = global_system_variables.long_query_time;
+ if (thd->write_to_slow_log != TRUE && thd->variables.long_query_time < 1000000 &&
+ (ulong) (thd->start_timer - thd->timer_after_lock) >= 1000000)
+ thd->write_to_slow_log= TRUE;
@@ -2351,6 +2372,15 @@ diff -r 25523be1816e sql/sql_parse.cc
}
}
}
+@@ -2664,6 +2702,8 @@
+ context.resolve_in_table_list_only((TABLE_LIST*)select_lex->
+ table_list.first);
+
++ /* Reset the counter at all cases for the extended slow query log */
++ thd->row_count= 1;
+ /*
+ Reset warning count for each query that uses tables
+ A better approach would be to reset this for any commands
@@ -6084,6 +6120,15 @@
thd->total_warn_count=0; // Warnings for this query
thd->rand_used= 0;
diff --git a/mysql-userstatv2.patch b/mysql-userstatv2.patch
index 08fbfb3..de796c0 100644
--- a/mysql-userstatv2.patch
+++ b/mysql-userstatv2.patch
@@ -1,6 +1,6 @@
-diff -r d35bd12bba15 BUILD/Makefile.in
---- a/BUILD/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/BUILD/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 BUILD/Makefile.in
+--- a/BUILD/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/BUILD/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -169,6 +169,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -9,9 +9,9 @@ diff -r d35bd12bba15 BUILD/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 Docs/Makefile.in
---- a/Docs/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/Docs/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 Docs/Makefile.in
+--- a/Docs/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/Docs/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -167,6 +167,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -20,9 +20,9 @@ diff -r d35bd12bba15 Docs/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 Makefile.in
---- a/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 Makefile.in
+--- a/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -191,6 +191,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -31,9 +31,9 @@ diff -r d35bd12bba15 Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 SSL/Makefile.in
---- a/SSL/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/SSL/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 SSL/Makefile.in
+--- a/SSL/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/SSL/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -167,6 +167,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -42,9 +42,9 @@ diff -r d35bd12bba15 SSL/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 aclocal.m4
---- a/aclocal.m4 Mon Dec 22 22:51:44 2008 -0800
-+++ b/aclocal.m4 Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 aclocal.m4
+--- a/aclocal.m4 Mon Dec 22 00:26:39 2008 -0800
++++ b/aclocal.m4 Mon Dec 22 00:31:13 2008 -0800
@@ -1597,7 +1597,7 @@
# Append ld.so.conf contents to the search path
@@ -112,9 +112,9 @@ diff -r d35bd12bba15 aclocal.m4
AC_MSG_RESULT([$SED])
])
-diff -r d35bd12bba15 client/Makefile.in
---- a/client/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/client/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 client/Makefile.in
+--- a/client/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/client/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -268,6 +268,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -123,9 +123,9 @@ diff -r d35bd12bba15 client/Makefile.in
LIBS = @CLIENT_LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 cmd-line-utils/Makefile.in
---- a/cmd-line-utils/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/cmd-line-utils/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 cmd-line-utils/Makefile.in
+--- a/cmd-line-utils/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/cmd-line-utils/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -177,6 +177,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -134,9 +134,9 @@ diff -r d35bd12bba15 cmd-line-utils/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 cmd-line-utils/libedit/Makefile.in
---- a/cmd-line-utils/libedit/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/cmd-line-utils/libedit/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 cmd-line-utils/libedit/Makefile.in
+--- a/cmd-line-utils/libedit/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/cmd-line-utils/libedit/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -197,6 +197,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -145,9 +145,9 @@ diff -r d35bd12bba15 cmd-line-utils/libedit/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 cmd-line-utils/readline/Makefile.in
---- a/cmd-line-utils/readline/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/cmd-line-utils/readline/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 cmd-line-utils/readline/Makefile.in
+--- a/cmd-line-utils/readline/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/cmd-line-utils/readline/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -195,6 +195,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -156,9 +156,18 @@ diff -r d35bd12bba15 cmd-line-utils/readline/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 configure
---- a/configure Mon Dec 22 22:51:44 2008 -0800
-+++ b/configure Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 configure
+--- a/configure Mon Dec 22 00:26:39 2008 -0800
++++ b/configure Mon Dec 22 00:31:13 2008 -0800
+@@ -477,7 +477,7 @@
+ #endif"
+
+ ac_subdirs_all="$ac_subdirs_all innobase"
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MYSQL_NO_DASH_VERSION MYSQL_BASE_VERSION MYSQL_VERSION_ID MYSQL_PREVIOUS_BASE_VERSION PROTOCOL_VERSION DOT_FRM_VERSION SHARED_LIB_MAJOR_VERSION SHARED_LIB_VERSION NDB_SHARED_LIB_MAJOR_VERSION NDB_SHARED_LIB_VERSION AVAILABLE_LANGUAGES NDB_VERSION_MAJOR NDB_VERSION_MINOR NDB_VERSION_BUILD NDB_VERSION_STATUS SYSTEM_TYPE MACHINE_TYPE CONF_COMMAND SAVE_CC SAVE_CXX SAVE_ASFLAGS SAVE_CFLAGS SAVE_CXXFLAGS SAVE_LDFLAGS SAVE_CXXLDFLAGS CXXLDFLAGS AR RANLIB DARWIN_MWCC_TRUE DARWIN_MWCC_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP CC_VERSION CXX_VERSION AS ac_ct_RANLIB EGREP LN_S ECHO ac_ct_AR CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL NM YACC PDFMANUAL DVIS uname_prog ASFLAGS LD ARFLAGS LD_VERSION_SCRIPT MYSQLD_DEFAULT_SWITCHES TARGET_LINUX LN LN_CP_F MV RM CP SED CMP CHMOD HOSTNAME TAR PERL PERL5 DOXYGEN PDFLATEX MAKEINDEX ICHECK PS FIND_PROC KILL CHECK_PID CCAS CCASFLAGS NOINST_LDFLAGS MYSQL_SERVER_SUFFIX ASSEMBLER_x86_TRUE ASSEMBLER_x86_FALSE ASSEMBLER_sparc32_TRUE ASSEMBLER_sparc32_FALSE ASSEMBLER_sparc64_TRUE ASSEMBLER_sparc64_FALSE ASSEMBLER_TRUE ASSEMBLER_FALSE MYSQL_UNIX_ADDR MYSQL_TCP_PORT MYSQL_TCP_PORT_DEFAULT MYSQLD_USER GETCONF ac_ct_GETCONF zlib_dir ZLIB_LIBS ZLIB_DEPS ZLIB_INCLUDES WRAPLIBS pstack_dirs pstack_libs COMPILE_PSTACK_TRUE COMPILE_PSTACK_FALSE LIBDL MYSQLD_EXTRA_LDFLAGS CLIENT_EXTRA_LDFLAGS MYSQLD_EXTRA_LIBS LIB_EXTRA_CCFLAGS LM_CFLAGS COMPILATION_COMMENT ALLOCA MAKE_SHELL TERMCAP_LIB LIBEDIT_LOBJECTS tools_dirs openssl_libs openssl_includes yassl_taocrypt_extra_cxxflags yassl_h_ln_cmd yassl_libs yassl_dir HAVE_YASSL_TRUE HAVE_YASSL_FALSE libmysqld_dirs linked_libmysqld_targets docs_dirs extra_docs bench_dirs readline_dir readline_topdir readline_basedir readline_link readline_h_ln_cmd bdb_includes bdb_libs bdb_libs_with_path innodb_includes innodb_libs innodb_system_libs NDB_SCI_INCLUDES NDB_SCI_LIBS NDB_LD_VERSION_SCRIPT HAVE_NDBCLUSTER_DB_TRUE HAVE_NDBCLUSTER_DB_FALSE ndbcluster_includes ndbcluster_libs ndbcluster_system_libs ndb_mgmclient_libs man_dirs man1_files man8_files CLIENT_LIBS NON_THREADED_LIBS STATIC_NSS_FLAGS sql_client_dirs linked_client_targets netware_dir linked_netware_sources HAVE_NETWARE_TRUE HAVE_NETWARE_FALSE THREAD_LOBJECTS BUILD_INNODB_TOOLS_TRUE BUILD_INNODB_TOOLS_FALSE subdirs sql_server_dirs thread_dirs server_scripts sql_union_dirs GXX NDB_DEFS ndb_cxxflags_fix ndb_port ndb_transporter_opt_objs ndb_bin_am_ldflags ndb_opt_subdirs NDB_SIZEOF_CHARP NDB_SIZEOF_CHAR NDB_SIZEOF_SHORT NDB_SIZEOF_INT NDB_SIZEOF_LONG NDB_SIZEOF_LONG_LONG MAKE_BINARY_DISTRIBUTION_OPTIONS LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MYSQL_NO_DASH_VERSION MYSQL_BASE_VERSION MYSQL_VERSION_ID MYSQL_PREVIOUS_BASE_VERSION PROTOCOL_VERSION DOT_FRM_VERSION SHARED_LIB_MAJOR_VERSION SHARED_LIB_VERSION NDB_SHARED_LIB_MAJOR_VERSION NDB_SHARED_LIB_VERSION AVAILABLE_LANGUAGES NDB_VERSION_MAJOR NDB_VERSION_MINOR NDB_VERSION_BUILD NDB_VERSION_STATUS SYSTEM_TYPE MACHINE_TYPE CONF_COMMAND SAVE_CC SAVE_CXX SAVE_ASFLAGS SAVE_CFLAGS SAVE_CXXFLAGS SAVE_LDFLAGS SAVE_CXXLDFLAGS CXXLDFLAGS AR RANLIB DARWIN_MWCC_TRUE DARWIN_MWCC_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP CC_VERSION CXX_VERSION AS ac_ct_RANLIB SED EGREP LN_S ECHO ac_ct_AR CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL NM YACC PDFMANUAL DVIS uname_prog ASFLAGS LD ARFLAGS LD_VERSION_SCRIPT MYSQLD_DEFAULT_SWITCHES TARGET_LINUX LN LN_CP_F MV RM CP SED CMP CHMOD HOSTNAME TAR PERL PERL5 DOXYGEN PDFLATEX MAKEINDEX ICHECK PS FIND_PROC KILL CHECK_PID CCAS CCASFLAGS NOINST_LDFLAGS MYSQL_SERVER_SUFFIX ASSEMBLER_x86_TRUE ASSEMBLER_x86_FALSE ASSEMBLER_sparc32_TRUE ASSEMBLER_sparc32_FALSE ASSEMBLER_sparc64_TRUE ASSEMBLER_sparc64_FALSE ASSEMBLER_TRUE ASSEMBLER_FALSE MYSQL_UNIX_ADDR MYSQL_TCP_PORT MYSQL_TCP_PORT_DEFAULT MYSQLD_USER GETCONF ac_ct_GETCONF zlib_dir ZLIB_LIBS ZLIB_DEPS ZLIB_INCLUDES WRAPLIBS pstack_dirs pstack_libs COMPILE_PSTACK_TRUE COMPILE_PSTACK_FALSE LIBDL MYSQLD_EXTRA_LDFLAGS CLIENT_EXTRA_LDFLAGS MYSQLD_EXTRA_LIBS LIB_EXTRA_CCFLAGS LM_CFLAGS COMPILATION_COMMENT ALLOCA MAKE_SHELL TERMCAP_LIB LIBEDIT_LOBJECTS tools_dirs openssl_libs openssl_includes yassl_taocrypt_extra_cxxflags yassl_h_ln_cmd yassl_libs yassl_dir HAVE_YASSL_TRUE HAVE_YASSL_FALSE libmysqld_dirs linked_libmysqld_targets docs_dirs extra_docs bench_dirs readline_dir readline_topdir readline_basedir readline_link readline_h_ln_cmd bdb_includes bdb_libs bdb_libs_with_path innodb_includes innodb_libs innodb_system_libs NDB_SCI_INCLUDES NDB_SCI_LIBS NDB_LD_VERSION_SCRIPT HAVE_NDBCLUSTER_DB_TRUE HAVE_NDBCLUSTER_DB_FALSE ndbcluster_includes ndbcluster_libs ndbcluster_system_libs ndb_mgmclient_libs man_dirs man1_files man8_files CLIENT_LIBS NON_THREADED_LIBS STATIC_NSS_FLAGS sql_client_dirs linked_client_targets netware_dir linked_netware_sources HAVE_NETWARE_TRUE HAVE_NETWARE_FALSE THREAD_LOBJECTS BUILD_INNODB_TOOLS_TRUE BUILD_INNODB_TOOLS_FALSE subdirs sql_server_dirs thread_dirs server_scripts sql_union_dirs GXX NDB_DEFS ndb_cxxflags_fix ndb_port ndb_transporter_opt_objs ndb_bin_am_ldflags ndb_opt_subdirs NDB_SIZEOF_CHARP NDB_SIZEOF_CHAR NDB_SIZEOF_SHORT NDB_SIZEOF_INT NDB_SIZEOF_LONG NDB_SIZEOF_LONG_LONG MAKE_BINARY_DISTRIBUTION_OPTIONS LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+
+ # Initialize some variables set by options.
@@ -38236,7 +38236,91 @@
# We also disable for SCO for the time being, the headers for the
# thread library we use conflicts with other headers.
@@ -269,9 +278,9 @@ diff -r d35bd12bba15 configure
s, at tools_dirs@,$tools_dirs,;t t
s, at openssl_libs@,$openssl_libs,;t t
s, at openssl_includes@,$openssl_includes,;t t
-diff -r d35bd12bba15 configure.in
---- a/configure.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/configure.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 configure.in
+--- a/configure.in Mon Dec 22 00:26:39 2008 -0800
++++ b/configure.in Mon Dec 22 00:31:13 2008 -0800
@@ -2098,7 +2098,18 @@
# We also disable for SCO for the time being, the headers for the
# thread library we use conflicts with other headers.
@@ -301,9 +310,9 @@ diff -r d35bd12bba15 configure.in
AC_SUBST(CLIENT_LIBS)
AC_SUBST(NON_THREADED_LIBS)
-diff -r d35bd12bba15 dbug/Makefile.in
---- a/dbug/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/dbug/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 dbug/Makefile.in
+--- a/dbug/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/dbug/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -214,6 +214,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -312,9 +321,9 @@ diff -r d35bd12bba15 dbug/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 extra/Makefile.in
---- a/extra/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/extra/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 extra/Makefile.in
+--- a/extra/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/extra/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -259,6 +259,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -323,9 +332,9 @@ diff -r d35bd12bba15 extra/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 extra/yassl/Makefile.in
---- a/extra/yassl/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/extra/yassl/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 extra/yassl/Makefile.in
+--- a/extra/yassl/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/extra/yassl/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -162,6 +162,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -334,9 +343,9 @@ diff -r d35bd12bba15 extra/yassl/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 extra/yassl/src/Makefile.in
---- a/extra/yassl/src/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/extra/yassl/src/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 extra/yassl/src/Makefile.in
+--- a/extra/yassl/src/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/extra/yassl/src/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -173,6 +173,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -345,9 +354,9 @@ diff -r d35bd12bba15 extra/yassl/src/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 extra/yassl/taocrypt/Makefile.in
---- a/extra/yassl/taocrypt/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/extra/yassl/taocrypt/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 extra/yassl/taocrypt/Makefile.in
+--- a/extra/yassl/taocrypt/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/extra/yassl/taocrypt/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -162,6 +162,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -356,9 +365,9 @@ diff -r d35bd12bba15 extra/yassl/taocrypt/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 extra/yassl/taocrypt/benchmark/Makefile.in
---- a/extra/yassl/taocrypt/benchmark/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/extra/yassl/taocrypt/benchmark/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 extra/yassl/taocrypt/benchmark/Makefile.in
+--- a/extra/yassl/taocrypt/benchmark/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/extra/yassl/taocrypt/benchmark/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -172,6 +172,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -367,9 +376,9 @@ diff -r d35bd12bba15 extra/yassl/taocrypt/benchmark/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 extra/yassl/taocrypt/src/Makefile.in
---- a/extra/yassl/taocrypt/src/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/extra/yassl/taocrypt/src/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 extra/yassl/taocrypt/src/Makefile.in
+--- a/extra/yassl/taocrypt/src/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/extra/yassl/taocrypt/src/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -182,6 +182,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -378,9 +387,9 @@ diff -r d35bd12bba15 extra/yassl/taocrypt/src/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 extra/yassl/taocrypt/test/Makefile.in
---- a/extra/yassl/taocrypt/test/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/extra/yassl/taocrypt/test/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 extra/yassl/taocrypt/test/Makefile.in
+--- a/extra/yassl/taocrypt/test/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/extra/yassl/taocrypt/test/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -172,6 +172,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -389,9 +398,9 @@ diff -r d35bd12bba15 extra/yassl/taocrypt/test/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 extra/yassl/testsuite/Makefile.in
---- a/extra/yassl/testsuite/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/extra/yassl/testsuite/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 extra/yassl/testsuite/Makefile.in
+--- a/extra/yassl/testsuite/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/extra/yassl/testsuite/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -175,6 +175,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -400,9 +409,9 @@ diff -r d35bd12bba15 extra/yassl/testsuite/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 heap/Makefile.in
---- a/heap/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/heap/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 heap/Makefile.in
+--- a/heap/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/heap/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -218,6 +218,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -411,9 +420,9 @@ diff -r d35bd12bba15 heap/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 include/Makefile.in
---- a/include/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/include/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 include/Makefile.in
+--- a/include/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/include/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -183,6 +183,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -422,9 +431,9 @@ diff -r d35bd12bba15 include/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 include/mysql_com.h
---- a/include/mysql_com.h Mon Dec 22 22:51:44 2008 -0800
-+++ b/include/mysql_com.h Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 include/mysql_com.h
+--- a/include/mysql_com.h Mon Dec 22 00:26:39 2008 -0800
++++ b/include/mysql_com.h Mon Dec 22 00:31:13 2008 -0800
@@ -106,6 +106,11 @@
thread */
#define REFRESH_MASTER 128 /* Remove all bin logs in the index
@@ -437,9 +446,9 @@ diff -r d35bd12bba15 include/mysql_com.h
/* The following can't be set with mysql_refresh() */
#define REFRESH_READ_LOCK 16384 /* Lock tables for read */
-diff -r d35bd12bba15 libmysql/Makefile.in
---- a/libmysql/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/libmysql/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 libmysql/Makefile.in
+--- a/libmysql/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/libmysql/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -278,6 +278,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -448,9 +457,9 @@ diff -r d35bd12bba15 libmysql/Makefile.in
LIBS = @CLIENT_LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 libmysql_r/Makefile.in
---- a/libmysql_r/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/libmysql_r/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 libmysql_r/Makefile.in
+--- a/libmysql_r/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/libmysql_r/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -275,6 +275,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -459,9 +468,9 @@ diff -r d35bd12bba15 libmysql_r/Makefile.in
LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 libmysqld/Makefile.in
---- a/libmysqld/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/libmysqld/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 libmysqld/Makefile.in
+--- a/libmysqld/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/libmysqld/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -264,6 +264,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -470,9 +479,9 @@ diff -r d35bd12bba15 libmysqld/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 libmysqld/examples/Makefile.in
---- a/libmysqld/examples/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/libmysqld/examples/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 libmysqld/examples/Makefile.in
+--- a/libmysqld/examples/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/libmysqld/examples/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -213,6 +213,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -481,9 +490,9 @@ diff -r d35bd12bba15 libmysqld/examples/Makefile.in
LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 man/Makefile.in
---- a/man/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/man/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 man/Makefile.in
+--- a/man/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/man/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -174,6 +174,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -492,9 +501,9 @@ diff -r d35bd12bba15 man/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 myisam/Makefile.in
---- a/myisam/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/myisam/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 myisam/Makefile.in
+--- a/myisam/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/myisam/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -257,6 +257,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -503,9 +512,9 @@ diff -r d35bd12bba15 myisam/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 myisammrg/Makefile.in
---- a/myisammrg/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/myisammrg/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 myisammrg/Makefile.in
+--- a/myisammrg/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/myisammrg/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -205,6 +205,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -514,9 +523,9 @@ diff -r d35bd12bba15 myisammrg/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 mysql-test/Makefile.in
---- a/mysql-test/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/mysql-test/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 mysql-test/Makefile.in
+--- a/mysql-test/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/mysql-test/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -181,6 +181,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -525,9 +534,9 @@ diff -r d35bd12bba15 mysql-test/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 mysql-test/ndb/Makefile.in
---- a/mysql-test/ndb/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/mysql-test/ndb/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 mysql-test/ndb/Makefile.in
+--- a/mysql-test/ndb/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/mysql-test/ndb/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -170,6 +170,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -536,9 +545,9 @@ diff -r d35bd12bba15 mysql-test/ndb/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 mysql-test/r/information_schema.result
---- a/mysql-test/r/information_schema.result Mon Dec 22 22:51:44 2008 -0800
-+++ b/mysql-test/r/information_schema.result Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 mysql-test/r/information_schema.result
+--- a/mysql-test/r/information_schema.result Mon Dec 22 00:26:39 2008 -0800
++++ b/mysql-test/r/information_schema.result Mon Dec 22 00:31:13 2008 -0800
@@ -37,10 +37,12 @@
select * from v1;
c
@@ -721,9 +730,9 @@ diff -r d35bd12bba15 mysql-test/r/information_schema.result
VIEWS information_schema.VIEWS 1
show global status like "Uptime_%";
Variable_name Value
-diff -r d35bd12bba15 mysql-test/r/information_schema_db.result
---- a/mysql-test/r/information_schema_db.result Mon Dec 22 22:51:44 2008 -0800
-+++ b/mysql-test/r/information_schema_db.result Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 mysql-test/r/information_schema_db.result
+--- a/mysql-test/r/information_schema_db.result Mon Dec 22 00:26:39 2008 -0800
++++ b/mysql-test/r/information_schema_db.result Mon Dec 22 00:31:13 2008 -0800
@@ -6,10 +6,12 @@
show tables;
Tables_in_information_schema
@@ -755,9 +764,9 @@ diff -r d35bd12bba15 mysql-test/r/information_schema_db.result
TRIGGERS
create database `inf%`;
create database mbase;
-diff -r d35bd12bba15 mysql-test/r/mysqlshow.result
---- a/mysql-test/r/mysqlshow.result Mon Dec 22 22:51:44 2008 -0800
-+++ b/mysql-test/r/mysqlshow.result Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 mysql-test/r/mysqlshow.result
+--- a/mysql-test/r/mysqlshow.result Mon Dec 22 00:26:39 2008 -0800
++++ b/mysql-test/r/mysqlshow.result Mon Dec 22 00:31:13 2008 -0800
@@ -80,10 +80,12 @@
| Tables |
+---------------------------------------+
@@ -806,9 +815,9 @@ diff -r d35bd12bba15 mysql-test/r/mysqlshow.result
| VIEWS |
+---------------------------------------+
Wildcard: inf_rmation_schema
-diff -r d35bd12bba15 mysys/Makefile.in
---- a/mysys/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/mysys/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 mysys/Makefile.in
+--- a/mysys/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/mysys/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -249,6 +249,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -817,9 +826,9 @@ diff -r d35bd12bba15 mysys/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/Makefile.in
---- a/ndb/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/Makefile.in
+--- a/ndb/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -191,6 +191,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -828,9 +837,9 @@ diff -r d35bd12bba15 ndb/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/docs/Makefile.in
---- a/ndb/docs/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/docs/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/docs/Makefile.in
+--- a/ndb/docs/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/docs/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -172,6 +172,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -839,9 +848,9 @@ diff -r d35bd12bba15 ndb/docs/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/include/Makefile.in
---- a/ndb/include/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/include/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/include/Makefile.in
+--- a/ndb/include/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/include/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -202,6 +202,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -850,9 +859,9 @@ diff -r d35bd12bba15 ndb/include/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/Makefile.in
---- a/ndb/src/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/Makefile.in
+--- a/ndb/src/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -220,6 +220,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -861,9 +870,9 @@ diff -r d35bd12bba15 ndb/src/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/common/Makefile.in
---- a/ndb/src/common/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/common/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/common/Makefile.in
+--- a/ndb/src/common/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/common/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -193,6 +193,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -872,9 +881,9 @@ diff -r d35bd12bba15 ndb/src/common/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/common/debugger/Makefile.in
---- a/ndb/src/common/debugger/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/common/debugger/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/common/debugger/Makefile.in
+--- a/ndb/src/common/debugger/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/common/debugger/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -225,6 +225,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -883,9 +892,9 @@ diff -r d35bd12bba15 ndb/src/common/debugger/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/common/debugger/signaldata/Makefile.in
---- a/ndb/src/common/debugger/signaldata/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/common/debugger/signaldata/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/common/debugger/signaldata/Makefile.in
+--- a/ndb/src/common/debugger/signaldata/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/common/debugger/signaldata/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -233,6 +233,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -894,9 +903,9 @@ diff -r d35bd12bba15 ndb/src/common/debugger/signaldata/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/common/logger/Makefile.in
---- a/ndb/src/common/logger/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/common/logger/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/common/logger/Makefile.in
+--- a/ndb/src/common/logger/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/common/logger/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -219,6 +219,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -905,9 +914,9 @@ diff -r d35bd12bba15 ndb/src/common/logger/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/common/mgmcommon/Makefile.in
---- a/ndb/src/common/mgmcommon/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/common/mgmcommon/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/common/mgmcommon/Makefile.in
+--- a/ndb/src/common/mgmcommon/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/common/mgmcommon/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -233,6 +233,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -916,9 +925,9 @@ diff -r d35bd12bba15 ndb/src/common/mgmcommon/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/common/portlib/Makefile.in
---- a/ndb/src/common/portlib/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/common/portlib/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/common/portlib/Makefile.in
+--- a/ndb/src/common/portlib/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/common/portlib/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -243,6 +243,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -927,9 +936,9 @@ diff -r d35bd12bba15 ndb/src/common/portlib/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/common/transporter/Makefile.in
---- a/ndb/src/common/transporter/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/common/transporter/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/common/transporter/Makefile.in
+--- a/ndb/src/common/transporter/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/common/transporter/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -219,6 +219,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -938,9 +947,9 @@ diff -r d35bd12bba15 ndb/src/common/transporter/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/common/util/Makefile.in
---- a/ndb/src/common/util/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/common/util/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/common/util/Makefile.in
+--- a/ndb/src/common/util/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/common/util/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -235,6 +235,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -949,9 +958,9 @@ diff -r d35bd12bba15 ndb/src/common/util/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/cw/Makefile.in
---- a/ndb/src/cw/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/cw/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/cw/Makefile.in
+--- a/ndb/src/cw/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/cw/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -176,6 +176,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -960,9 +969,9 @@ diff -r d35bd12bba15 ndb/src/cw/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/cw/cpcd/Makefile.in
---- a/ndb/src/cw/cpcd/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/cw/cpcd/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/cw/cpcd/Makefile.in
+--- a/ndb/src/cw/cpcd/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/cw/cpcd/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -226,6 +226,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -971,9 +980,9 @@ diff -r d35bd12bba15 ndb/src/cw/cpcd/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/kernel/Makefile.in
---- a/ndb/src/kernel/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/kernel/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/kernel/Makefile.in
+--- a/ndb/src/kernel/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/kernel/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -246,6 +246,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -982,9 +991,9 @@ diff -r d35bd12bba15 ndb/src/kernel/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/kernel/blocks/Makefile.in
---- a/ndb/src/kernel/blocks/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/kernel/blocks/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/kernel/blocks/Makefile.in
+--- a/ndb/src/kernel/blocks/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/kernel/blocks/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -176,6 +176,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -993,9 +1002,9 @@ diff -r d35bd12bba15 ndb/src/kernel/blocks/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/kernel/blocks/backup/Makefile.in
---- a/ndb/src/kernel/blocks/backup/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/kernel/blocks/backup/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/kernel/blocks/backup/Makefile.in
+--- a/ndb/src/kernel/blocks/backup/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/kernel/blocks/backup/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -218,6 +218,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1004,9 +1013,9 @@ diff -r d35bd12bba15 ndb/src/kernel/blocks/backup/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/kernel/blocks/cmvmi/Makefile.in
---- a/ndb/src/kernel/blocks/cmvmi/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/kernel/blocks/cmvmi/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/kernel/blocks/cmvmi/Makefile.in
+--- a/ndb/src/kernel/blocks/cmvmi/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/kernel/blocks/cmvmi/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -218,6 +218,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1015,9 +1024,9 @@ diff -r d35bd12bba15 ndb/src/kernel/blocks/cmvmi/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/kernel/blocks/dbacc/Makefile.in
---- a/ndb/src/kernel/blocks/dbacc/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/kernel/blocks/dbacc/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/kernel/blocks/dbacc/Makefile.in
+--- a/ndb/src/kernel/blocks/dbacc/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/kernel/blocks/dbacc/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -218,6 +218,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1026,9 +1035,9 @@ diff -r d35bd12bba15 ndb/src/kernel/blocks/dbacc/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/kernel/blocks/dbdict/Makefile.in
---- a/ndb/src/kernel/blocks/dbdict/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/kernel/blocks/dbdict/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/kernel/blocks/dbdict/Makefile.in
+--- a/ndb/src/kernel/blocks/dbdict/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/kernel/blocks/dbdict/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -228,6 +228,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1037,9 +1046,9 @@ diff -r d35bd12bba15 ndb/src/kernel/blocks/dbdict/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/kernel/blocks/dbdih/Makefile.in
---- a/ndb/src/kernel/blocks/dbdih/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/kernel/blocks/dbdih/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/kernel/blocks/dbdih/Makefile.in
+--- a/ndb/src/kernel/blocks/dbdih/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/kernel/blocks/dbdih/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -225,6 +225,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1048,9 +1057,9 @@ diff -r d35bd12bba15 ndb/src/kernel/blocks/dbdih/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/kernel/blocks/dblqh/Makefile.in
---- a/ndb/src/kernel/blocks/dblqh/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/kernel/blocks/dblqh/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/kernel/blocks/dblqh/Makefile.in
+--- a/ndb/src/kernel/blocks/dblqh/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/kernel/blocks/dblqh/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -226,6 +226,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1059,9 +1068,9 @@ diff -r d35bd12bba15 ndb/src/kernel/blocks/dblqh/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/kernel/blocks/dbtc/Makefile.in
---- a/ndb/src/kernel/blocks/dbtc/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/kernel/blocks/dbtc/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/kernel/blocks/dbtc/Makefile.in
+--- a/ndb/src/kernel/blocks/dbtc/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/kernel/blocks/dbtc/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -218,6 +218,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1070,9 +1079,9 @@ diff -r d35bd12bba15 ndb/src/kernel/blocks/dbtc/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/kernel/blocks/dbtup/Makefile.in
---- a/ndb/src/kernel/blocks/dbtup/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/kernel/blocks/dbtup/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/kernel/blocks/dbtup/Makefile.in
+--- a/ndb/src/kernel/blocks/dbtup/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/kernel/blocks/dbtup/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -226,6 +226,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1081,9 +1090,9 @@ diff -r d35bd12bba15 ndb/src/kernel/blocks/dbtup/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/kernel/blocks/dbtux/Makefile.in
---- a/ndb/src/kernel/blocks/dbtux/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/kernel/blocks/dbtux/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/kernel/blocks/dbtux/Makefile.in
+--- a/ndb/src/kernel/blocks/dbtux/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/kernel/blocks/dbtux/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -221,6 +221,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1092,9 +1101,9 @@ diff -r d35bd12bba15 ndb/src/kernel/blocks/dbtux/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/kernel/blocks/dbutil/Makefile.in
---- a/ndb/src/kernel/blocks/dbutil/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/kernel/blocks/dbutil/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/kernel/blocks/dbutil/Makefile.in
+--- a/ndb/src/kernel/blocks/dbutil/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/kernel/blocks/dbutil/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -218,6 +218,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1103,9 +1112,9 @@ diff -r d35bd12bba15 ndb/src/kernel/blocks/dbutil/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/kernel/blocks/ndbcntr/Makefile.in
---- a/ndb/src/kernel/blocks/ndbcntr/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/kernel/blocks/ndbcntr/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/kernel/blocks/ndbcntr/Makefile.in
+--- a/ndb/src/kernel/blocks/ndbcntr/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/kernel/blocks/ndbcntr/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -219,6 +219,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1114,9 +1123,9 @@ diff -r d35bd12bba15 ndb/src/kernel/blocks/ndbcntr/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/kernel/blocks/ndbfs/Makefile.in
---- a/ndb/src/kernel/blocks/ndbfs/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/kernel/blocks/ndbfs/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/kernel/blocks/ndbfs/Makefile.in
+--- a/ndb/src/kernel/blocks/ndbfs/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/kernel/blocks/ndbfs/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -219,6 +219,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1125,9 +1134,9 @@ diff -r d35bd12bba15 ndb/src/kernel/blocks/ndbfs/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/kernel/blocks/qmgr/Makefile.in
---- a/ndb/src/kernel/blocks/qmgr/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/kernel/blocks/qmgr/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/kernel/blocks/qmgr/Makefile.in
+--- a/ndb/src/kernel/blocks/qmgr/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/kernel/blocks/qmgr/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -218,6 +218,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1136,9 +1145,9 @@ diff -r d35bd12bba15 ndb/src/kernel/blocks/qmgr/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/kernel/blocks/suma/Makefile.in
---- a/ndb/src/kernel/blocks/suma/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/kernel/blocks/suma/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/kernel/blocks/suma/Makefile.in
+--- a/ndb/src/kernel/blocks/suma/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/kernel/blocks/suma/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -218,6 +218,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1147,9 +1156,9 @@ diff -r d35bd12bba15 ndb/src/kernel/blocks/suma/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/kernel/blocks/trix/Makefile.in
---- a/ndb/src/kernel/blocks/trix/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/kernel/blocks/trix/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/kernel/blocks/trix/Makefile.in
+--- a/ndb/src/kernel/blocks/trix/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/kernel/blocks/trix/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -218,6 +218,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1158,9 +1167,9 @@ diff -r d35bd12bba15 ndb/src/kernel/blocks/trix/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/kernel/error/Makefile.in
---- a/ndb/src/kernel/error/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/kernel/error/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/kernel/error/Makefile.in
+--- a/ndb/src/kernel/error/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/kernel/error/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -227,6 +227,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1169,9 +1178,9 @@ diff -r d35bd12bba15 ndb/src/kernel/error/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/kernel/vm/Makefile.in
---- a/ndb/src/kernel/vm/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/kernel/vm/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/kernel/vm/Makefile.in
+--- a/ndb/src/kernel/vm/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/kernel/vm/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -229,6 +229,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1180,9 +1189,9 @@ diff -r d35bd12bba15 ndb/src/kernel/vm/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/mgmapi/Makefile.in
---- a/ndb/src/mgmapi/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/mgmapi/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/mgmapi/Makefile.in
+--- a/ndb/src/mgmapi/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/mgmapi/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -226,6 +226,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1191,9 +1200,9 @@ diff -r d35bd12bba15 ndb/src/mgmapi/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/mgmclient/Makefile.in
---- a/ndb/src/mgmclient/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/mgmclient/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/mgmclient/Makefile.in
+--- a/ndb/src/mgmclient/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/mgmclient/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -236,6 +236,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1202,9 +1211,9 @@ diff -r d35bd12bba15 ndb/src/mgmclient/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/mgmsrv/Makefile.in
---- a/ndb/src/mgmsrv/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/mgmsrv/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/mgmsrv/Makefile.in
+--- a/ndb/src/mgmsrv/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/mgmsrv/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -232,6 +232,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1213,9 +1222,9 @@ diff -r d35bd12bba15 ndb/src/mgmsrv/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/src/ndbapi/Makefile.in
---- a/ndb/src/ndbapi/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/src/ndbapi/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/src/ndbapi/Makefile.in
+--- a/ndb/src/ndbapi/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/src/ndbapi/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -236,6 +236,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1224,9 +1233,9 @@ diff -r d35bd12bba15 ndb/src/ndbapi/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/test/Makefile.in
---- a/ndb/test/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/test/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/test/Makefile.in
+--- a/ndb/test/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/test/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -176,6 +176,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1235,9 +1244,9 @@ diff -r d35bd12bba15 ndb/test/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/test/ndbapi/Makefile.in
---- a/ndb/test/ndbapi/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/test/ndbapi/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/test/ndbapi/Makefile.in
+--- a/ndb/test/ndbapi/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/test/ndbapi/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -613,6 +613,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1246,9 +1255,9 @@ diff -r d35bd12bba15 ndb/test/ndbapi/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/test/ndbapi/bank/Makefile.in
---- a/ndb/test/ndbapi/bank/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/test/ndbapi/bank/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/test/ndbapi/bank/Makefile.in
+--- a/ndb/test/ndbapi/bank/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/test/ndbapi/bank/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -305,6 +305,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1257,9 +1266,9 @@ diff -r d35bd12bba15 ndb/test/ndbapi/bank/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/test/run-test/Makefile.in
---- a/ndb/test/run-test/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/test/run-test/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/test/run-test/Makefile.in
+--- a/ndb/test/run-test/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/test/run-test/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -264,6 +264,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1268,9 +1277,9 @@ diff -r d35bd12bba15 ndb/test/run-test/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/test/src/Makefile.in
---- a/ndb/test/src/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/test/src/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/test/src/Makefile.in
+--- a/ndb/test/src/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/test/src/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -234,6 +234,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1279,9 +1288,9 @@ diff -r d35bd12bba15 ndb/test/src/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/test/tools/Makefile.in
---- a/ndb/test/tools/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/test/tools/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/test/tools/Makefile.in
+--- a/ndb/test/tools/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/test/tools/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -347,6 +347,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1290,9 +1299,9 @@ diff -r d35bd12bba15 ndb/test/tools/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 ndb/tools/Makefile.in
---- a/ndb/tools/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/ndb/tools/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 ndb/tools/Makefile.in
+--- a/ndb/tools/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/ndb/tools/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -333,6 +333,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1301,9 +1310,9 @@ diff -r d35bd12bba15 ndb/tools/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 netware/Makefile.in
---- a/netware/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/netware/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 netware/Makefile.in
+--- a/netware/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/netware/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -221,6 +221,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1312,9 +1321,9 @@ diff -r d35bd12bba15 netware/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 os2/Makefile.in
---- a/os2/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/os2/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 os2/Makefile.in
+--- a/os2/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/os2/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -176,6 +176,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1323,9 +1332,9 @@ diff -r d35bd12bba15 os2/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 os2/include/Makefile.in
---- a/os2/include/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/os2/include/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 os2/include/Makefile.in
+--- a/os2/include/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/os2/include/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -176,6 +176,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1334,9 +1343,9 @@ diff -r d35bd12bba15 os2/include/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 os2/include/sys/Makefile.in
---- a/os2/include/sys/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/os2/include/sys/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 os2/include/sys/Makefile.in
+--- a/os2/include/sys/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/os2/include/sys/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -167,6 +167,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1345,9 +1354,9 @@ diff -r d35bd12bba15 os2/include/sys/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 patch_info/userstats.info
+diff -r 1270c564d514 patch_info/userstats.info
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/patch_info/userstats.info Mon Dec 22 22:53:26 2008 -0800
++++ b/patch_info/userstats.info Mon Dec 22 00:31:13 2008 -0800
@@ -0,0 +1,14 @@
+File=userstatsv2.patch
+Name=SHOW USER/TABLE/INDEX statistics
@@ -1363,9 +1372,9 @@ diff -r d35bd12bba15 patch_info/userstats.info
+
+2008-12-09
+YK: fixed "Row_sent: 0" problem at microslow_innodb.patch
-diff -r d35bd12bba15 pstack/Makefile.in
---- a/pstack/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/pstack/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 pstack/Makefile.in
+--- a/pstack/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/pstack/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -215,6 +215,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1374,9 +1383,9 @@ diff -r d35bd12bba15 pstack/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 pstack/aout/Makefile.in
---- a/pstack/aout/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/pstack/aout/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 pstack/aout/Makefile.in
+--- a/pstack/aout/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/pstack/aout/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -157,6 +157,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1385,9 +1394,9 @@ diff -r d35bd12bba15 pstack/aout/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 regex/Makefile.in
---- a/regex/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/regex/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 regex/Makefile.in
+--- a/regex/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/regex/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -199,6 +199,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1396,9 +1405,9 @@ diff -r d35bd12bba15 regex/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 scripts/Makefile.in
---- a/scripts/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/scripts/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 scripts/Makefile.in
+--- a/scripts/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/scripts/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -198,6 +198,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1407,9 +1416,9 @@ diff -r d35bd12bba15 scripts/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 server-tools/Makefile.in
---- a/server-tools/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/server-tools/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 server-tools/Makefile.in
+--- a/server-tools/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/server-tools/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -175,6 +175,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1418,9 +1427,9 @@ diff -r d35bd12bba15 server-tools/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 server-tools/instance-manager/Makefile.in
---- a/server-tools/instance-manager/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/server-tools/instance-manager/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 server-tools/instance-manager/Makefile.in
+--- a/server-tools/instance-manager/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/server-tools/instance-manager/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -223,6 +223,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1429,9 +1438,9 @@ diff -r d35bd12bba15 server-tools/instance-manager/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 sql/Makefile.in
---- a/sql/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/Makefile.in
+--- a/sql/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -285,6 +285,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -1440,9 +1449,9 @@ diff -r d35bd12bba15 sql/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 sql/ha_innodb.cc
---- a/sql/ha_innodb.cc Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/ha_innodb.cc Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/ha_innodb.cc
+--- a/sql/ha_innodb.cc Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/ha_innodb.cc Mon Dec 22 00:31:13 2008 -0800
@@ -3316,6 +3316,8 @@
error = row_insert_for_mysql((byte*) record, prebuilt);
@@ -1480,9 +1489,9 @@ diff -r d35bd12bba15 sql/ha_innodb.cc
} else if (ret == DB_RECORD_NOT_FOUND) {
error = HA_ERR_END_OF_FILE;
-diff -r d35bd12bba15 sql/ha_myisam.cc
---- a/sql/ha_myisam.cc Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/ha_myisam.cc Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/ha_myisam.cc
+--- a/sql/ha_myisam.cc Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/ha_myisam.cc Mon Dec 22 00:31:13 2008 -0800
@@ -670,7 +670,9 @@
if ((error= update_auto_increment()))
return error;
@@ -1642,9 +1651,9 @@ diff -r d35bd12bba15 sql/ha_myisam.cc
return error;
}
-diff -r d35bd12bba15 sql/handler.cc
---- a/sql/handler.cc Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/handler.cc Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/handler.cc
+--- a/sql/handler.cc Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/handler.cc Mon Dec 22 00:31:13 2008 -0800
@@ -725,6 +725,8 @@
if (cookie)
tc_log->unlog(cookie, xid);
@@ -1791,9 +1800,9 @@ diff -r d35bd12bba15 sql/handler.cc
/****************************************************************************
** Some general functions that isn't in the handler class
-diff -r d35bd12bba15 sql/handler.h
---- a/sql/handler.h Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/handler.h Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/handler.h
+--- a/sql/handler.h Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/handler.h Mon Dec 22 00:31:13 2008 -0800
@@ -30,6 +30,10 @@
#if defined(HAVE_BERKELEY_DB) || defined(HAVE_INNOBASE_DB) || \
defined(HAVE_NDBCLUSTER_DB)
@@ -1851,9 +1860,9 @@ diff -r d35bd12bba15 sql/handler.h
/*
default rename_table() and delete_table() rename/delete files with a
given name and extensions from bas_ext()
-diff -r d35bd12bba15 sql/lex.h
---- a/sql/lex.h Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/lex.h Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/lex.h
+--- a/sql/lex.h Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/lex.h Mon Dec 22 00:31:13 2008 -0800
@@ -109,6 +109,7 @@
{ "CHECKSUM", SYM(CHECKSUM_SYM)},
{ "CIPHER", SYM(CIPHER_SYM)},
@@ -1894,9 +1903,9 @@ diff -r d35bd12bba15 sql/lex.h
{ "USE_FRM", SYM(USE_FRM)},
{ "USING", SYM(USING)},
{ "UTC_DATE", SYM(UTC_DATE_SYM)},
-diff -r d35bd12bba15 sql/log.cc
---- a/sql/log.cc Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/log.cc Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/log.cc
+--- a/sql/log.cc Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/log.cc Mon Dec 22 00:31:13 2008 -0800
@@ -1899,18 +1899,24 @@
thd->current_insert_id);
if (e.write(file))
@@ -1974,9 +1983,9 @@ diff -r d35bd12bba15 sql/log.cc
#ifndef DBUG_OFF
DBUG_skip_commit:
#endif
-diff -r d35bd12bba15 sql/mysql_priv.h
---- a/sql/mysql_priv.h Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/mysql_priv.h Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/mysql_priv.h
+--- a/sql/mysql_priv.h Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/mysql_priv.h Mon Dec 22 00:31:13 2008 -0800
@@ -818,7 +818,15 @@
bool multi_delete_set_locks_and_link_aux_tables(LEX *lex);
void init_max_user_conn(void);
@@ -2024,9 +2033,9 @@ diff -r d35bd12bba15 sql/mysql_priv.h
extern const char *opt_date_time_formats[];
extern KNOWN_DATE_TIME_FORMAT known_date_time_formats[];
-diff -r d35bd12bba15 sql/mysqld.cc
---- a/sql/mysqld.cc Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/mysqld.cc Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/mysqld.cc
+--- a/sql/mysqld.cc Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/mysqld.cc Mon Dec 22 00:31:13 2008 -0800
@@ -414,6 +414,7 @@
uint opt_large_page_size= 0;
my_bool opt_old_style_user_limits= 0, trust_function_creators= 0;
@@ -2120,9 +2129,9 @@ diff -r d35bd12bba15 sql/mysqld.cc
OPT_SLOW_LOG,
OPT_SLOW_QUERY_LOG_FILE,
+ OPT_USERSTAT_RUNNING,
+ OPT_USE_GLOBAL_LONG_QUERY_TIME,
OPT_INNODB_ROLLBACK_ON_TIMEOUT,
OPT_SECURE_FILE_PRIV,
- OPT_KEEP_FILES_ON_CREATE,
@@ -6450,6 +6476,10 @@
(gptr*) &max_system_variables.net_wait_timeout, 0, GET_ULONG,
REQUIRED_ARG, NET_WAIT_TIMEOUT, 1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT),
@@ -2134,9 +2143,9 @@ diff -r d35bd12bba15 sql/mysqld.cc
{0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
};
-diff -r d35bd12bba15 sql/set_var.cc
---- a/sql/set_var.cc Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/set_var.cc Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/set_var.cc
+--- a/sql/set_var.cc Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/set_var.cc Mon Dec 22 00:31:13 2008 -0800
@@ -323,6 +323,7 @@
sys_var_thd_ulong sys_read_buff_size("read_buffer_size",
&SV::read_buff_size);
@@ -2158,12 +2167,12 @@ diff -r d35bd12bba15 sql/set_var.cc
{sys_updatable_views_with_limit.name,
(char*) &sys_updatable_views_with_limit,SHOW_SYS},
+ {sys_userstat_running.name, (char*) &sys_userstat_running, SHOW_SYS},
+ {sys_use_global_long_query_time.name, (char*) &sys_use_global_long_query_time, SHOW_SYS},
{sys_version.name, (char*) &sys_version, SHOW_SYS},
#ifdef HAVE_BERKELEY_DB
- {sys_version_bdb.name, (char*) &sys_version_bdb, SHOW_SYS},
-diff -r d35bd12bba15 sql/share/Makefile.in
---- a/sql/share/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/share/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/share/Makefile.in
+--- a/sql/share/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/share/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -167,6 +167,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -2172,9 +2181,9 @@ diff -r d35bd12bba15 sql/share/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 sql/sql_base.cc
---- a/sql/sql_base.cc Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/sql_base.cc Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/sql_base.cc
+--- a/sql/sql_base.cc Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/sql_base.cc Mon Dec 22 00:31:13 2008 -0800
@@ -624,6 +624,12 @@
DBUG_ENTER("close_thread_table");
DBUG_ASSERT(table->key_read == 0);
@@ -2198,9 +2207,9 @@ diff -r d35bd12bba15 sql/sql_base.cc
db_type table_type=table->s->db_type;
strmov(path,table->s->path);
free_io_cache(table);
-diff -r d35bd12bba15 sql/sql_class.cc
---- a/sql/sql_class.cc Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/sql_class.cc Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/sql_class.cc
+--- a/sql/sql_class.cc Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/sql_class.cc Mon Dec 22 00:31:13 2008 -0800
@@ -236,6 +236,13 @@
bzero(ha_data, sizeof(ha_data));
mysys_var=0;
@@ -2380,10 +2389,10 @@ diff -r d35bd12bba15 sql/sql_class.cc
}
-diff -r d35bd12bba15 sql/sql_class.h
---- a/sql/sql_class.h Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/sql_class.h Mon Dec 22 22:53:26 2008 -0800
-@@ -1292,6 +1292,8 @@
+diff -r 1270c564d514 sql/sql_class.h
+--- a/sql/sql_class.h Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/sql_class.h Mon Dec 22 00:31:13 2008 -0800
+@@ -1298,6 +1298,8 @@
first byte of the packet in do_command()
*/
enum enum_server_command command;
@@ -2392,7 +2401,7 @@ diff -r d35bd12bba15 sql/sql_class.h
uint32 server_id;
uint32 file_id; // for LOAD DATA INFILE
/*
-@@ -1481,6 +1483,8 @@
+@@ -1487,6 +1489,8 @@
/* variables.transaction_isolation is reset to this after each commit */
enum_tx_isolation session_tx_isolation;
enum_check_fields count_cuted_fields;
@@ -2401,7 +2410,7 @@ diff -r d35bd12bba15 sql/sql_class.h
DYNAMIC_ARRAY user_var_events; /* For user variables replication */
MEM_ROOT *user_var_events_alloc; /* Allocate above array elements here */
-@@ -1587,6 +1591,49 @@
+@@ -1593,6 +1597,49 @@
*/
LOG_INFO* current_linfo;
NET* slave_net; // network connection from slave -> m.
@@ -2451,7 +2460,7 @@ diff -r d35bd12bba15 sql/sql_class.h
/* Used by the sys_var class to store temporary values */
union
{
-@@ -1642,6 +1689,11 @@
+@@ -1648,6 +1695,11 @@
alloc_root.
*/
void init_for_queries();
@@ -2463,7 +2472,7 @@ diff -r d35bd12bba15 sql/sql_class.h
void change_user(void);
void cleanup(void);
void cleanup_after_query();
-@@ -1871,7 +1923,13 @@
+@@ -1877,7 +1929,13 @@
if (p_db_length)
*p_db_length= db_length;
return FALSE;
@@ -2477,7 +2486,7 @@ diff -r d35bd12bba15 sql/sql_class.h
public:
/**
-@@ -1915,6 +1973,11 @@
+@@ -1921,6 +1979,11 @@
MEM_ROOT main_mem_root;
};
@@ -2489,9 +2498,9 @@ diff -r d35bd12bba15 sql/sql_class.h
#define tmp_disable_binlog(A) \
{ulonglong tmp_disable_binlog__save_options= (A)->options; \
-diff -r d35bd12bba15 sql/sql_delete.cc
---- a/sql/sql_delete.cc Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/sql_delete.cc Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/sql_delete.cc
+--- a/sql/sql_delete.cc Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/sql_delete.cc Mon Dec 22 00:31:13 2008 -0800
@@ -358,6 +358,7 @@
send_ok(thd,deleted);
DBUG_PRINT("info",("%ld records deleted",(long) deleted));
@@ -2508,9 +2517,9 @@ diff -r d35bd12bba15 sql/sql_delete.cc
return 0;
}
-diff -r d35bd12bba15 sql/sql_insert.cc
---- a/sql/sql_insert.cc Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/sql_insert.cc Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/sql_insert.cc
+--- a/sql/sql_insert.cc Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/sql_insert.cc Mon Dec 22 00:31:13 2008 -0800
@@ -989,6 +989,7 @@
thd->row_count_func= info.copied + info.deleted + updated;
::send_ok(thd, (ulong) thd->row_count_func, id, buff);
@@ -2527,9 +2536,9 @@ diff -r d35bd12bba15 sql/sql_insert.cc
DBUG_RETURN(0);
}
-diff -r d35bd12bba15 sql/sql_lex.h
---- a/sql/sql_lex.h Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/sql_lex.h Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/sql_lex.h
+--- a/sql/sql_lex.h Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/sql_lex.h Mon Dec 22 00:31:13 2008 -0800
@@ -101,6 +101,9 @@
When a command is added here, be sure it's also added in mysqld.cc
in "struct show_var_st status_vars[]= {" ...
@@ -2540,9 +2549,9 @@ diff -r d35bd12bba15 sql/sql_lex.h
/* This should be the last !!! */
SQLCOM_END
};
-diff -r d35bd12bba15 sql/sql_parse.cc
---- a/sql/sql_parse.cc Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/sql_parse.cc Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/sql_parse.cc
+--- a/sql/sql_parse.cc Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/sql_parse.cc Mon Dec 22 00:31:13 2008 -0800
@@ -78,6 +78,12 @@
const char *table_name);
static bool check_show_create_table_access(THD *thd, TABLE_LIST *table);
@@ -3031,7 +3040,7 @@ diff -r d35bd12bba15 sql/sql_parse.cc
/*
Reset per-hour user resource limits when it has been more than
an hour since they were last checked
-@@ -1184,6 +1610,8 @@
+@@ -1184,6 +1607,8 @@
my_net_set_read_timeout(net, connect_timeout);
my_net_set_write_timeout(net, connect_timeout);
@@ -3040,7 +3049,7 @@ diff -r d35bd12bba15 sql/sql_parse.cc
if ((error=check_connection(thd)))
{ // Wrong permissions
if (error > 0)
-@@ -1193,8 +1621,22 @@
+@@ -1193,8 +1618,22 @@
my_sleep(1000); /* must wait after eof() */
#endif
statistic_increment(aborted_connects,&LOCK_status);
@@ -3063,7 +3072,7 @@ diff -r d35bd12bba15 sql/sql_parse.cc
#ifdef __NETWARE__
netware_reg_user(sctx->ip, sctx->user, "MySQL");
#endif
-@@ -1251,6 +1693,7 @@
+@@ -1251,6 +1690,7 @@
net->vio && net->error && net->report_error)
{
statistic_increment(aborted_threads, &LOCK_status);
@@ -3071,7 +3080,7 @@ diff -r d35bd12bba15 sql/sql_parse.cc
}
if (net->error && net->vio != 0 && net->report_error)
-@@ -1270,6 +1713,8 @@
+@@ -1270,6 +1710,8 @@
end_thread:
close_connection(thd, 0, 1);
@@ -3080,7 +3089,7 @@ diff -r d35bd12bba15 sql/sql_parse.cc
end_thread(thd,1);
/*
If end_thread returns, we are either running with --one-thread
-@@ -1601,6 +2046,13 @@
+@@ -1601,6 +2043,13 @@
thd->clear_error(); // Clear error message
@@ -3094,7 +3103,7 @@ diff -r d35bd12bba15 sql/sql_parse.cc
net_new_transaction(net);
packet_length= my_net_read(net);
-@@ -1759,6 +2211,9 @@
+@@ -1759,6 +2208,9 @@
}
thd->command=command;
@@ -3104,7 +3113,7 @@ diff -r d35bd12bba15 sql/sql_parse.cc
/*
Commands which always take a long time are logged into
the slow log only if opt_log_slow_admin_statements is set.
-@@ -4424,6 +4879,15 @@
+@@ -4424,6 +4876,15 @@
if (check_global_access(thd,RELOAD_ACL))
goto error;
@@ -3120,7 +3129,7 @@ diff -r d35bd12bba15 sql/sql_parse.cc
/*
reload_acl_and_cache() will tell us if we are allowed to write to the
binlog or not.
-@@ -4731,6 +5195,7 @@
+@@ -4731,6 +5192,7 @@
{
if (check_global_access(thd, SUPER_ACL))
{
@@ -3128,7 +3137,7 @@ diff -r d35bd12bba15 sql/sql_parse.cc
my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), "SUPER");
goto create_sp_error;
}
-@@ -5567,6 +6032,7 @@
+@@ -5567,6 +6029,7 @@
if (!no_errors)
{
const char *db_name= db ? db : thd->db;
@@ -3136,7 +3145,7 @@ diff -r d35bd12bba15 sql/sql_parse.cc
my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
sctx->priv_user, sctx->priv_host, db_name);
}
-@@ -5602,6 +6068,7 @@
+@@ -5602,6 +6065,7 @@
{ // We can never grant this
DBUG_PRINT("error",("No possible access"));
if (!no_errors)
@@ -3144,7 +3153,7 @@ diff -r d35bd12bba15 sql/sql_parse.cc
my_error(ER_ACCESS_DENIED_ERROR, MYF(0),
sctx->priv_user,
sctx->priv_host,
-@@ -5634,11 +6101,15 @@
+@@ -5634,11 +6098,15 @@
DBUG_PRINT("error",("Access denied"));
if (!no_errors)
@@ -3160,7 +3169,7 @@ diff -r d35bd12bba15 sql/sql_parse.cc
DBUG_RETURN(TRUE); /* purecov: tested */
#endif /* NO_EMBEDDED_ACCESS_CHECKS */
}
-@@ -5672,6 +6143,7 @@
+@@ -5672,6 +6140,7 @@
if ((thd->security_ctx->master_access & want_access))
return 0;
get_privilege_desc(command, sizeof(command), want_access);
@@ -3168,7 +3177,7 @@ diff -r d35bd12bba15 sql/sql_parse.cc
my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), command);
return 1;
#endif /* NO_EMBEDDED_ACCESS_CHECKS */
-@@ -5704,6 +6176,7 @@
+@@ -5704,6 +6173,7 @@
if (!thd->col_access && check_grant_db(thd, dst_db_name))
{
@@ -3176,7 +3185,7 @@ diff -r d35bd12bba15 sql/sql_parse.cc
my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
thd->security_ctx->priv_user,
thd->security_ctx->priv_host,
-@@ -5735,6 +6208,12 @@
+@@ -5735,6 +6205,12 @@
check_grant(thd, SELECT_ACL, dst_table, 2, UINT_MAX, FALSE);
}
@@ -3189,7 +3198,7 @@ diff -r d35bd12bba15 sql/sql_parse.cc
case SCH_OPEN_TABLES:
case SCH_VARIABLES:
case SCH_STATUS:
-@@ -5788,8 +6267,8 @@
+@@ -5788,8 +6264,8 @@
#ifndef NO_EMBEDDED_ACCESS_CHECKS
TABLE_LIST *org_tables= tables;
#endif
@@ -3199,7 +3208,7 @@ diff -r d35bd12bba15 sql/sql_parse.cc
/*
The check that first_not_own_table is not reached is for the case when
the given table list refers to the list for prelocking (contains tables
-@@ -5806,9 +6285,12 @@
+@@ -5806,9 +6282,12 @@
(want_access & ~(SELECT_ACL | EXTRA_ACL | FILE_ACL)))
{
if (!no_errors)
@@ -3212,7 +3221,7 @@ diff -r d35bd12bba15 sql/sql_parse.cc
return TRUE;
}
/*
-@@ -6317,6 +6799,30 @@
+@@ -6317,6 +6796,30 @@
*/
lex_start(thd);
mysql_reset_thd_for_next_command(thd);
@@ -3243,7 +3252,7 @@ diff -r d35bd12bba15 sql/sql_parse.cc
if (query_cache_send_result_to_client(thd, (char*) inBuf, length) <= 0)
{
-@@ -6396,6 +6902,39 @@
+@@ -6396,6 +6899,39 @@
*found_semicolon= NULL;
}
@@ -3283,7 +3292,7 @@ diff -r d35bd12bba15 sql/sql_parse.cc
DBUG_VOID_RETURN;
}
-@@ -7407,8 +7946,35 @@
+@@ -7407,8 +7943,35 @@
pthread_mutex_unlock(&LOCK_active_mi);
}
#endif
@@ -3321,9 +3330,9 @@ diff -r d35bd12bba15 sql/sql_parse.cc
*write_to_binlog= tmp_write_to_binlog;
return result;
}
-diff -r d35bd12bba15 sql/sql_prepare.cc
---- a/sql/sql_prepare.cc Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/sql_prepare.cc Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/sql_prepare.cc
+--- a/sql/sql_prepare.cc Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/sql_prepare.cc Mon Dec 22 00:31:13 2008 -0800
@@ -80,6 +80,9 @@
#else
#include <mysql_com.h>
@@ -3643,9 +3652,9 @@ diff -r d35bd12bba15 sql/sql_prepare.cc
DBUG_VOID_RETURN;
}
-diff -r d35bd12bba15 sql/sql_show.cc
---- a/sql/sql_show.cc Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/sql_show.cc Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/sql_show.cc
+--- a/sql/sql_show.cc Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/sql_show.cc Mon Dec 22 00:31:13 2008 -0800
@@ -530,6 +530,7 @@
sctx->master_access);
if (!(db_access & DB_ACLS) && (!grant_option || check_grant_db(thd,dbname)))
@@ -4066,9 +4075,9 @@ diff -r d35bd12bba15 sql/sql_show.cc
{"VARIABLES", variables_fields_info, create_schema_table, fill_variables,
make_old_format, 0, -1, -1, 1},
{"VIEWS", view_fields_info, create_schema_table,
-diff -r d35bd12bba15 sql/sql_update.cc
---- a/sql/sql_update.cc Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/sql_update.cc Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/sql_update.cc
+--- a/sql/sql_update.cc Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/sql_update.cc Mon Dec 22 00:31:13 2008 -0800
@@ -601,7 +601,8 @@
(thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated;
send_ok(thd, (ulong) thd->row_count_func,
@@ -4086,9 +4095,9 @@ diff -r d35bd12bba15 sql/sql_update.cc
+ thd->updated_row_count += thd->row_count_func;
return FALSE;
}
-diff -r d35bd12bba15 sql/sql_yacc.yy
---- a/sql/sql_yacc.yy Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/sql_yacc.yy Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/sql_yacc.yy
+--- a/sql/sql_yacc.yy Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/sql_yacc.yy Mon Dec 22 00:31:13 2008 -0800
@@ -523,6 +523,7 @@
%token CHECK_SYM
%token CIPHER_SYM
@@ -4224,9 +4233,9 @@ diff -r d35bd12bba15 sql/sql_yacc.yy
| USE_FRM {}
| VARIABLES {}
| VIEW_SYM {}
-diff -r d35bd12bba15 sql/structs.h
---- a/sql/structs.h Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/structs.h Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/structs.h
+--- a/sql/structs.h Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/structs.h Mon Dec 22 00:31:13 2008 -0800
@@ -273,6 +273,98 @@
time_t intime;
} USER_CONN;
@@ -4326,9 +4335,9 @@ diff -r d35bd12bba15 sql/structs.h
/* Bits in form->update */
#define REG_MAKE_DUPP 1 /* Make a copy of record when read */
#define REG_NEW_RECORD 2 /* Write a new record if not found */
-diff -r d35bd12bba15 sql/table.h
---- a/sql/table.h Mon Dec 22 22:51:44 2008 -0800
-+++ b/sql/table.h Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 sql/table.h
+--- a/sql/table.h Mon Dec 22 00:26:39 2008 -0800
++++ b/sql/table.h Mon Dec 22 00:31:13 2008 -0800
@@ -371,10 +371,12 @@
enum enum_schema_tables
{
@@ -4353,9 +4362,9 @@ diff -r d35bd12bba15 sql/table.h
SCH_VARIABLES,
SCH_VIEWS
};
-diff -r d35bd12bba15 strings/Makefile.in
---- a/strings/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/strings/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 strings/Makefile.in
+--- a/strings/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/strings/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -361,6 +361,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -4364,9 +4373,9 @@ diff -r d35bd12bba15 strings/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 support-files/MacOSX/Makefile.in
---- a/support-files/MacOSX/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/support-files/MacOSX/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 support-files/MacOSX/Makefile.in
+--- a/support-files/MacOSX/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/support-files/MacOSX/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -171,6 +171,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -4375,9 +4384,9 @@ diff -r d35bd12bba15 support-files/MacOSX/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 support-files/Makefile.in
---- a/support-files/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/support-files/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 support-files/Makefile.in
+--- a/support-files/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/support-files/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -191,6 +191,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -4386,9 +4395,9 @@ diff -r d35bd12bba15 support-files/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 support-files/RHEL4-SElinux/Makefile.in
---- a/support-files/RHEL4-SElinux/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/support-files/RHEL4-SElinux/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 support-files/RHEL4-SElinux/Makefile.in
+--- a/support-files/RHEL4-SElinux/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/support-files/RHEL4-SElinux/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -169,6 +169,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -4397,9 +4406,9 @@ diff -r d35bd12bba15 support-files/RHEL4-SElinux/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 tests/Makefile.in
---- a/tests/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/tests/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 tests/Makefile.in
+--- a/tests/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/tests/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -215,6 +215,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -4408,9 +4417,9 @@ diff -r d35bd12bba15 tests/Makefile.in
LIBS = @CLIENT_LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 tools/Makefile.in
---- a/tools/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/tools/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 tools/Makefile.in
+--- a/tools/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/tools/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -189,6 +189,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -4419,9 +4428,9 @@ diff -r d35bd12bba15 tools/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 vio/Makefile.in
---- a/vio/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/vio/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 vio/Makefile.in
+--- a/vio/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/vio/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -198,6 +198,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -4430,9 +4439,9 @@ diff -r d35bd12bba15 vio/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 win/Makefile.in
---- a/win/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/win/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 win/Makefile.in
+--- a/win/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/win/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -167,6 +167,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
@@ -4441,9 +4450,9 @@ diff -r d35bd12bba15 win/Makefile.in
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r d35bd12bba15 zlib/Makefile.in
---- a/zlib/Makefile.in Mon Dec 22 22:51:44 2008 -0800
-+++ b/zlib/Makefile.in Mon Dec 22 22:53:26 2008 -0800
+diff -r 1270c564d514 zlib/Makefile.in
+--- a/zlib/Makefile.in Mon Dec 22 00:26:39 2008 -0800
++++ b/zlib/Makefile.in Mon Dec 22 00:31:13 2008 -0800
@@ -206,6 +206,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/percona-server.git/commitdiff/431f68fe79a66d5dfdd53f2655709e6c925fbc22
More information about the pld-cvs-commit
mailing list