-diff -r 936d427a9a15 innobase/btr/btr0cur.c
+diff -ruN a/innobase/btr/btr0cur.c b/innobase/btr/btr0cur.c
--- a/innobase/btr/btr0cur.c Mon Dec 22 00:33:03 2008 -0800
+++ b/innobase/btr/btr0cur.c Mon Dec 22 00:33:11 2008 -0800
@@ -516,6 +516,14 @@
break;
}
-@@ -663,6 +671,12 @@
- btr_cur_add_path_info(cursor, height,
+@@ -664,6 +672,12 @@
root_height);
}
-+
+
+ /* Initializes status counters */
+ innobase_mysql_thd_init_innodb_scan_cont();
+ innobase_mysql_thd_init_innodb_scan_jump();
+ innobase_mysql_thd_init_innodb_scan_data();
+ innobase_mysql_thd_init_innodb_scan_garbage();
-
++
break;
}
-diff -r 936d427a9a15 innobase/btr/btr0pcur.c
+
+diff -ruN a/innobase/btr/btr0pcur.c b/innobase/btr/btr0pcur.c
--- a/innobase/btr/btr0pcur.c Mon Dec 22 00:33:03 2008 -0800
+++ b/innobase/btr/btr0pcur.c Mon Dec 22 00:33:11 2008 -0800
@@ -381,6 +381,7 @@
ulint next_page_no;
ulint space;
page_t* page;
-@@ -393,11 +394,22 @@
+@@ -393,12 +394,23 @@
cursor->old_stored = BTR_PCUR_OLD_NOT_STORED;
page = btr_pcur_get_page(cursor);
space = buf_frame_get_space_id(page);
ut_ad(next_page_no != FIL_NULL);
-+
+
+ if (next_page_no - page_no == 1) {
+ innobase_mysql_thd_increment_innodb_scan_cont(1);
+ } else {
+ page_get_data_size(page));
+ innobase_mysql_thd_increment_innodb_scan_garbage(
+ page_header_get_field(page, PAGE_GARBAGE));
-
++
next_page = btr_page_get(space, next_page_no, cursor->latch_mode, mtr);
ut_a(page_is_comp(next_page) == page_is_comp(page));
+ buf_block_align(next_page)->check_index_page_at_flush = TRUE;
@@ -427,6 +439,7 @@
record of the current page */
mtr_t* mtr) /* in: mtr */
ulint prev_page_no;
ulint space;
page_t* page;
-@@ -462,9 +475,20 @@
+@@ -462,10 +475,21 @@
btr_pcur_restore_position(latch_mode2, cursor, mtr);
page = btr_pcur_get_page(cursor);
prev_page_no = btr_page_get_prev(page, mtr);
space = buf_frame_get_space_id(page);
-+
+
+ if (page_no - prev_page_no == 1) {
+ innobase_mysql_thd_increment_innodb_scan_cont(1);
+ } else {
+ page_get_data_size(page));
+ innobase_mysql_thd_increment_innodb_scan_garbage(
+ page_header_get_field(page, PAGE_GARBAGE));
-
++
if (btr_pcur_is_before_first_on_page(cursor, mtr)
&& (prev_page_no != FIL_NULL)) {
-diff -r 936d427a9a15 innobase/btr/btr0sea.c
+
+diff -ruN a/innobase/btr/btr0sea.c b/innobase/btr/btr0sea.c
--- a/innobase/btr/btr0sea.c Mon Dec 22 00:33:03 2008 -0800
+++ b/innobase/btr/btr0sea.c Mon Dec 22 00:33:11 2008 -0800
-@@ -861,6 +861,12 @@
+@@ -888,6 +888,12 @@
buf_pool->n_page_gets++;
return(TRUE);
/*-------------------------------------------*/
-diff -r 936d427a9a15 innobase/include/btr0cur.h
+diff -ruN a/innobase/include/btr0cur.h b/innobase/include/btr0cur.h
--- a/innobase/include/btr0cur.h Mon Dec 22 00:33:03 2008 -0800
+++ b/innobase/include/btr0cur.h Mon Dec 22 00:33:11 2008 -0800
@@ -697,6 +697,17 @@
#ifndef UNIV_NONINL
#include "btr0cur.ic"
#endif
-diff -r 936d427a9a15 patch_info/innodb_check_fragmentation.info
+diff -ruN /dev/null b/patch_info/innodb_check_fragmentation.info
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patch_info/innodb_check_fragmentation.info Mon Dec 22 00:33:11 2008 -0800
@@ -0,0 +1,6 @@
+Author=Percona <info@percona.com>
+License=GPL
+Comment=The names are Innodb_scan_*
-diff -r 936d427a9a15 sql/ha_innodb.cc
+diff -ruN a/sql/ha_innodb.cc b/sql/ha_innodb.cc
--- a/sql/ha_innodb.cc Mon Dec 22 00:33:03 2008 -0800
+++ b/sql/ha_innodb.cc Mon Dec 22 00:33:11 2008 -0800
-@@ -760,6 +760,102 @@
+@@ -759,6 +759,102 @@
}
/*************************************************************************
Gets the InnoDB transaction handle for a MySQL handler object, creates
an InnoDB transaction struct if the corresponding MySQL thread struct still
lacks one. */
-diff -r 936d427a9a15 sql/mysqld.cc
+diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc Mon Dec 22 00:33:03 2008 -0800
+++ b/sql/mysqld.cc Mon Dec 22 00:33:11 2008 -0800
-@@ -6673,6 +6673,10 @@
+@@ -6777,6 +6777,10 @@
{"Handler_write", (char*) offsetof(STATUS_VAR, ha_write_count), SHOW_LONG_STATUS},
#ifdef HAVE_INNOBASE_DB
{"Innodb_", (char*) &innodb_status_variables, SHOW_VARS},
#endif /*HAVE_INNOBASE_DB*/
{"Key_blocks_not_flushed", (char*) &dflt_key_cache_var.global_blocks_changed, SHOW_KEY_CACHE_LONG},
{"Key_blocks_unused", (char*) &dflt_key_cache_var.blocks_unused, SHOW_KEY_CACHE_CONST_LONG},
-diff -r 936d427a9a15 sql/sql_class.h
+diff -ruN a/sql/sql_class.h b/sql/sql_class.h
--- a/sql/sql_class.h Mon Dec 22 00:33:03 2008 -0800
+++ b/sql/sql_class.h Mon Dec 22 00:33:11 2008 -0800
-@@ -729,6 +729,10 @@
+@@ -694,6 +694,10 @@
sense to add to the /global/ status variable counter.
*/
double last_query_cost;
export_vars.innodb_buffer_pool_read_requests= buf_pool->n_page_gets;
export_vars.innodb_buffer_pool_write_requests= srv_buf_pool_write_requests;
export_vars.innodb_buffer_pool_wait_free= srv_buf_pool_wait_free;
-diff -ruN a/mysql-test/r/innodb_dict_size_limit.result b/mysql-test/r/innodb_dict_size_limit.result
+diff -ruN /dev/null b/mysql-test/r/innodb_dict_size_limit.result
--- /dev/null 1970-01-01 09:00:00.000000000 +0900
+++ b/mysql-test/r/innodb_dict_size_limit.result 2009-08-27 18:42:59.000000000 +0900
@@ -0,0 +1,60 @@
+DROP TABLE `test_3`;
+DROP TABLE `test_2`;
+DROP TABLE `test_1`;
-diff -ruN a/mysql-test/t/innodb_dict_size_limit.test b/mysql-test/t/innodb_dict_size_limit.test
+diff -ruN /dev/null b/mysql-test/t/innodb_dict_size_limit.test
--- /dev/null 1970-01-01 09:00:00.000000000 +0900
+++ b/mysql-test/t/innodb_dict_size_limit.test 2009-08-27 18:42:59.000000000 +0900
@@ -0,0 +1,63 @@
+DROP TABLE `test_2`;
+DROP TABLE `test_1`;
+
-diff -ruN a/patch_info/innodb_dict_size_limit.info b/patch_info/innodb_dict_size_limit.info
+diff -ruN /dev/null b/patch_info/innodb_dict_size_limit.info
--- /dev/null 1970-01-01 09:00:00.000000000 +0900
+++ b/patch_info/innodb_dict_size_limit.info 2009-08-27 18:42:59.000000000 +0900
@@ -0,0 +1,9 @@
diff -ruN a/sql/ha_innodb.cc b/sql/ha_innodb.cc
--- a/sql/ha_innodb.cc 2009-08-27 18:42:17.000000000 +0900
+++ b/sql/ha_innodb.cc 2009-08-27 18:42:59.000000000 +0900
-@@ -288,6 +288,8 @@
+@@ -306,6 +306,8 @@
(char*) &export_vars.innodb_dblwr_pages_written, SHOW_LONG},
{"dblwr_writes",
(char*) &export_vars.innodb_dblwr_writes, SHOW_LONG},
diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc 2009-08-27 18:42:17.000000000 +0900
+++ b/sql/mysqld.cc 2009-08-27 18:42:59.000000000 +0900
-@@ -5101,6 +5101,7 @@
+@@ -5118,6 +5118,7 @@
OPT_INNODB_ADAPTIVE_CHECKPOINT,
OPT_INNODB_READ_IO_THREADS,
OPT_INNODB_WRITE_IO_THREADS,
OPT_INNODB_ADAPTIVE_HASH_INDEX,
OPT_FEDERATED,
OPT_INNODB_USE_LEGACY_CARDINALITY_ALGORITHM
-@@ -5464,6 +5465,10 @@
+@@ -5482,6 +5483,10 @@
"Number of background write I/O threads in InnoDB.",
(gptr*) &innobase_write_io_threads, (gptr*) &innobase_write_io_threads,
0, GET_LONG, REQUIRED_ARG, 8, 1, 64, 0, 0, 0},
diff -ruN a/sql/set_var.cc b/sql/set_var.cc
--- a/sql/set_var.cc 2009-08-27 18:42:17.000000000 +0900
+++ b/sql/set_var.cc 2009-08-27 18:42:59.000000000 +0900
-@@ -540,6 +540,8 @@
+@@ -541,6 +541,8 @@
sys_var_enum sys_innodb_adaptive_checkpoint("innodb_adaptive_checkpoint",
&srv_adaptive_checkpoint,
&innodb_adaptive_checkpoint_typelib, fix_innodb_adaptive_checkpoint);
sys_var_long_ptr sys_innodb_show_locks_held(
"innodb_show_locks_held",
&srv_show_locks_held);
-@@ -930,6 +932,7 @@
+@@ -936,6 +938,7 @@
&sys_innodb_read_ahead,
&sys_innodb_enable_unsafe_group_commit,
&sys_innodb_adaptive_checkpoint,
&sys_innodb_show_locks_held,
&sys_innodb_show_verbose_locks,
&sys_innodb_io_pattern_trace,
-@@ -1084,6 +1087,7 @@
+@@ -1090,6 +1093,7 @@
{sys_innodb_adaptive_checkpoint.name, (char*) &sys_innodb_adaptive_checkpoint, SHOW_SYS},
{"innodb_read_io_threads", (char*) &innobase_read_io_threads, SHOW_LONG},
{"innodb_write_io_threads", (char*) &innobase_write_io_threads, SHOW_LONG},
-diff -r 85e7025cf2d1 innobase/include/srv0srv.h
+diff -ruN a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h
--- a/innobase/include/srv0srv.h Fri Jul 03 15:41:41 2009 -0700
+++ b/innobase/include/srv0srv.h Fri Jul 03 15:41:47 2009 -0700
-@@ -146,6 +146,8 @@
- extern ulint srv_enable_unsafe_group_commit;
+@@ -147,6 +147,8 @@
extern uint srv_read_ahead;
extern uint srv_adaptive_checkpoint;
-+
-+extern ulint srv_extra_rsegments;
++extern ulint srv_extra_rsegments;
++
extern ulint srv_dict_size_limit;
-diff -r 85e7025cf2d1 innobase/include/trx0sys.h
+ extern volatile ibool srv_io_pattern;
+diff -ruN a/innobase/include/trx0sys.h b/innobase/include/trx0sys.h
--- a/innobase/include/trx0sys.h Fri Jul 03 15:41:41 2009 -0700
+++ b/innobase/include/trx0sys.h Fri Jul 03 15:41:47 2009 -0700
@@ -105,6 +105,13 @@
/********************************************************************
Looks for a free slot for a rollback segment in the trx system file copy. */
-diff -r 85e7025cf2d1 innobase/srv/srv0srv.c
+diff -ruN a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c
--- a/innobase/srv/srv0srv.c Fri Jul 03 15:41:41 2009 -0700
+++ b/innobase/srv/srv0srv.c Fri Jul 03 15:41:47 2009 -0700
-@@ -352,6 +352,8 @@
-
+@@ -353,6 +353,8 @@
uint srv_read_ahead = 3; /* 1: random 2: linear 3: Both */
uint srv_adaptive_checkpoint = 0; /* 0: none 1: reflex 2: estimate */
-+
-+ulint srv_extra_rsegments = 0; /* extra rseg for users */
++ulint srv_extra_rsegments = 0; /* extra rseg for users */
++
ulint srv_dict_size_limit = 0;
-diff -r 85e7025cf2d1 innobase/srv/srv0start.c
+ volatile ibool srv_io_pattern = FALSE;
+diff -ruN a/innobase/srv/srv0start.c b/innobase/srv/srv0start.c
--- a/innobase/srv/srv0start.c Fri Jul 03 15:41:41 2009 -0700
+++ b/innobase/srv/srv0start.c Fri Jul 03 15:41:47 2009 -0700
@@ -1418,6 +1418,8 @@
#ifdef UNIV_LOG_ARCHIVE
} else if (srv_archive_recovery) {
fprintf(stderr,
-diff -r 85e7025cf2d1 innobase/trx/trx0sys.c
+diff -ruN a/innobase/trx/trx0sys.c b/innobase/trx/trx0sys.c
--- a/innobase/trx/trx0sys.c Fri Jul 03 15:41:41 2009 -0700
+++ b/innobase/trx/trx0sys.c Fri Jul 03 15:41:47 2009 -0700
@@ -944,3 +944,28 @@
+ }
+ mtr_commit(&mtr);
+}
-diff -r 85e7025cf2d1 patch_info/innodb_extra_rseg.info
+diff -ruN /dev/null b/patch_info/innodb_extra_rseg.info
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patch_info/innodb_extra_rseg.info Fri Jul 03 15:41:47 2009 -0700
@@ -0,0 +1,6 @@
+Author=Percona <info@percona.com>
+License=GPL
+Comment
-diff -r 85e7025cf2d1 sql/ha_innodb.cc
+diff -ruN a/sql/ha_innodb.cc b/sql/ha_innodb.cc
--- a/sql/ha_innodb.cc Fri Jul 03 15:41:41 2009 -0700
+++ b/sql/ha_innodb.cc Fri Jul 03 15:41:47 2009 -0700
@@ -152,6 +152,7 @@
longlong innobase_buffer_pool_size, innobase_log_file_size;
/* The default values for the following char* start-up parameters
-@@ -1521,6 +1522,8 @@
+@@ -1506,6 +1507,8 @@
srv_n_read_io_threads = (ulint) innobase_read_io_threads;
srv_n_write_io_threads = (ulint) innobase_write_io_threads;
srv_lock_wait_timeout = (ulint) innobase_lock_wait_timeout;
srv_force_recovery = (ulint) innobase_force_recovery;
-diff -r 85e7025cf2d1 sql/ha_innodb.h
+diff -ruN a/sql/ha_innodb.h b/sql/ha_innodb.h
--- a/sql/ha_innodb.h Fri Jul 03 15:41:41 2009 -0700
+++ b/sql/ha_innodb.h Fri Jul 03 15:41:47 2009 -0700
@@ -205,6 +205,7 @@
extern long innobase_force_recovery;
extern long innobase_open_files;
extern char *innobase_data_home_dir, *innobase_data_file_path;
-diff -r 85e7025cf2d1 sql/mysqld.cc
+diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc Fri Jul 03 15:41:41 2009 -0700
+++ b/sql/mysqld.cc Fri Jul 03 15:41:47 2009 -0700
-@@ -5101,6 +5101,7 @@
+@@ -5118,6 +5118,7 @@
OPT_INNODB_ADAPTIVE_CHECKPOINT,
OPT_INNODB_READ_IO_THREADS,
OPT_INNODB_WRITE_IO_THREADS,
OPT_INNODB_DICT_SIZE_LIMIT,
OPT_INNODB_ADAPTIVE_HASH_INDEX,
OPT_FEDERATED,
-@@ -5465,6 +5466,10 @@
+@@ -5483,6 +5484,10 @@
"Number of background write I/O threads in InnoDB.",
(gptr*) &innobase_write_io_threads, (gptr*) &innobase_write_io_threads,
0, GET_LONG, REQUIRED_ARG, 8, 1, 64, 0, 0, 0},
{"innodb_dict_size_limit", OPT_INNODB_DICT_SIZE_LIMIT,
"Limit the allocated memory for dictionary cache. (0: unlimited)",
(gptr*) &srv_dict_size_limit, (gptr*) &srv_dict_size_limit, 0,
-diff -r 85e7025cf2d1 sql/set_var.cc
+diff -ruN a/sql/set_var.cc b/sql/set_var.cc
--- a/sql/set_var.cc Fri Jul 03 15:41:41 2009 -0700
+++ b/sql/set_var.cc Fri Jul 03 15:41:47 2009 -0700
-@@ -1087,6 +1087,7 @@
+@@ -1093,6 +1093,7 @@
{sys_innodb_adaptive_checkpoint.name, (char*) &sys_innodb_adaptive_checkpoint, SHOW_SYS},
{"innodb_read_io_threads", (char*) &innobase_read_io_threads, SHOW_LONG},
{"innodb_write_io_threads", (char*) &innobase_write_io_threads, SHOW_LONG},
{sys_innodb_dict_size_limit.name, (char*) &sys_innodb_dict_size_limit, SHOW_SYS},
{sys_innodb_io_pattern_trace.name, (char*) &sys_innodb_io_pattern_trace, SHOW_SYS},
{sys_innodb_io_pattern_trace_running.name, (char*) &sys_innodb_io_pattern_trace_running, SHOW_SYS},
-diff -r 85e7025cf2d1 sql/sql_show.cc
+diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
--- a/sql/sql_show.cc Fri Jul 03 15:41:41 2009 -0700
+++ b/sql/sql_show.cc Fri Jul 03 15:41:47 2009 -0700
@@ -39,6 +39,8 @@
}
/* We need to undef it in InnoDB */
#undef byte
-@@ -4180,6 +4182,45 @@
+@@ -4186,6 +4188,45 @@
DBUG_RETURN(returnable);
}
/*
Find schema_tables elment by name
-@@ -4996,6 +5037,16 @@
- {"INDEX_NAME", 32, MYSQL_TYPE_STRING, 0, 0, "index name"},
- {"N_READ", 11, MYSQL_TYPE_LONG, 0, 0, "read ios"},
+@@ -5004,6 +5045,16 @@
{"N_WRITE", 11, MYSQL_TYPE_LONG, 0, 0, "write ios"},
-+ {0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
-+};
+ {0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
+ };
+
+ST_FIELD_INFO innodb_rseg_fields_info[]=
+{
+ {"PAGE_NO", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, ""},
+ {"MAX_SIZE", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, ""},
+ {"CURR_SIZE", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, ""},
- {0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
- };
++ {0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
++};
#endif
-@@ -5177,6 +5228,8 @@
+
+ ST_FIELD_INFO variables_fields_info[]=
+@@ -5183,6 +5234,8 @@
#ifdef HAVE_INNOBASE_DB
{"INNODB_IO_PATTERN", innodb_io_pattern_field_info, create_schema_table,
innodb_io_pattern_fill_table, 0, 0, -1, -1, 0},
-diff -r ef44d8017b6b innobase/buf/buf0flu.c
+diff -ruN a/innobase/buf/buf0flu.c b/innobase/buf/buf0flu.c
--- a/innobase/buf/buf0flu.c Fri Jul 03 15:41:25 2009 -0700
+++ b/innobase/buf/buf0flu.c Fri Jul 03 15:41:32 2009 -0700
@@ -341,7 +341,7 @@
#endif
buf_flush_init_for_writing(block->frame, block->newest_modification,
block->space, block->offset);
-diff -r ef44d8017b6b innobase/fil/fil0fil.c
+diff -ruN a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c
--- a/innobase/fil/fil0fil.c Fri Jul 03 15:41:25 2009 -0700
+++ b/innobase/fil/fil0fil.c Fri Jul 03 15:41:32 2009 -0700
@@ -245,6 +245,7 @@
return(system);
}
-@@ -1437,6 +1441,23 @@
- }
+@@ -1440,6 +1444,23 @@
+ }
- mutex_exit(&(system->mutex));
-+}
-+
-+/********************************************************************
+ /********************************************************************
+Prints internal counters */
+
+void
+ fil_system->flush_types[FLUSH_FROM_LOG_IO_COMPLETE],
+ fil_system->flush_types[FLUSH_FROM_LOG_WRITE_UP_TO],
+ fil_system->flush_types[FLUSH_FROM_ARCHIVE]);
- }
-
- /********************************************************************
++}
++
++/********************************************************************
+ Initializes the ibuf data structure for space 0 == the system tablespace.
+ This can be called after the file space headers have been created and the
+ dictionary system has been initialized. */
@@ -2256,7 +2277,7 @@
os_thread_sleep(20000);
}
mem_free(space_ids);
-diff -r ef44d8017b6b innobase/include/fil0fil.h
+diff -ruN a/innobase/include/fil0fil.h b/innobase/include/fil0fil.h
--- a/innobase/include/fil0fil.h Fri Jul 03 15:41:25 2009 -0700
+++ b/innobase/include/fil0fil.h Fri Jul 03 15:41:32 2009 -0700
@@ -197,6 +197,13 @@
/**********************************************************************
Checks the consistency of the tablespace cache. */
-diff -r ef44d8017b6b innobase/include/log0log.h
+diff -ruN a/innobase/include/log0log.h b/innobase/include/log0log.h
--- a/innobase/include/log0log.h Fri Jul 03 15:41:25 2009 -0700
+++ b/innobase/include/log0log.h Fri Jul 03 15:41:32 2009 -0700
@@ -146,6 +146,22 @@
/**********************************************************
This function is called, e.g., when a transaction wants to commit. It checks
that the log has been written to the log file up to the last log entry written
-@@ -159,14 +175,21 @@
+@@ -159,9 +175,9 @@
be written, ut_dulint_max if not specified */
ulint wait, /* in: LOG_NO_WAIT, LOG_WAIT_ONE_GROUP,
or LOG_WAIT_ALL_GROUPS */
/********************************************************************
Does a syncronous flush of the log buffer to disk. */
+@@ -174,6 +190,13 @@
+
void
- log_buffer_flush_to_disk(void);
+ log_buffer_flush_maybe_sync(void);
+/*==========================*/
+/********************************************************************
+Flushes the log buffer. Forces it to disk depending on the value of
+
+void
+log_buffer_flush_maybe_sync(void);
- /*==========================*/
+ /*=============================*/
/********************************************************************
- Flushes the log buffer. Forces it to disk depending on the value of
+ Advances the smallest lsn for which there are unflushed dirty blocks in the
@@ -751,6 +774,12 @@
AND flushed to disk */
ulint n_pending_writes;/* number of currently pending flushes
/* NOTE on the 'flush' in names of the fields below: starting from
4.0.14, we separate the write of the log file and the actual fsync()
or other method to flush it to disk. The names below shhould really
-diff -r ef44d8017b6b innobase/log/log0log.c
+diff -ruN a/innobase/log/log0log.c b/innobase/log/log0log.c
--- a/innobase/log/log0log.c Fri Jul 03 15:41:25 2009 -0700
+++ b/innobase/log/log0log.c Fri Jul 03 15:41:32 2009 -0700
@@ -782,6 +782,15 @@
fil_close_all_files();
-@@ -3363,15 +3381,45 @@
+@@ -3363,16 +3381,46 @@
time_elapsed = 0.001 + difftime(current_time,
log_sys->last_printout_time);
fprintf(file,
log_sys->n_log_ios_old = log_sys->n_log_ios;
log_sys->last_printout_time = current_time;
-+
+
+ fprintf(file,
+ "log sync callers: %lu buffer pool, background %lu sync and %lu async, "
+ "%lu internal, checkpoint %lu sync and %lu async, %lu archive, "
+ log_sys->log_sync_syncers[LOG_WRITE_FROM_LOG_ARCHIVE],
+ log_sys->log_sync_syncers[LOG_WRITE_FROM_COMMIT_SYNC],
+ log_sys->log_sync_syncers[LOG_WRITE_FROM_COMMIT_ASYNC]);
-
++
mutex_exit(&(log_sys->mutex));
}
-diff -r ef44d8017b6b innobase/srv/srv0srv.c
+
+diff -ruN a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c
--- a/innobase/srv/srv0srv.c Fri Jul 03 15:41:25 2009 -0700
+++ b/innobase/srv/srv0srv.c Fri Jul 03 15:41:32 2009 -0700
@@ -1698,6 +1698,12 @@
"SEMAPHORES\n"
"----------\n", file);
sync_print(file);
-diff -r ef44d8017b6b innobase/trx/trx0sys.c
+diff -ruN a/innobase/trx/trx0sys.c b/innobase/trx/trx0sys.c
--- a/innobase/trx/trx0sys.c Fri Jul 03 15:41:25 2009 -0700
+++ b/innobase/trx/trx0sys.c Fri Jul 03 15:41:32 2009 -0700
@@ -511,7 +511,7 @@
leave_func:
ut_free(unaligned_read_buf);
-diff -r ef44d8017b6b innobase/trx/trx0trx.c
+diff -ruN a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c
--- a/innobase/trx/trx0trx.c Fri Jul 03 15:41:25 2009 -0700
+++ b/innobase/trx/trx0trx.c Fri Jul 03 15:41:32 2009 -0700
@@ -942,19 +942,21 @@
} else {
ut_error;
}
-@@ -1948,19 +1953,21 @@
+@@ -1946,19 +1951,21 @@
if (srv_unix_file_flush_method == SRV_UNIX_NOSYNC) {
/* Write the log but do not flush it to disk */
} else {
ut_error;
}
-diff -r ef44d8017b6b patch_info/innodb_fsync_source.info
+diff -ruN /dev/null b/patch_info/innodb_fsync_source.info
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patch_info/innodb_fsync_source.info Fri Jul 03 15:41:32 2009 -0700
@@ -0,0 +1,9 @@
SRV_MAX_N_PENDING_SYNC_IOS);
}
-diff -ruN a/patch_info/innodb_io_patches.info b/patch_info/innodb_io_patches.info
+diff -ruN /dev/null 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-07-02 16:44:49.000000000 +0900
@@ -0,0 +1,11 @@
longlong innobase_buffer_pool_size, innobase_log_file_size;
/* The default values for the following char* start-up parameters
-@@ -1417,6 +1418,8 @@
+@@ -1402,6 +1403,8 @@
srv_mem_pool_size = (ulint) innobase_additional_mem_pool_size;
srv_n_file_io_threads = (ulint) innobase_file_io_threads;
diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc 2009-07-02 16:43:23.000000000 +0900
+++ b/sql/mysqld.cc 2009-07-02 18:00:04.000000000 +0900
-@@ -5086,6 +5086,16 @@
+@@ -5103,6 +5103,16 @@
OPT_INNODB_ROLLBACK_ON_TIMEOUT,
OPT_SECURE_FILE_PRIV,
OPT_KEEP_FILES_ON_CREATE,
OPT_INNODB_ADAPTIVE_HASH_INDEX,
OPT_FEDERATED,
OPT_INNODB_USE_LEGACY_CARDINALITY_ALGORITHM
-@@ -5403,6 +5413,44 @@
+@@ -5421,6 +5431,44 @@
(gptr*) &srv_use_legacy_cardinality_algorithm,
(gptr*) &srv_use_legacy_cardinality_algorithm,
0, GET_BOOL, OPT_ARG, 1, 0, 0, 0, 0, 0},
#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,
-@@ -7644,6 +7692,38 @@
+@@ -7666,6 +7714,38 @@
case OPT_INNODB_LOG_ARCHIVE:
innobase_log_archive= argument ? test(atoi(argument)) : 1;
break;
diff -ruN a/sql/set_var.cc b/sql/set_var.cc
--- a/sql/set_var.cc 2009-07-02 16:43:23.000000000 +0900
+++ b/sql/set_var.cc 2009-07-02 17:45:29.000000000 +0900
-@@ -489,6 +489,57 @@
+@@ -490,6 +490,57 @@
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_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",
-@@ -860,6 +911,13 @@
+@@ -866,6 +917,13 @@
&sys_innodb_thread_concurrency,
&sys_innodb_commit_concurrency,
&sys_innodb_flush_log_at_trx_commit,
#endif
&sys_trust_routine_creators,
&sys_trust_function_creators,
-@@ -997,6 +1055,16 @@
+@@ -1003,6 +1061,16 @@
{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_use_legacy_cardinality_algorithm.name,
(char*) &sys_innodb_use_legacy_cardinality_algorithm, SHOW_SYS},
#endif
-@@ -1459,6 +1527,18 @@
+@@ -1466,6 +1534,18 @@
}
}
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);
-@@ -1148,6 +1153,10 @@
+@@ -1170,6 +1175,10 @@
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);
-diff -r d4826c0a98c2 include/mysql_com.h
+diff -ruN a/include/mysql_com.h b/include/mysql_com.h
--- a/include/mysql_com.h Wed Jul 29 09:58:58 2009 -0700
+++ b/include/mysql_com.h Wed Jul 29 10:00:12 2009 -0700
-@@ -122,6 +122,9 @@
+@@ -123,6 +123,9 @@
#define REFRESH_DES_KEY_FILE 0x40000L
#define REFRESH_USER_RESOURCES 0x80000L
#define CLIENT_LONG_PASSWORD 1 /* new more secure passwords */
#define CLIENT_FOUND_ROWS 2 /* Found instead of affected rows */
#define CLIENT_LONG_FLAG 4 /* Get all column flags */
-diff -r d4826c0a98c2 innobase/buf/buf0buf.c
+diff -ruN a/innobase/buf/buf0buf.c b/innobase/buf/buf0buf.c
--- a/innobase/buf/buf0buf.c Wed Jul 29 09:58:58 2009 -0700
+++ b/innobase/buf/buf0buf.c Wed Jul 29 10:00:12 2009 -0700
@@ -654,6 +654,9 @@
+ }
+ mutex_exit(&(buf_pool->mutex));
+}
-diff -r d4826c0a98c2 innobase/include/buf0buf.h
+diff -ruN a/innobase/include/buf0buf.h b/innobase/include/buf0buf.h
--- a/innobase/include/buf0buf.h Wed Jul 29 09:58:58 2009 -0700
+++ b/innobase/include/buf0buf.h Wed Jul 29 10:00:12 2009 -0700
@@ -709,6 +709,18 @@
/* States of a control block */
#define BUF_BLOCK_NOT_USED 211 /* is in the free list */
#define BUF_BLOCK_READY_FOR_USE 212 /* when buf_get_free_block returns
-diff -r d4826c0a98c2 innobase/include/buf0types.h
+diff -ruN a/innobase/include/buf0types.h b/innobase/include/buf0types.h
--- a/innobase/include/buf0types.h Wed Jul 29 09:58:58 2009 -0700
+++ b/innobase/include/buf0types.h Wed Jul 29 10:00:12 2009 -0700
@@ -12,6 +12,8 @@
/* The 'type' used of a buffer frame */
typedef byte buf_frame_t;
-diff -r d4826c0a98c2 innobase/include/srv0srv.h
+diff -ruN a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h
--- a/innobase/include/srv0srv.h Wed Jul 29 09:58:58 2009 -0700
+++ b/innobase/include/srv0srv.h Wed Jul 29 10:00:12 2009 -0700
@@ -146,6 +146,11 @@
/*-------------------------------------------*/
extern ulint srv_n_rows_inserted;
-diff -r d4826c0a98c2 innobase/srv/srv0srv.c
+diff -ruN a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c
--- a/innobase/srv/srv0srv.c Wed Jul 29 09:58:58 2009 -0700
+++ b/innobase/srv/srv0srv.c Wed Jul 29 10:00:12 2009 -0700
@@ -352,6 +352,11 @@
/*-------------------------------------------*/
ulong srv_n_spin_wait_rounds = 20;
ulong srv_n_free_tickets_to_enter = 500;
-diff -r d4826c0a98c2 mysql-test/r/information_schema.result
+diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
--- a/mysql-test/r/information_schema.result Wed Jul 29 09:58:58 2009 -0700
+++ b/mysql-test/r/information_schema.result Wed Jul 29 10:00:12 2009 -0700
@@ -59,6 +59,7 @@
KEY_COLUMN_USAGE information_schema.KEY_COLUMN_USAGE 1
PROCESSLIST information_schema.PROCESSLIST 1
PROFILING information_schema.PROFILING 1
-diff -r d4826c0a98c2 mysql-test/r/information_schema_db.result
+diff -ruN a/mysql-test/r/information_schema_db.result b/mysql-test/r/information_schema_db.result
--- a/mysql-test/r/information_schema_db.result Wed Jul 29 09:58:58 2009 -0700
+++ b/mysql-test/r/information_schema_db.result Wed Jul 29 10:00:12 2009 -0700
@@ -28,6 +28,7 @@
show tables from INFORMATION_SCHEMA like 'T%';
Tables_in_information_schema (T%)
TABLES
-diff -r d4826c0a98c2 mysql-test/r/mysqlshow.result
+diff -ruN a/mysql-test/r/mysqlshow.result b/mysql-test/r/mysqlshow.result
--- a/mysql-test/r/mysqlshow.result Wed Jul 29 09:58:58 2009 -0700
+++ b/mysql-test/r/mysqlshow.result Wed Jul 29 10:00:12 2009 -0700
@@ -102,6 +102,7 @@
+---------------------------------------+
Wildcard: inf_rmation_schema
+--------------------+
-diff -r d4826c0a98c2 patch_info/innodb_io_pattern.info
+diff -ruN /dev/null b/patch_info/innodb_io_pattern.info
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patch_info/innodb_io_pattern.info Wed Jul 29 10:00:12 2009 -0700
@@ -0,0 +1,8 @@
+Comment=INFORMATION_SCHEMA.INNODB_IO_PATTERN
+2008-12-01
+YK: fix for mysql-test
-diff -r d4826c0a98c2 sql/ha_innodb.cc
+diff -ruN a/sql/ha_innodb.cc b/sql/ha_innodb.cc
--- a/sql/ha_innodb.cc Wed Jul 29 09:58:58 2009 -0700
+++ b/sql/ha_innodb.cc Wed Jul 29 10:00:12 2009 -0700
-@@ -1583,6 +1583,8 @@
+@@ -1568,6 +1568,8 @@
pthread_cond_init(&commit_cond, NULL);
innodb_inited= 1;
/* If this is a replication slave and we needed to do a crash recovery,
set the master binlog position to what InnoDB internally knew about
how far we got transactions durable inside InnoDB. There is a
-@@ -6551,6 +6553,28 @@
+@@ -6548,6 +6550,28 @@
}
/****************************************************************************
Implements the SHOW INNODB STATUS command. Sends the output of the InnoDB
Monitor to the client. */
-diff -r d4826c0a98c2 sql/ha_innodb.h
+diff -ruN a/sql/ha_innodb.h b/sql/ha_innodb.h
--- a/sql/ha_innodb.h Wed Jul 29 09:58:58 2009 -0700
+++ b/sql/ha_innodb.h Wed Jul 29 10:00:12 2009 -0700
@@ -245,6 +245,9 @@
void innobase_release_temporary_latches(THD *thd);
void innobase_store_binlog_offset_and_flush_log(char *binlog_name,longlong offset);
-diff -r d4826c0a98c2 sql/lex.h
+diff -ruN a/sql/lex.h b/sql/lex.h
--- a/sql/lex.h Wed Jul 29 09:58:58 2009 -0700
+++ b/sql/lex.h Wed Jul 29 10:00:12 2009 -0700
@@ -244,6 +244,7 @@
{ "INOUT", SYM(INOUT_SYM)},
{ "INSENSITIVE", SYM(INSENSITIVE_SYM)},
{ "INSERT", SYM(INSERT)},
-diff -r d4826c0a98c2 sql/mysqld.cc
+diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc Wed Jul 29 09:58:58 2009 -0700
+++ b/sql/mysqld.cc Wed Jul 29 10:00:12 2009 -0700
-@@ -5029,6 +5029,9 @@
+@@ -5046,6 +5046,9 @@
OPT_INNODB_SYNC_SPIN_LOOPS,
OPT_INNODB_CONCURRENCY_TICKETS,
OPT_INNODB_THREAD_SLEEP_DELAY,
OPT_BDB_CACHE_SIZE,
OPT_BDB_LOG_BUFFER_SIZE,
OPT_BDB_MAX_LOCK,
-@@ -5461,6 +5464,18 @@
+@@ -5479,6 +5482,18 @@
"Number of background write I/O threads in InnoDB.",
(gptr*) &innobase_write_io_threads, (gptr*) &innobase_write_io_threads,
0, GET_LONG, REQUIRED_ARG, 8, 1, 64, 0, 0, 0},
#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 d4826c0a98c2 sql/set_var.cc
+diff -ruN a/sql/set_var.cc b/sql/set_var.cc
--- a/sql/set_var.cc Wed Jul 29 09:58:58 2009 -0700
+++ b/sql/set_var.cc Wed Jul 29 10:00:12 2009 -0700
-@@ -546,6 +546,12 @@
+@@ -547,6 +547,12 @@
sys_var_long_ptr sys_innodb_show_verbose_locks(
"innodb_show_verbose_locks",
&srv_show_verbose_locks);
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",
-@@ -926,6 +932,9 @@
+@@ -932,6 +938,9 @@
&sys_innodb_adaptive_checkpoint,
&sys_innodb_show_locks_held,
&sys_innodb_show_verbose_locks,
#endif
&sys_trust_routine_creators,
&sys_trust_function_creators,
-@@ -1075,6 +1084,9 @@
+@@ -1081,6 +1090,9 @@
{sys_innodb_adaptive_checkpoint.name, (char*) &sys_innodb_adaptive_checkpoint, SHOW_SYS},
{"innodb_read_io_threads", (char*) &innobase_read_io_threads, SHOW_LONG},
{"innodb_write_io_threads", (char*) &innobase_write_io_threads, SHOW_LONG},
{sys_innodb_use_legacy_cardinality_algorithm.name,
(char*) &sys_innodb_use_legacy_cardinality_algorithm, SHOW_SYS},
#endif
-@@ -3210,6 +3222,19 @@
+@@ -3217,6 +3229,19 @@
thd->variables.lc_time_names= global_system_variables.lc_time_names;
}
/*
Functions to update thd->options bits
*/
-diff -r d4826c0a98c2 sql/set_var.h
+diff -ruN a/sql/set_var.h b/sql/set_var.h
--- a/sql/set_var.h Wed Jul 29 09:58:58 2009 -0700
+++ b/sql/set_var.h Wed Jul 29 10:00:12 2009 -0700
@@ -1012,6 +1012,17 @@
/****************************************************************************
Classes for parsing of the SET command
****************************************************************************/
-diff -r d4826c0a98c2 sql/sql_parse.cc
+diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
--- a/sql/sql_parse.cc Wed Jul 29 09:58:58 2009 -0700
+++ b/sql/sql_parse.cc Wed Jul 29 10:00:12 2009 -0700
-@@ -8104,6 +8104,13 @@
+@@ -8134,6 +8134,13 @@
}
pthread_mutex_unlock(&LOCK_global_user_client_stats);
}
*write_to_binlog= tmp_write_to_binlog;
return result;
}
-diff -r d4826c0a98c2 sql/sql_show.cc
+diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
--- a/sql/sql_show.cc Wed Jul 29 09:58:58 2009 -0700
+++ b/sql/sql_show.cc Wed Jul 29 10:00:12 2009 -0700
@@ -33,6 +33,17 @@
#ifndef NO_EMBEDDED_ACCESS_CHECKS
static const char *grant_names[]={
"select","insert","update","delete","create","drop","reload","shutdown",
-@@ -4108,6 +4119,72 @@
+@@ -4109,6 +4120,72 @@
DBUG_RETURN(res);
}
/*
Find schema_tables elment by name
-@@ -4914,6 +4986,19 @@
+@@ -4915,6 +4992,19 @@
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
};
ST_FIELD_INFO variables_fields_info[]=
{
-@@ -5089,6 +5174,10 @@
+@@ -5090,6 +5180,10 @@
make_old_format, 0, -1, -1, 1},
{"VIEWS", view_fields_info, create_schema_table,
get_all_tables, 0, get_schema_views_record, 1, 2, 0},
{0, 0, 0, 0, 0, 0, 0, 0, 0}
};
-diff -r d4826c0a98c2 sql/sql_yacc.yy
+diff -ruN a/sql/sql_yacc.yy b/sql/sql_yacc.yy
--- a/sql/sql_yacc.yy Wed Jul 29 09:58:58 2009 -0700
+++ b/sql/sql_yacc.yy Wed Jul 29 10:00:12 2009 -0700
-@@ -685,6 +685,7 @@
+@@ -719,6 +719,7 @@
%token INFILE
%token INNER_SYM
%token INNOBASE_SYM
%token INOUT_SYM
%token INSENSITIVE_SYM
%token INSERT
-@@ -8500,6 +8501,7 @@
+@@ -8526,6 +8527,7 @@
| MASTER_SYM { Lex->type|= REFRESH_MASTER; }
| DES_KEY_FILE { Lex->type|= REFRESH_DES_KEY_FILE; }
| RESOURCES { Lex->type|= REFRESH_USER_RESOURCES; }
| CLIENT_STATS_SYM { Lex->type|= REFRESH_CLIENT_STATS; }
| USER_STATS_SYM { Lex->type|= REFRESH_USER_STATS; }
| TABLE_STATS_SYM { Lex->type|= REFRESH_TABLE_STATS; }
-@@ -9552,6 +9554,7 @@
+@@ -9579,6 +9581,7 @@
| ISOLATION {}
| ISSUER_SYM {}
| INNOBASE_SYM {}
-diff -r e9fb5b8bcf78 innobase/include/srv0srv.h
+diff -ruN a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h
--- a/innobase/include/srv0srv.h Mon Jun 01 00:36:33 2009 -0700
+++ b/innobase/include/srv0srv.h Mon Jun 01 00:36:41 2009 -0700
@@ -80,6 +80,8 @@
extern byte srv_latin1_ordering[256];/* The sort order table of the latin1
character set */
-diff -r e9fb5b8bcf78 innobase/lock/lock0lock.c
+diff -ruN a/innobase/lock/lock0lock.c b/innobase/lock/lock0lock.c
--- a/innobase/lock/lock0lock.c Mon Jun 01 00:36:33 2009 -0700
+++ b/innobase/lock/lock0lock.c Mon Jun 01 00:36:41 2009 -0700
-@@ -4181,6 +4181,7 @@
+@@ -4156,6 +4156,7 @@
#endif /* UNIV_SYNC_DEBUG */
}
for (i = 0; i < lock_rec_get_n_bits(lock); i++) {
if (lock_rec_get_nth_bit(lock, i)) {
-@@ -4198,6 +4199,7 @@
+@@ -4173,6 +4174,7 @@
putc('\n', file);
}
}
mtr_commit(&mtr);
if (UNIV_LIKELY_NULL(heap)) {
-@@ -4369,7 +4371,7 @@
+@@ -4338,7 +4340,7 @@
}
}
nth_trx++;
goto loop;
}
-@@ -4426,9 +4428,9 @@
+@@ -4393,9 +4395,9 @@
nth_lock++;
file);
nth_trx++;
-diff -r e9fb5b8bcf78 innobase/srv/srv0srv.c
+diff -ruN a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c
--- a/innobase/srv/srv0srv.c Mon Jun 01 00:36:33 2009 -0700
+++ b/innobase/srv/srv0srv.c Mon Jun 01 00:36:41 2009 -0700
@@ -116,6 +116,8 @@
fputs("----------------------------\n"
"END OF INNODB MONITOR OUTPUT\n"
"============================\n", file);
-diff -r e9fb5b8bcf78 libmysqld/set_var.cc
+diff -ruN a/libmysqld/set_var.cc b/libmysqld/set_var.cc
--- a/libmysqld/set_var.cc Mon Jun 01 00:36:33 2009 -0700
+++ b/libmysqld/set_var.cc Mon Jun 01 00:36:41 2009 -0700
-@@ -825,6 +825,8 @@
+@@ -831,6 +831,8 @@
&sys_innodb_thread_concurrency,
&sys_innodb_commit_concurrency,
&sys_innodb_flush_log_at_trx_commit,
#endif
&sys_trust_routine_creators,
&sys_trust_function_creators,
-@@ -942,6 +944,8 @@
+@@ -948,6 +950,8 @@
{"innodb_file_io_threads", (char*) &innobase_file_io_threads, SHOW_LONG },
{"innodb_file_per_table", (char*) &innobase_file_per_table, SHOW_MY_BOOL},
{sys_innodb_flush_log_at_trx_commit.name, (char*) &sys_innodb_flush_log_at_trx_commit, SHOW_SYS},
{"innodb_flush_method", (char*) &innobase_unix_file_flush_method, SHOW_CHAR_PTR},
{"innodb_force_recovery", (char*) &innobase_force_recovery, SHOW_LONG },
{"innodb_lock_wait_timeout", (char*) &innobase_lock_wait_timeout, SHOW_LONG },
-diff -r e9fb5b8bcf78 patch_info/innodb_locks_held.info
+diff -ruN /dev/null b/patch_info/innodb_locks_held.info
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patch_info/innodb_locks_held.info Mon Jun 01 00:36:41 2009 -0700
@@ -0,0 +1,6 @@
+Author=Baron Schwartz <baron@xaprb.com>
+License=GPL
+Comment=Bug #29126 fix
-diff -r e9fb5b8bcf78 sql/ha_innodb.h
+diff -ruN a/sql/ha_innodb.h b/sql/ha_innodb.h
--- a/sql/ha_innodb.h Mon Jun 01 00:36:33 2009 -0700
+++ b/sql/ha_innodb.h Mon Jun 01 00:36:41 2009 -0700
@@ -243,6 +243,8 @@
/* An option to enable the fix for "Bug#43660 SHOW INDEXES/ANALYZE does
NOT update cardinality for indexes of InnoDB table". By default we are
-diff -r e9fb5b8bcf78 sql/mysqld.cc
+diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc Mon Jun 01 00:36:33 2009 -0700
+++ b/sql/mysqld.cc Mon Jun 01 00:36:41 2009 -0700
-@@ -5016,6 +5016,8 @@
+@@ -5032,6 +5032,8 @@
OPT_INNODB_MAX_PURGE_LAG,
OPT_INNODB_FILE_IO_THREADS,
OPT_INNODB_LOCK_WAIT_TIMEOUT,
OPT_INNODB_THREAD_CONCURRENCY,
OPT_INNODB_COMMIT_CONCURRENCY,
OPT_INNODB_FORCE_RECOVERY,
-@@ -5364,6 +5366,14 @@
+@@ -5379,6 +5381,14 @@
(gptr*) &srv_flush_log_at_trx_commit,
(gptr*) &srv_flush_log_at_trx_commit,
0, GET_ULONG, OPT_ARG, 1, 0, 2, 0, 0, 0},
{"innodb_flush_method", OPT_INNODB_FLUSH_METHOD,
"With which method to flush data.", (gptr*) &innobase_unix_file_flush_method,
(gptr*) &innobase_unix_file_flush_method, 0, GET_STR, REQUIRED_ARG, 0, 0, 0,
-diff -r e9fb5b8bcf78 sql/set_var.cc
+diff -ruN a/sql/set_var.cc b/sql/set_var.cc
--- a/sql/set_var.cc Mon Jun 01 00:36:33 2009 -0700
+++ b/sql/set_var.cc Mon Jun 01 00:36:41 2009 -0700
-@@ -527,6 +527,12 @@
+@@ -541,6 +541,12 @@
sys_var_enum sys_innodb_adaptive_checkpoint("innodb_adaptive_checkpoint",
&srv_adaptive_checkpoint,
&innodb_adaptive_checkpoint_typelib, fix_innodb_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",
-@@ -906,6 +912,8 @@
+@@ -924,6 +930,8 @@
&sys_innodb_read_ahead,
&sys_innodb_enable_unsafe_group_commit,
&sys_innodb_adaptive_checkpoint,
#endif
&sys_trust_routine_creators,
&sys_trust_function_creators,
-@@ -1023,6 +1031,8 @@
+@@ -1041,6 +1049,8 @@
{"innodb_file_io_threads", (char*) &innobase_file_io_threads, SHOW_LONG },
{"innodb_file_per_table", (char*) &innobase_file_per_table, SHOW_MY_BOOL},
{sys_innodb_flush_log_at_trx_commit.name, (char*) &sys_innodb_flush_log_at_trx_commit, SHOW_SYS},
-diff -ru mysql-5.0.84_p_orig/innobase/row/row0sel.c mysql-5.0.84/innobase/row/row0sel.c
---- mysql-5.0.84_p_orig/innobase/row/row0sel.c 2009-07-07 21:54:10.000000000 +0900
-+++ mysql-5.0.84/innobase/row/row0sel.c 2009-08-28 09:28:56.000000000 +0900
+diff -ruN a/innobase/row/row0sel.c b/innobase/row/row0sel.c
+--- a/innobase/row/row0sel.c 2009-07-07 21:54:10.000000000 +0900
++++ b/innobase/row/row0sel.c 2009-08-28 09:28:56.000000000 +0900
@@ -2988,6 +2988,15 @@
return(SEL_FOUND);
}
}
/* Note that if the search mode was GE or G, then the cursor
-diff -ru mysql-5.0.84_p_orig/sql/ha_innodb.cc mysql-5.0.84/sql/ha_innodb.cc
---- mysql-5.0.84_p_orig/sql/ha_innodb.cc 2009-08-27 16:06:21.000000000 +0900
-+++ mysql-5.0.84/sql/ha_innodb.cc 2009-08-28 09:33:38.000000000 +0900
-@@ -394,6 +394,18 @@
+diff -ruN a/sql/ha_innodb.cc b/sql/ha_innodb.cc
+--- a/sql/ha_innodb.cc 2009-08-27 16:06:21.000000000 +0900
++++ b/sql/ha_innodb.cc 2009-08-28 09:33:38.000000000 +0900
+@@ -412,6 +412,18 @@
}
}
ulint srv_n_data_files = 0;
char** srv_data_file_names = NULL;
ulint* srv_data_file_sizes = NULL; /* size in database pages */
-diff -ruN a/patch_info/innodb_recovery_patches.info b/patch_info/innodb_recovery_patches.info
+diff -ruN /dev/null b/patch_info/innodb_recovery_patches.info
--- /dev/null 1970-01-01 09:00:00.000000000 +0900
+++ b/patch_info/innodb_recovery_patches.info 2009-08-04 16:58:07.000000000 +0900
@@ -0,0 +1,6 @@
static char *internal_innobase_data_file_path = NULL;
-@@ -1534,6 +1535,8 @@
+@@ -1519,6 +1520,8 @@
srv_lock_wait_timeout = (ulint) innobase_lock_wait_timeout;
srv_force_recovery = (ulint) innobase_force_recovery;
diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc 2009-08-04 16:53:42.000000000 +0900
+++ b/sql/mysqld.cc 2009-08-04 17:48:25.000000000 +0900
-@@ -5102,6 +5102,7 @@
+@@ -5119,6 +5119,7 @@
OPT_INNODB_READ_IO_THREADS,
OPT_INNODB_WRITE_IO_THREADS,
OPT_INNODB_USE_SYS_MALLOC,
OPT_INNODB_THREAD_CONCURRENCY_TIMER_BASED,
OPT_INNODB_EXTRA_RSEGMENTS,
OPT_INNODB_DICT_SIZE_LIMIT,
-@@ -5347,6 +5348,10 @@
+@@ -5365,6 +5366,10 @@
{"innodb_doublewrite", OPT_INNODB_DOUBLEWRITE, "Enable InnoDB doublewrite buffer (enabled by default). \
Disable with --skip-innodb-doublewrite.", (gptr*) &innobase_use_doublewrite,
(gptr*) &innobase_use_doublewrite, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
diff -ruN a/sql/set_var.cc b/sql/set_var.cc
--- a/sql/set_var.cc 2009-08-04 16:53:42.000000000 +0900
+++ b/sql/set_var.cc 2009-08-04 17:51:49.000000000 +0900
-@@ -1088,6 +1088,7 @@
+@@ -1094,6 +1094,7 @@
{"innodb_read_io_threads", (char*) &innobase_read_io_threads, SHOW_LONG},
{"innodb_write_io_threads", (char*) &innobase_write_io_threads, SHOW_LONG},
{"innodb_use_sys_malloc", (char*) &innobase_use_sys_malloc, SHOW_MY_BOOL},
}
/***********************************************************************
-diff -ruN a/patch_info/innodb_rw_lock.info b/patch_info/innodb_rw_lock.info
+diff -ruN /dev/null b/patch_info/innodb_rw_lock.info
--- /dev/null 1970-01-01 09:00:00.000000000 +0900
+++ b/patch_info/innodb_rw_lock.info 2009-10-22 15:18:30.000000000 +0900
@@ -0,0 +1,6 @@
-diff -r fe944d2c6e1f innobase/btr/btr0btr.c
+diff -ruN a/innobase/btr/btr0btr.c b/innobase/btr/btr0btr.c
--- a/innobase/btr/btr0btr.c Mon Nov 10 19:47:27 2008 -0800
+++ b/innobase/btr/btr0btr.c Mon Nov 10 19:48:24 2008 -0800
@@ -2989,3 +2989,11 @@
+{
+ return btr_page_get_index_id(page);
+}
-diff -r fe944d2c6e1f innobase/buf/buf0buf.c
+diff -ruN a/innobase/buf/buf0buf.c b/innobase/buf/buf0buf.c
--- a/innobase/buf/buf0buf.c Mon Nov 10 19:47:27 2008 -0800
+++ b/innobase/buf/buf0buf.c Mon Nov 10 19:48:24 2008 -0800
-@@ -2629,3 +2629,13 @@
+@@ -2647,3 +2647,13 @@
buf_block_print(block);
}
+return buf_pool_get_nth_block(buf_pool, i);
+
+}
-diff -r fe944d2c6e1f innobase/include/btr0btr.h
+diff -ruN a/innobase/include/btr0btr.h b/innobase/include/btr0btr.h
--- a/innobase/include/btr0btr.h Mon Nov 10 19:47:27 2008 -0800
+++ b/innobase/include/btr0btr.h Mon Nov 10 19:48:24 2008 -0800
-@@ -69,6 +69,12 @@
- UNIV_INLINE
- dulint
- btr_page_get_index_id(
-+/*==================*/
-+ /* out: index id */
-+ page_t* page); /* in: index page */
-+
-+dulint
-+btr_page_get_index_id_noninline(
+@@ -72,6 +72,12 @@
/*==================*/
/* out: index id */
page_t* page); /* in: index page */
-diff -r fe944d2c6e1f innobase/include/buf0buf.h
++
++dulint
++btr_page_get_index_id_noninline(
++/*==================*/
++ /* out: index id */
++ page_t* page); /* in: index page */
+ /************************************************************
+ Gets the node level field in an index page. */
+ UNIV_INLINE
+diff -ruN a/innobase/include/buf0buf.h b/innobase/include/buf0buf.h
--- a/innobase/include/buf0buf.h Mon Nov 10 19:47:27 2008 -0800
+++ b/innobase/include/buf0buf.h Mon Nov 10 19:48:24 2008 -0800
-@@ -703,6 +703,8 @@
+@@ -706,6 +706,8 @@
buf_get_free_list_len(void);
/*=======================*/
/* The buffer control block structure */
-diff -r fe944d2c6e1f innobase/include/page0page.h
+diff -ruN a/innobase/include/page0page.h b/innobase/include/page0page.h
--- a/innobase/include/page0page.h Mon Nov 10 19:47:27 2008 -0800
+++ b/innobase/include/page0page.h Mon Nov 10 19:48:24 2008 -0800
@@ -260,6 +260,12 @@
/*******************************************************************
Returns the number of records before the given record in chain.
The number includes infimum and supremum records. */
-@@ -519,6 +525,12 @@
- UNIV_INLINE
- ulint
- page_get_data_size(
-+/*===============*/
-+ /* out: data in bytes */
-+ page_t* page); /* in: index page */
-+
-+ulint
-+page_get_data_size_noninline(
+@@ -522,6 +528,12 @@
/*===============*/
/* out: data in bytes */
page_t* page); /* in: index page */
-diff -r fe944d2c6e1f innobase/page/page0page.c
++
++ulint
++page_get_data_size_noninline(
++/*===============*/
++ /* out: data in bytes */
++ page_t* page); /* in: index page */
+ /****************************************************************
+ Allocates a block of memory from an index page. */
+
+diff -ruN a/innobase/page/page0page.c b/innobase/page/page0page.c
--- a/innobase/page/page0page.c Mon Nov 10 19:47:27 2008 -0800
+++ b/innobase/page/page0page.c Mon Nov 10 19:48:24 2008 -0800
@@ -1994,3 +1994,25 @@
+
+
+
-diff -r fe944d2c6e1f mysql-test/r/information_schema.result
+diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
--- a/mysql-test/r/information_schema.result Mon Nov 10 19:47:27 2008 -0800
+++ b/mysql-test/r/information_schema.result Mon Nov 10 19:48:25 2008 -0800
@@ -42,6 +42,7 @@
KEY_COLUMN_USAGE information_schema.KEY_COLUMN_USAGE 1
PROCESSLIST information_schema.PROCESSLIST 1
PROFILING information_schema.PROFILING 1
-diff -r fe944d2c6e1f mysql-test/r/information_schema_db.result
+diff -ruN a/mysql-test/r/information_schema_db.result b/mysql-test/r/information_schema_db.result
--- a/mysql-test/r/information_schema_db.result Mon Nov 10 19:47:27 2008 -0800
+++ b/mysql-test/r/information_schema_db.result Mon Nov 10 19:48:25 2008 -0800
@@ -11,6 +11,7 @@
INDEX_STATISTICS
KEY_COLUMN_USAGE
PROCESSLIST
-diff -r fe944d2c6e1f mysql-test/r/mysqlshow.result
+diff -ruN a/mysql-test/r/mysqlshow.result b/mysql-test/r/mysqlshow.result
--- a/mysql-test/r/mysqlshow.result Mon Nov 10 19:47:27 2008 -0800
+++ b/mysql-test/r/mysqlshow.result Mon Nov 10 19:48:25 2008 -0800
@@ -85,6 +85,7 @@
| INDEX_STATISTICS |
| KEY_COLUMN_USAGE |
| PROCESSLIST |
-diff -r fe944d2c6e1f patch_info/innodb_show_bp.info
+diff -ruN /dev/null b/patch_info/innodb_show_bp.info
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patch_info/innodb_show_bp.info Mon Nov 10 19:48:25 2008 -0800
@@ -0,0 +1,6 @@
+Author=Percona <info@percona.com>
+License=GPL
+Comment=
-diff -r fe944d2c6e1f sql/ha_innodb.cc
+diff -ruN a/sql/ha_innodb.cc b/sql/ha_innodb.cc
--- a/sql/ha_innodb.cc Mon Nov 10 19:47:27 2008 -0800
+++ b/sql/ha_innodb.cc Mon Nov 10 19:48:25 2008 -0800
@@ -128,10 +128,12 @@
#include "../innobase/include/trx0xa.h"
}
-@@ -6483,6 +6485,116 @@
+@@ -6557,6 +6559,116 @@
DBUG_RETURN(FALSE);
}
/****************************************************************************
Implements the SHOW MUTEX STATUS command. . */
-diff -r fe944d2c6e1f sql/ha_innodb.h
+diff -ruN a/sql/ha_innodb.h b/sql/ha_innodb.h
--- a/sql/ha_innodb.h Mon Nov 10 19:47:27 2008 -0800
+++ b/sql/ha_innodb.h Mon Nov 10 19:48:25 2008 -0800
-@@ -263,6 +263,7 @@
+@@ -274,6 +274,7 @@
int innobase_drop_database(char *path);
bool innodb_show_status(THD* thd);
bool innodb_mutex_show_status(THD* thd);
void innodb_export_status(void);
-diff -r fe944d2c6e1f sql/sql_parse.cc
+diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
--- a/sql/sql_parse.cc Mon Nov 10 19:47:27 2008 -0800
+++ b/sql/sql_parse.cc Mon Nov 10 19:48:25 2008 -0800
-@@ -2926,6 +2926,7 @@
+@@ -3037,6 +3037,7 @@
case SCH_COLUMN_PRIVILEGES:
case SCH_TABLE_CONSTRAINTS:
case SCH_KEY_COLUMN_USAGE:
default:
break;
}
-diff -r fe944d2c6e1f sql/sql_show.cc
+diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
--- a/sql/sql_show.cc Mon Nov 10 19:47:27 2008 -0800
+++ b/sql/sql_show.cc Mon Nov 10 19:48:25 2008 -0800
-@@ -27,6 +27,10 @@
-
- #ifdef HAVE_BERKELEY_DB
+@@ -29,6 +29,10 @@
#include "ha_berkeley.h" // For berkeley_show_logs
-+#endif
-+
-+#ifdef HAVE_INNOBASE_DB
-+#include "ha_innodb.h"
#endif
++#ifdef HAVE_INNOBASE_DB
++#include "ha_innodb.h"
++#endif
++
#ifndef NO_EMBEDDED_ACCESS_CHECKS
-@@ -4042,6 +4046,19 @@
+ static const char *grant_names[]={
+ "select","insert","update","delete","create","drop","reload","shutdown",
+@@ -4091,6 +4095,19 @@
DBUG_RETURN(res);
}
/*
Find schema_tables elment by name
-@@ -4951,6 +4962,24 @@
+@@ -4994,6 +5011,24 @@
};
/*
Description of ST_FIELD_INFO in table.h
*/
-@@ -4969,6 +4998,8 @@
+@@ -5012,6 +5047,8 @@
get_all_tables, make_columns_old_format, get_schema_column_record, 1, 2, 0},
{"COLUMN_PRIVILEGES", column_privileges_fields_info, create_schema_table,
fill_schema_column_privileges, 0, 0, -1, -1, 0},
{"INDEX_STATISTICS", index_stats_fields_info, create_schema_table,
fill_schema_index_stats, make_old_format, 0, -1, -1, 0},
{"KEY_COLUMN_USAGE", key_column_usage_fields_info, create_schema_table,
-diff -r fe944d2c6e1f sql/table.h
+diff -ruN a/sql/table.h b/sql/table.h
--- a/sql/table.h Mon Nov 10 19:47:27 2008 -0800
+++ b/sql/table.h Mon Nov 10 19:48:25 2008 -0800
-@@ -375,6 +375,7 @@
+@@ -376,6 +376,7 @@
SCH_COLLATION_CHARACTER_SET_APPLICABILITY,
SCH_COLUMNS,
SCH_COLUMN_PRIVILEGES,
-diff -ruN mysql-5.0.67_highperf/innobase/buf/buf0buf.c mysql-5.0.67_highperf_tmp/innobase/buf/buf0buf.c
---- mysql-5.0.67_highperf/innobase/buf/buf0buf.c 2008-11-12 09:25:58.000000000 +0900
-+++ mysql-5.0.67_highperf_tmp/innobase/buf/buf0buf.c 2008-11-12 09:27:52.000000000 +0900
-@@ -2454,13 +2454,15 @@
+diff -ruN a/innobase/buf/buf0buf.c b/innobase/buf/buf0buf.c
+--- a/innobase/buf/buf0buf.c 2008-11-12 09:25:58.000000000 +0900
++++ b/innobase/buf/buf0buf.c 2008-11-12 09:27:52.000000000 +0900
+@@ -2472,13 +2472,15 @@
(ulong) UT_LIST_GET_LEN(buf_pool->awe_LRU_free_mapped));
}
fprintf(file,
(ulong) UT_LIST_GET_LEN(buf_pool->free),
(ulong) UT_LIST_GET_LEN(buf_pool->LRU),
(ulong) UT_LIST_GET_LEN(buf_pool->flush_list),
-diff -ruN mysql-5.0.67_highperf/innobase/fil/fil0fil.c mysql-5.0.67_highperf_tmp/innobase/fil/fil0fil.c
---- mysql-5.0.67_highperf/innobase/fil/fil0fil.c 2008-11-12 09:26:07.000000000 +0900
-+++ mysql-5.0.67_highperf_tmp/innobase/fil/fil0fil.c 2008-11-12 09:27:52.000000000 +0900
+diff -ruN a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c
+--- a/innobase/fil/fil0fil.c 2008-11-12 09:26:07.000000000 +0900
++++ b/innobase/fil/fil0fil.c 2008-11-12 09:27:52.000000000 +0900
@@ -4472,3 +4472,30 @@
return(mach_read_from_2(page + FIL_PAGE_TYPE));
+ return 0;
+ }
+}
-diff -ruN mysql-5.0.67_highperf/innobase/include/fil0fil.h mysql-5.0.67_highperf_tmp/innobase/include/fil0fil.h
---- mysql-5.0.67_highperf/innobase/include/fil0fil.h 2008-11-12 09:26:07.000000000 +0900
-+++ mysql-5.0.67_highperf_tmp/innobase/include/fil0fil.h 2008-11-12 09:27:52.000000000 +0900
+diff -ruN a/innobase/include/fil0fil.h b/innobase/include/fil0fil.h
+--- a/innobase/include/fil0fil.h 2008-11-12 09:26:07.000000000 +0900
++++ b/innobase/include/fil0fil.h 2008-11-12 09:27:52.000000000 +0900
@@ -701,6 +701,16 @@
written to page, the return value not defined */
byte* page); /* in: file page */
typedef struct fil_space_struct fil_space_t;
-diff -ruN mysql-5.0.67_highperf/innobase/include/thr0loc.h mysql-5.0.67_highperf_tmp/innobase/include/thr0loc.h
---- mysql-5.0.67_highperf/innobase/include/thr0loc.h 2008-11-12 09:24:58.000000000 +0900
-+++ mysql-5.0.67_highperf_tmp/innobase/include/thr0loc.h 2008-11-12 09:27:52.000000000 +0900
-@@ -77,6 +77,17 @@
+diff -ruN a/innobase/include/thr0loc.h b/innobase/include/thr0loc.h
+--- a/innobase/include/thr0loc.h 2008-11-12 09:24:58.000000000 +0900
++++ b/innobase/include/thr0loc.h 2008-11-12 09:27:52.000000000 +0900
+@@ -60,6 +60,17 @@
/*=============================*/
/* out: pointer to the in_ibuf field */
#ifndef UNIV_NONINL
#include "thr0loc.ic"
#endif
-diff -ruN mysql-5.0.67_highperf/innobase/srv/srv0srv.c mysql-5.0.67_highperf_tmp/innobase/srv/srv0srv.c
---- mysql-5.0.67_highperf/innobase/srv/srv0srv.c 2008-11-12 09:26:07.000000000 +0900
-+++ mysql-5.0.67_highperf_tmp/innobase/srv/srv0srv.c 2008-11-12 09:54:19.000000000 +0900
-@@ -1645,6 +1645,14 @@
+diff -ruN a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c
+--- a/innobase/srv/srv0srv.c 2008-11-12 09:26:07.000000000 +0900
++++ b/innobase/srv/srv0srv.c 2008-11-12 09:54:19.000000000 +0900
+@@ -1675,6 +1675,14 @@
time_t current_time;
ulint n_reserved;
mutex_enter(&srv_innodb_monitor_mutex);
current_time = time(NULL);
-@@ -1747,6 +1755,91 @@
+@@ -1759,6 +1767,91 @@
ut_total_allocated_memory,
mem_pool_get_reserved(mem_comm_pool));
if (srv_use_awe) {
fprintf(file,
"In addition to that %lu MB of AWE memory allocated\n",
-diff -ruN mysql-5.0.67_highperf/innobase/thr/thr0loc.c mysql-5.0.67_highperf_tmp/innobase/thr/thr0loc.c
---- mysql-5.0.67_highperf/innobase/thr/thr0loc.c 2008-11-12 09:24:58.000000000 +0900
-+++ mysql-5.0.67_highperf_tmp/innobase/thr/thr0loc.c 2008-11-12 09:27:52.000000000 +0900
+diff -ruN a/innobase/thr/thr0loc.c b/innobase/thr/thr0loc.c
+--- a/innobase/thr/thr0loc.c 2008-11-12 09:24:58.000000000 +0900
++++ b/innobase/thr/thr0loc.c 2008-11-12 09:27:52.000000000 +0900
@@ -32,6 +32,7 @@
/* The hash table. The module is not yet initialized when it is NULL. */
/* The private data for each thread should be put to
the structure below and the accessor functions written
-@@ -223,6 +224,7 @@
+@@ -178,6 +179,7 @@
HASH_INSERT(thr_local_t, hash, thr_local_hash,
os_thread_pf(os_thread_get_curr_id()),
local);
mutex_exit(&thr_local_mutex);
}
-@@ -251,6 +253,7 @@
+@@ -206,6 +208,7 @@
HASH_DELETE(thr_local_t, hash, thr_local_hash,
os_thread_pf(id), local);
mutex_exit(&thr_local_mutex);
-@@ -274,3 +277,29 @@
+@@ -229,3 +232,29 @@
mutex_create(&thr_local_mutex);
mutex_set_level(&thr_local_mutex, SYNC_THR_LOCAL);
}
+ return 0;
+ }
+}
-diff -ruN mysql-5.0.67_highperf/patch_info/innodb_show_hashed_memory.info mysql-5.0.67_highperf_tmp/patch_info/innodb_show_hashed_memory.info
+diff -ruN /dev/null b/patch_info/innodb_show_hashed_memory.info
--- /dev/null 1970-01-01 09:00:00.000000000 +0900
-+++ mysql-5.0.67_highperf_tmp/patch_info/innodb_show_hashed_memory.info 2008-11-12 09:27:52.000000000 +0900
++++ b/patch_info/innodb_show_hashed_memory.info 2008-11-12 09:27:52.000000000 +0900
@@ -0,0 +1,6 @@
+File=innodb_show_hashed_memory.patch
+Name=Adds additional information of InnoDB internal hash table memories in SHOW INNODB STATUS
j += i;
}
-diff -ruN a/patch_info/innodb_split_buf_pool_mutex.info b/patch_info/innodb_split_buf_pool_mutex.info
+diff -ruN /dev/null b/patch_info/innodb_split_buf_pool_mutex.info
--- /dev/null 1970-01-01 09:00:00.000000000 +0900
+++ b/patch_info/innodb_split_buf_pool_mutex.info 2009-08-28 11:06:30.000000000 +0900
@@ -0,0 +1,6 @@
diff -ruN a/sql/ha_innodb.cc b/sql/ha_innodb.cc
--- a/sql/ha_innodb.cc 2009-08-28 11:08:17.000000000 +0900
+++ b/sql/ha_innodb.cc 2009-08-28 11:06:30.000000000 +0900
-@@ -1507,6 +1507,13 @@
+@@ -1504,6 +1504,13 @@
/* We set srv_pool_size here in units of 1 kB. InnoDB internally
changes the value so that it becomes the number of database pages. */
diff -ruN a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c
--- a/innobase/srv/srv0srv.c 2009-05-06 15:38:01.000000000 +0900
+++ b/innobase/srv/srv0srv.c 2009-05-06 17:12:54.000000000 +0900
-@@ -267,6 +267,7 @@
+@@ -273,6 +273,7 @@
computer. Bigger computers need bigger values. Value 0 will disable the
concurrency check. */
ulong srv_thread_concurrency = 0;
ulong srv_commit_concurrency = 0;
-@@ -1020,6 +1021,74 @@
+@@ -1026,6 +1027,74 @@
Puts an OS thread to wait if there are too many concurrent threads
(>= srv_thread_concurrency) inside InnoDB. The threads wait in a FIFO queue. */
void
srv_conc_enter_innodb(
/*==================*/
-@@ -1043,6 +1112,13 @@
+@@ -1049,6 +1118,13 @@
return;
}
os_fast_mutex_lock(&srv_conc_mutex);
retry:
if (trx->declared_to_be_inside_innodb) {
-@@ -1196,6 +1272,15 @@
+@@ -1202,6 +1278,15 @@
return;
}
os_fast_mutex_lock(&srv_conc_mutex);
srv_conc_n_threads++;
-@@ -1227,8 +1312,16 @@
+@@ -1233,8 +1318,16 @@
return;
}
/* Since InnoDB does not currently clean up all its internal data
structures in MySQL Embedded Server Library server_end(), we
print an error message if someone tries to start up InnoDB a
-diff -ruN a/patch_info/innodb_thread_concurrency_timer_based.info b/patch_info/innodb_thread_concurrency_timer_based.info
+diff -ruN /dev/null b/patch_info/innodb_thread_concurrency_timer_based.info
--- /dev/null 1970-01-01 09:00:00.000000000 +0900
+++ b/patch_info/innodb_thread_concurrency_timer_based.info 2009-05-06 17:17:12.000000000 +0900
@@ -0,0 +1,6 @@
long innobase_extra_rsegments;
longlong innobase_buffer_pool_size, innobase_log_file_size;
-@@ -1477,6 +1478,9 @@
+@@ -1476,6 +1477,9 @@
srv_n_log_files = (ulint) innobase_log_files_in_group;
srv_log_file_size = (ulint) innobase_log_file_size;
diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc 2009-05-06 15:38:01.000000000 +0900
+++ b/sql/mysqld.cc 2009-05-06 16:22:06.000000000 +0900
-@@ -5096,6 +5096,7 @@
+@@ -5118,6 +5118,7 @@
OPT_INNODB_ADAPTIVE_CHECKPOINT,
OPT_INNODB_READ_IO_THREADS,
OPT_INNODB_WRITE_IO_THREADS,
OPT_INNODB_EXTRA_RSEGMENTS,
OPT_INNODB_DICT_SIZE_LIMIT,
OPT_INNODB_ADAPTIVE_HASH_INDEX,
-@@ -5455,6 +5456,11 @@
+@@ -5484,6 +5485,11 @@
"Number of background write I/O threads in InnoDB.",
(gptr*) &innobase_write_io_threads, (gptr*) &innobase_write_io_threads,
0, GET_LONG, REQUIRED_ARG, 8, 1, 64, 0, 0, 0},
diff -ruN a/sql/set_var.cc b/sql/set_var.cc
--- a/sql/set_var.cc 2009-05-06 15:38:01.000000000 +0900
+++ b/sql/set_var.cc 2009-05-06 16:02:27.000000000 +0900
-@@ -1063,6 +1063,7 @@
+@@ -1093,6 +1093,7 @@
{sys_innodb_adaptive_checkpoint.name, (char*) &sys_innodb_adaptive_checkpoint, SHOW_SYS},
{"innodb_read_io_threads", (char*) &innobase_read_io_threads, SHOW_LONG},
{"innodb_write_io_threads", (char*) &innobase_write_io_threads, SHOW_LONG},
retry:
os_fast_mutex_lock(&ut_list_mutex);
-@@ -223,6 +236,11 @@
+@@ -223,6 +234,11 @@
{
ut_mem_block_t* block;
block = (ut_mem_block_t*)((byte*)ptr - sizeof(ut_mem_block_t));
os_fast_mutex_lock(&ut_list_mutex);
-@@ -275,6 +293,10 @@
+@@ -275,6 +291,10 @@
ulint min_size;
void* new_ptr;
if (ptr == NULL) {
return(ut_malloc(size));
-diff -ruN a/patch_info/innodb_use_sys_malloc.info b/patch_info/innodb_use_sys_malloc.info
+diff -ruN /dev/null b/patch_info/innodb_use_sys_malloc.info
--- /dev/null 1970-01-01 09:00:00.000000000 +0900
+++ b/patch_info/innodb_use_sys_malloc.info 2009-07-06 16:04:24.000000000 +0900
@@ -0,0 +1,6 @@
my_bool innobase_thread_concurrency_timer_based;
long innobase_extra_rsegments;
longlong innobase_buffer_pool_size, innobase_log_file_size;
-@@ -1492,6 +1493,8 @@
+@@ -1477,6 +1478,8 @@
srv_n_log_files = (ulint) innobase_log_files_in_group;
srv_log_file_size = (ulint) innobase_log_file_size;
diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc 2009-07-06 15:59:52.000000000 +0900
+++ b/sql/mysqld.cc 2009-07-06 16:16:56.000000000 +0900
-@@ -5102,6 +5102,7 @@
+@@ -5118,6 +5118,7 @@
OPT_INNODB_ADAPTIVE_CHECKPOINT,
OPT_INNODB_READ_IO_THREADS,
OPT_INNODB_WRITE_IO_THREADS,
OPT_INNODB_THREAD_CONCURRENCY_TIMER_BASED,
OPT_INNODB_EXTRA_RSEGMENTS,
OPT_INNODB_DICT_SIZE_LIMIT,
-@@ -5470,6 +5471,10 @@
+@@ -5485,6 +5486,10 @@
"Number of background write I/O threads in InnoDB.",
(gptr*) &innobase_write_io_threads, (gptr*) &innobase_write_io_threads,
0, GET_LONG, REQUIRED_ARG, 8, 1, 64, 0, 0, 0},
-diff -r e3b747e556c8 mysql-test/r/information_schema.result
+diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
--- a/mysql-test/r/information_schema.result Mon May 18 18:44:04 2009 -0700
+++ b/mysql-test/r/information_schema.result Mon May 18 18:48:11 2009 -0700
@@ -44,6 +44,7 @@
PROFILING information_schema.PROFILING 1
ROUTINES information_schema.ROUTINES 1
SCHEMATA information_schema.SCHEMATA 1
-diff -r e3b747e556c8 mysql-test/r/information_schema_db.result
+diff -ruN a/mysql-test/r/information_schema_db.result b/mysql-test/r/information_schema_db.result
--- a/mysql-test/r/information_schema_db.result Mon May 18 18:44:04 2009 -0700
+++ b/mysql-test/r/information_schema_db.result Mon May 18 18:48:11 2009 -0700
@@ -13,6 +13,7 @@
PROFILING
ROUTINES
SCHEMATA
-diff -r e3b747e556c8 mysql-test/r/mysqlshow.result
+diff -ruN a/mysql-test/r/mysqlshow.result b/mysql-test/r/mysqlshow.result
--- a/mysql-test/r/mysqlshow.result Mon May 18 18:44:04 2009 -0700
+++ b/mysql-test/r/mysqlshow.result Mon May 18 18:48:11 2009 -0700
@@ -87,6 +87,7 @@
| PROFILING |
| ROUTINES |
| SCHEMATA |
-diff -r e3b747e556c8 patch_info/microsec_process.info
+diff -ruN /dev/null b/patch_info/microsec_process.info
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patch_info/microsec_process.info Mon May 18 18:48:11 2009 -0700
@@ -0,0 +1,6 @@
+Author=Percona <info@percona.com>
+License=GPL
+Comment=
-diff -r e3b747e556c8 sql/mysql_priv.h
+diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h
--- a/sql/mysql_priv.h Mon May 18 18:44:04 2009 -0700
+++ b/sql/mysql_priv.h Mon May 18 18:48:11 2009 -0700
@@ -249,6 +249,8 @@
#define PRECISION_FOR_DOUBLE 53
#define PRECISION_FOR_FLOAT 24
-diff -r e3b747e556c8 sql/sql_show.cc
+diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
--- a/sql/sql_show.cc Mon May 18 18:44:04 2009 -0700
+++ b/sql/sql_show.cc Mon May 18 18:48:11 2009 -0700
-@@ -1480,6 +1480,122 @@
+@@ -1493,6 +1493,122 @@
DBUG_VOID_RETURN;
}
/*****************************************************************************
Status functions
*****************************************************************************/
-@@ -4849,6 +4965,22 @@
+@@ -4862,6 +4978,22 @@
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
};
/*
Description of ST_FIELD_INFO in table.h
*/
-@@ -4873,6 +5005,8 @@
+@@ -4886,6 +5018,8 @@
get_all_tables, 0, get_schema_key_column_usage_record, 4, 5, 0},
{"OPEN_TABLES", open_tables_fields_info, create_schema_table,
fill_open_tables, make_old_format, 0, -1, -1, 1},
{"PROFILING", query_profile_statistics_info, create_schema_table,
fill_query_profile_statistics_info, make_profile_table_for_show,
NULL, -1, -1, false},
-diff -r e3b747e556c8 sql/table.h
+diff -ruN a/sql/table.h b/sql/table.h
--- a/sql/table.h Mon May 18 18:44:04 2009 -0700
+++ b/sql/table.h Mon May 18 18:48:11 2009 -0700
@@ -379,6 +379,7 @@
-diff -r 1242d4575291 include/my_getopt.h
+diff -ruN a/include/my_getopt.h b/include/my_getopt.h
--- a/include/my_getopt.h Tue Jul 28 23:39:12 2009 -0700
+++ b/include/my_getopt.h Tue Jul 28 23:42:44 2009 -0700
@@ -28,7 +28,8 @@
#define GET_ASK_ADDR 128
#define GET_TYPE_MASK 127
-diff -r 1242d4575291 include/my_time.h
+diff -ruN a/include/my_time.h b/include/my_time.h
--- a/include/my_time.h Tue Jul 28 23:39:12 2009 -0700
+++ b/include/my_time.h Tue Jul 28 23:42:44 2009 -0700
@@ -140,7 +140,7 @@
C_MODE_END
#endif /* _my_time_h_ */
-diff -r 1242d4575291 innobase/buf/buf0buf.c
+diff -ruN a/innobase/buf/buf0buf.c b/innobase/buf/buf0buf.c
--- a/innobase/buf/buf0buf.c Tue Jul 28 23:39:12 2009 -0700
+++ b/innobase/buf/buf0buf.c Tue Jul 28 23:42:44 2009 -0700
@@ -37,6 +37,10 @@
return(TRUE);
}
-diff -r 1242d4575291 innobase/buf/buf0rea.c
+diff -ruN a/innobase/buf/buf0rea.c b/innobase/buf/buf0rea.c
--- a/innobase/buf/buf0rea.c Tue Jul 28 23:39:12 2009 -0700
+++ b/innobase/buf/buf0rea.c Tue Jul 28 23:42:44 2009 -0700
@@ -70,7 +70,8 @@
}
}
-diff -r 1242d4575291 innobase/fil/fil0fil.c
+diff -ruN a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c
--- a/innobase/fil/fil0fil.c Tue Jul 28 23:39:12 2009 -0700
+++ b/innobase/fil/fil0fil.c Tue Jul 28 23:42:44 2009 -0700
@@ -3527,7 +3527,7 @@
#endif
ut_a(ret);
-diff -r 1242d4575291 innobase/include/buf0rea.h
+diff -ruN a/innobase/include/buf0rea.h b/innobase/include/buf0rea.h
--- a/innobase/include/buf0rea.h Tue Jul 28 23:39:12 2009 -0700
+++ b/innobase/include/buf0rea.h Tue Jul 28 23:42:44 2009 -0700
@@ -10,6 +10,7 @@
/************************************************************************
Issues read requests for pages which the ibuf module wants to read in, in
order to contract the insert buffer tree. Technically, this function is like
-diff -r 1242d4575291 innobase/include/fil0fil.h
+diff -ruN a/innobase/include/fil0fil.h b/innobase/include/fil0fil.h
--- a/innobase/include/fil0fil.h Tue Jul 28 23:39:12 2009 -0700
+++ b/innobase/include/fil0fil.h Tue Jul 28 23:42:44 2009 -0700
@@ -534,8 +534,11 @@
/************************************************************************
Reads data from a space to a buffer. Remember that the possible incomplete
blocks at the end of file are ignored: they are not taken into account when
-diff -r 1242d4575291 innobase/include/os0file.h
+diff -ruN a/innobase/include/os0file.h b/innobase/include/os0file.h
--- a/innobase/include/os0file.h Tue Jul 28 23:39:12 2009 -0700
+++ b/innobase/include/os0file.h Tue Jul 28 23:42:44 2009 -0700
@@ -11,6 +11,8 @@
/****************************************************************************
Wakes up all async i/o threads so that they know to exit themselves in
shutdown. */
-diff -r 1242d4575291 innobase/include/srv0srv.h
+diff -ruN a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h
--- a/innobase/include/srv0srv.h Tue Jul 28 23:39:12 2009 -0700
+++ b/innobase/include/srv0srv.h Tue Jul 28 23:42:44 2009 -0700
@@ -27,6 +27,8 @@
/* This is set to TRUE if the MySQL user has set it in MySQL */
extern ibool srv_lower_case_table_names;
-diff -r 1242d4575291 innobase/include/trx0trx.h
+diff -ruN a/innobase/include/trx0trx.h b/innobase/include/trx0trx.h
--- a/innobase/include/trx0trx.h Tue Jul 28 23:39:12 2009 -0700
+++ b/innobase/include/trx0trx.h Tue Jul 28 23:42:44 2009 -0700
-@@ -668,6 +668,17 @@
+@@ -666,6 +666,17 @@
/*------------------------------*/
char detailed_error[256]; /* detailed error message for last
error, or empty. */
};
#define TRX_MAX_N_THREADS 32 /* maximum number of concurrent
-diff -r 1242d4575291 innobase/lock/lock0lock.c
+diff -ruN a/innobase/lock/lock0lock.c b/innobase/lock/lock0lock.c
--- a/innobase/lock/lock0lock.c Tue Jul 28 23:39:12 2009 -0700
+++ b/innobase/lock/lock0lock.c Tue Jul 28 23:42:44 2009 -0700
-@@ -1806,6 +1806,8 @@
+@@ -1781,6 +1781,8 @@
{
lock_t* lock;
trx_t* trx;
#ifdef UNIV_SYNC_DEBUG
ut_ad(mutex_own(&kernel_mutex));
-@@ -1861,6 +1863,10 @@
+@@ -1836,6 +1838,10 @@
trx->que_state = TRX_QUE_LOCK_WAIT;
trx->was_chosen_as_deadlock_victim = FALSE;
trx->wait_started = time(NULL);
ut_a(que_thr_stop(thr));
-@@ -3514,7 +3520,9 @@
+@@ -3489,7 +3495,9 @@
{
lock_t* lock;
trx_t* trx;
#ifdef UNIV_SYNC_DEBUG
ut_ad(mutex_own(&kernel_mutex));
#endif /* UNIV_SYNC_DEBUG */
-@@ -3564,6 +3572,10 @@
+@@ -3539,6 +3547,10 @@
return(DB_SUCCESS);
}
trx->que_state = TRX_QUE_LOCK_WAIT;
trx->was_chosen_as_deadlock_victim = FALSE;
trx->wait_started = time(NULL);
-diff -r 1242d4575291 innobase/os/os0file.c
+diff -ruN a/innobase/os/os0file.c b/innobase/os/os0file.c
--- a/innobase/os/os0file.c Tue Jul 28 23:39:12 2009 -0700
+++ b/innobase/os/os0file.c Tue Jul 28 23:42:44 2009 -0700
@@ -14,6 +14,8 @@
ulint offset, /* in: least significant 32 bits of file
offset from where to read */
- ulint offset_high) /* in: most significant 32 bits of
-- offset */
+ ulint offset_high, /* in: most significant 32 bits of
-+ offset */
+ offset */
+ trx_t* trx)
{
off_t offs;
if (type == OS_FILE_READ) {
if (os_aio_use_native_aio) {
#ifdef WIN_ASYNC_IO
-diff -r 1242d4575291 innobase/srv/srv0srv.c
+diff -ruN a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c
--- a/innobase/srv/srv0srv.c Tue Jul 28 23:39:12 2009 -0700
+++ b/innobase/srv/srv0srv.c Tue Jul 28 23:42:44 2009 -0700
@@ -48,6 +48,8 @@
os_fast_mutex_lock(&srv_conc_mutex);
srv_conc_n_waiting_threads--;
-diff -r 1242d4575291 innobase/trx/trx0trx.c
+diff -ruN a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c
--- a/innobase/trx/trx0trx.c Tue Jul 28 23:39:12 2009 -0700
+++ b/innobase/trx/trx0trx.c Tue Jul 28 23:42:44 2009 -0700
@@ -190,6 +190,15 @@
trx->que_state = TRX_QUE_RUNNING;
}
-diff -r 1242d4575291 mysys/my_getopt.c
+diff -ruN a/mysys/my_getopt.c b/mysys/my_getopt.c
--- a/mysys/my_getopt.c Tue Jul 28 23:39:12 2009 -0700
+++ b/mysys/my_getopt.c Tue Jul 28 23:42:44 2009 -0700
@@ -827,7 +827,8 @@
case GET_LL:
printf("%s\n", llstr(*((longlong*) value), buff));
break;
-diff -r 1242d4575291 patch_info/microslow_innodb.info
+diff -ruN /dev/null b/patch_info/microslow_innodb.info
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patch_info/microslow_innodb.info Tue Jul 28 23:42:44 2009 -0700
@@ -0,0 +1,15 @@
+
+2008-11
+Arjen Lentz: Fixups (backward compatibility) by Arjen Lentz <arjen@openquery.com.au>
-diff -r 1242d4575291 scripts/mysqldumpslow.sh
+diff -ruN a/scripts/mysqldumpslow.sh b/scripts/mysqldumpslow.sh
--- a/scripts/mysqldumpslow.sh Tue Jul 28 23:39:12 2009 -0700
+++ b/scripts/mysqldumpslow.sh Tue Jul 28 23:42:44 2009 -0700
@@ -83,8 +83,8 @@
$t -= $l unless $opt{l};
# remove fluff that mysqld writes to log when it (re)starts:
-diff -r 1242d4575291 sql-common/my_time.c
+diff -ruN a/sql-common/my_time.c b/sql-common/my_time.c
--- a/sql-common/my_time.c Tue Jul 28 23:39:12 2009 -0700
+++ b/sql-common/my_time.c Tue Jul 28 23:42:44 2009 -0700
-@@ -1253,3 +1253,37 @@
+@@ -1251,3 +1251,37 @@
return 0;
}
+ *ltime= newtime;
+ return newtime;
+}
-diff -r 1242d4575291 sql/filesort.cc
+diff -ruN a/sql/filesort.cc b/sql/filesort.cc
--- a/sql/filesort.cc Tue Jul 28 23:39:12 2009 -0700
+++ b/sql/filesort.cc Tue Jul 28 23:42:44 2009 -0700
-@@ -180,6 +180,7 @@
+@@ -182,6 +182,7 @@
{
statistic_increment(thd->status_var.filesort_scan_count, &LOCK_status);
}
#ifdef CAN_TRUST_RANGE
if (select && select->quick && select->quick->records > 0L)
{
-@@ -245,6 +246,7 @@
+@@ -247,6 +248,7 @@
}
else
{
if (table_sort.buffpek && table_sort.buffpek_len < maxbuffer)
{
x_free(table_sort.buffpek);
-@@ -1116,6 +1118,7 @@
+@@ -1118,6 +1120,7 @@
statistic_increment(current_thd->status_var.filesort_merge_passes,
&LOCK_status);
if (param->not_killable)
{
killed= ¬_killable;
-diff -r 1242d4575291 sql/ha_innodb.cc
+diff -ruN a/sql/ha_innodb.cc b/sql/ha_innodb.cc
--- a/sql/ha_innodb.cc Tue Jul 28 23:39:12 2009 -0700
+++ b/sql/ha_innodb.cc Tue Jul 28 23:42:44 2009 -0700
@@ -1,3 +1,4 @@
/* Copyright (C) 2000-2005 MySQL AB & Innobase Oy
This program is free software; you can redistribute it and/or modify
-@@ -819,9 +820,34 @@
+@@ -804,9 +805,34 @@
trx->check_unique_secondary = TRUE;
}
/*************************************************************************
Construct ha_innobase handler. */
-@@ -1324,6 +1350,8 @@
+@@ -1309,6 +1335,8 @@
/* -------------- Log files ---------------------------*/
/* The default dir for log files is the datadir of MySQL */
if (!innobase_log_group_home_dir) {
-@@ -4697,6 +4725,12 @@
+@@ -4687,6 +4715,12 @@
trx->check_unique_secondary = FALSE;
}
if (lower_case_table_names) {
srv_lower_case_table_names = TRUE;
} else {
-@@ -4962,6 +4996,12 @@
+@@ -4959,6 +4993,12 @@
trx->check_unique_secondary = FALSE;
}
name_len = strlen(name);
assert(name_len < 1000);
-@@ -5049,6 +5089,12 @@
+@@ -5046,6 +5086,12 @@
trx->check_foreigns = FALSE;
}
error = row_drop_database_for_mysql(namebuf, trx);
my_free(namebuf, MYF(0));
-@@ -5115,6 +5161,12 @@
+@@ -5112,6 +5158,12 @@
trx->check_foreigns = FALSE;
}
name_len1 = strlen(from);
name_len2 = strlen(to);
-@@ -6122,6 +6174,7 @@
+@@ -6119,6 +6171,7 @@
{
row_prebuilt_t* prebuilt = (row_prebuilt_t*) innobase_prebuilt;
trx_t* trx;
DBUG_ENTER("ha_innobase::external_lock");
DBUG_PRINT("enter",("lock_type: %d", lock_type));
-@@ -6245,7 +6298,24 @@
+@@ -6242,7 +6295,24 @@
if (trx->n_mysql_tables_in_use == 0) {
prebuilt->used_in_HANDLER = FALSE;
if (!(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) {
-diff -r 1242d4575291 sql/ha_innodb.h
+diff -ruN a/sql/ha_innodb.h b/sql/ha_innodb.h
--- a/sql/ha_innodb.h Tue Jul 28 23:39:12 2009 -0700
+++ b/sql/ha_innodb.h Tue Jul 28 23:42:44 2009 -0700
@@ -271,6 +271,8 @@
/***********************************************************************
This function is used to prepare X/Open XA distributed transaction */
-diff -r 1242d4575291 sql/log.cc
+diff -ruN a/sql/log.cc b/sql/log.cc
--- a/sql/log.cc Tue Jul 28 23:39:12 2009 -0700
+++ b/sql/log.cc Tue Jul 28 23:42:44 2009 -0700
-@@ -2289,11 +2289,12 @@
+@@ -2291,11 +2291,12 @@
*/
bool MYSQL_LOG::write(THD *thd,const char *query, uint query_length,
return 0;
DBUG_ENTER("MYSQL_LOG::write");
-@@ -2303,7 +2304,8 @@
+@@ -2305,7 +2306,8 @@
int tmp_errno=0;
char buff[80],*end;
end=buff;
{
VOID(pthread_mutex_unlock(&LOCK_log));
DBUG_RETURN(0);
-@@ -2333,22 +2335,72 @@
+@@ -2335,22 +2337,72 @@
if (my_b_printf(&log_file, "# User@Host: %s[%s] @ %s [%s]\n",
sctx->priv_user ?
sctx->priv_user : "",
}
if (thd->db && strcmp(thd->db,db))
{ // Database changed
-diff -r 1242d4575291 sql/log_event.cc
+diff -ruN a/sql/log_event.cc b/sql/log_event.cc
--- a/sql/log_event.cc Tue Jul 28 23:39:12 2009 -0700
+++ b/sql/log_event.cc Tue Jul 28 23:42:44 2009 -0700
-@@ -2061,6 +2061,7 @@
+@@ -2070,6 +2070,7 @@
/* Execute the query (note that we bypass dispatch_command()) */
const char* found_semicolon= NULL;
mysql_parse(thd, thd->query, thd->query_length, &found_semicolon);
}
else
-diff -r 1242d4575291 sql/mysql_priv.h
+diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h
--- a/sql/mysql_priv.h Tue Jul 28 23:39:12 2009 -0700
+++ b/sql/mysql_priv.h Tue Jul 28 23:42:44 2009 -0700
@@ -507,6 +507,78 @@
extern my_bool sp_automatic_privileges, opt_noacl;
extern my_bool opt_old_style_user_limits, trust_function_creators;
extern uint opt_crash_binlog_innodb;
-diff -r 1242d4575291 sql/mysqld.cc
+diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc Tue Jul 28 23:39:12 2009 -0700
+++ b/sql/mysqld.cc Tue Jul 28 23:42:44 2009 -0700
@@ -176,7 +176,6 @@
static char *mysql_home_ptr, *pidfile_name_ptr;
static char **defaults_argv;
static char *opt_bin_logname;
-@@ -3697,6 +3700,8 @@
+@@ -3700,6 +3703,8 @@
unireg_abort(1);
}
}
#endif /* __WIN__ */
if (init_common_variables(MYSQL_CONFIG_NAME,
-@@ -4947,7 +4952,7 @@
+@@ -4963,7 +4968,7 @@
OPT_INTERACTIVE_TIMEOUT, OPT_JOIN_BUFF_SIZE,
OPT_KEY_BUFFER_SIZE, OPT_KEY_CACHE_BLOCK_SIZE,
OPT_KEY_CACHE_DIVISION_LIMIT, OPT_KEY_CACHE_AGE_THRESHOLD,
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,
-@@ -5038,11 +5043,18 @@
+@@ -5055,11 +5060,18 @@
OPT_TIMED_MUTEXES,
OPT_OLD_STYLE_USER_LIMITS,
OPT_LOG_SLOW_ADMIN_STATEMENTS,
OPT_INNODB_ROLLBACK_ON_TIMEOUT,
OPT_SECURE_FILE_PRIV,
OPT_KEEP_FILES_ON_CREATE,
-@@ -5441,10 +5453,19 @@
+@@ -5459,10 +5471,19 @@
(gptr*) &opt_log_slow_admin_statements,
(gptr*) &opt_log_slow_admin_statements,
0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"log-tc", OPT_LOG_TC,
"Path to transaction coordinator log (used for transactions that affect "
"more than one storage engine, when binary log is disabled)",
-@@ -5808,6 +5829,9 @@
+@@ -5826,6 +5847,9 @@
"Tells the slave thread to continue replication when a query returns an error from the provided list.",
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"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},
-@@ -6110,11 +6134,31 @@
+@@ -6128,11 +6152,31 @@
(gptr*) 0,
0, (GET_ULONG | GET_ASK_ADDR) , REQUIRED_ARG, 100,
1, 100, 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,
-@@ -6893,7 +6937,11 @@
+@@ -6915,7 +6959,11 @@
global_system_variables.max_join_size= (ulonglong) HA_POS_ERROR;
max_system_variables.max_join_size= (ulonglong) HA_POS_ERROR;
global_system_variables.old_passwords= 0;
/*
Default behavior for 4.1 and 5.0 is to treat NULL values as unequal
when collecting index statistics for MyISAM tables.
-@@ -7364,6 +7412,35 @@
+@@ -7386,6 +7434,35 @@
case OPT_BOOTSTRAP:
opt_noacl=opt_bootstrap=1;
break;
case OPT_STORAGE_ENGINE:
{
if ((enum db_type)((global_system_variables.table_type=
-@@ -7696,10 +7773,14 @@
+@@ -7718,10 +7795,14 @@
if (opt_bdb)
sql_print_warning("this binary does not contain BDB storage engine");
#endif
if (argc > 0)
{
fprintf(stderr, "%s: Too many arguments (first extra is '%s').\nUse --help to get a list of available options\n", my_progname, *argv);
-diff -r 1242d4575291 sql/set_var.cc
+diff -ruN a/sql/set_var.cc b/sql/set_var.cc
--- a/sql/set_var.cc Tue Jul 28 23:39:12 2009 -0700
+++ b/sql/set_var.cc Tue Jul 28 23:42:44 2009 -0700
-@@ -217,9 +217,13 @@
+@@ -218,9 +218,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_bool sys_low_priority_updates("low_priority_updates",
&SV::low_priority_updates,
fix_low_priority_updates);
-@@ -283,6 +287,8 @@
+@@ -284,6 +288,8 @@
&SV::max_tmp_tables);
sys_var_long_ptr sys_max_write_lock_count("max_write_lock_count",
&max_write_lock_count);
sys_var_thd_ulong sys_multi_range_count("multi_range_count",
&SV::multi_range_count);
sys_var_long_ptr sys_myisam_data_pointer_size("myisam_data_pointer_size",
-@@ -327,6 +333,20 @@
+@@ -328,6 +334,20 @@
sys_var_bool_ptr sys_relay_log_purge("relay_log_purge",
&relay_log_purge);
#endif
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",
-@@ -697,6 +717,10 @@
+@@ -702,6 +722,10 @@
&sys_log_off,
&sys_log_queries_not_using_indexes,
&sys_log_slow,
&sys_log_update,
&sys_log_warnings,
&sys_long_query_time,
-@@ -720,6 +744,7 @@
+@@ -725,6 +749,7 @@
&sys_max_tmp_tables,
&sys_max_user_connections,
&sys_max_write_lock_count,
&sys_multi_range_count,
&sys_myisam_data_pointer_size,
&sys_myisam_max_sort_file_size,
-@@ -773,6 +798,8 @@
+@@ -779,6 +804,8 @@
&sys_slave_skip_counter,
#endif
&sys_slow_launch_time,
&sys_sort_buffer,
&sys_sql_big_tables,
&sys_sql_low_priority_updates,
-@@ -994,8 +1021,11 @@
+@@ -1000,8 +1027,11 @@
{"log_slave_updates", (char*) &opt_log_slave_updates, SHOW_MY_BOOL},
#endif
{sys_log_slow.name, (char*) &sys_log_slow, SHOW_SYS},
{sys_low_priority_updates.name, (char*) &sys_low_priority_updates, SHOW_SYS},
{"lower_case_file_system", (char*) &lower_case_file_system, SHOW_MY_BOOL},
{"lower_case_table_names", (char*) &lower_case_table_names, SHOW_INT},
-@@ -1022,6 +1052,7 @@
+@@ -1028,6 +1058,7 @@
{sys_max_tmp_tables.name, (char*) &sys_max_tmp_tables, SHOW_SYS},
{sys_max_user_connections.name,(char*) &sys_max_user_connections, SHOW_SYS},
{sys_max_write_lock_count.name, (char*) &sys_max_write_lock_count,SHOW_SYS},
{sys_multi_range_count.name, (char*) &sys_multi_range_count, SHOW_SYS},
{sys_myisam_data_pointer_size.name, (char*) &sys_myisam_data_pointer_size, SHOW_SYS},
{sys_myisam_max_sort_file_size.name, (char*) &sys_myisam_max_sort_file_size,
-@@ -1109,6 +1140,8 @@
+@@ -1116,6 +1147,8 @@
{sys_slave_trans_retries.name,(char*) &sys_slave_trans_retries, SHOW_SYS},
#endif
{sys_slow_launch_time.name, (char*) &sys_slow_launch_time, SHOW_SYS},
#ifdef HAVE_SYS_UN_H
{"socket", (char*) &mysqld_unix_port, SHOW_CHAR_PTR},
#endif
-@@ -1149,6 +1182,7 @@
+@@ -1156,6 +1189,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_version.name, (char*) &sys_version, SHOW_SYS},
#ifdef HAVE_BERKELEY_DB
{sys_version_bdb.name, (char*) &sys_version_bdb, SHOW_SYS},
-@@ -1777,6 +1811,17 @@
+@@ -1784,6 +1818,17 @@
}
bool sys_var_thd_bool::update(THD *thd, set_var *var)
{
if (var->type == OPT_GLOBAL)
-@@ -1933,6 +1978,19 @@
+@@ -1940,6 +1985,19 @@
pthread_mutex_unlock(&LOCK_global_system_variables);
return new Item_int(value);
}
case SHOW_HA_ROWS:
{
ha_rows value;
-@@ -2765,6 +2823,30 @@
+@@ -2772,6 +2830,30 @@
}
#ifdef HAVE_REPLICATION
bool sys_var_slave_skip_counter::check(THD *thd, set_var *var)
{
-@@ -3549,6 +3631,191 @@
+@@ -3568,6 +3650,191 @@
#endif
}
/****************************************************************************
Functions to handle table_type
****************************************************************************/
-diff -r 1242d4575291 sql/set_var.h
+diff -ruN a/sql/set_var.h b/sql/set_var.h
--- a/sql/set_var.h Tue Jul 28 23:39:12 2009 -0700
+++ b/sql/set_var.h Tue Jul 28 23:42:44 2009 -0700
@@ -132,6 +132,7 @@
+ const ulong none_val, const ulong invalid_val);
+const char *msl_option_get_name(const struct msl_opts *opts, ulong val);
+char *msl_flag_get_name(const struct msl_opts *opts, char *buf, ulong val);
-diff -r 1242d4575291 sql/slave.cc
+diff -ruN a/sql/slave.cc b/sql/slave.cc
--- a/sql/slave.cc Tue Jul 28 23:39:12 2009 -0700
+++ b/sql/slave.cc Tue Jul 28 23:42:44 2009 -0700
-@@ -2983,6 +2983,12 @@
+@@ -2981,6 +2981,12 @@
+ MAX_LOG_EVENT_HEADER; /* note, incr over the global not session var */
thd->slave_thread = 1;
set_slave_thread_options(thd);
thd->client_capabilities = CLIENT_LOCAL_FILES;
thd->real_id=pthread_self();
pthread_mutex_lock(&LOCK_thread_count);
-diff -r 1242d4575291 sql/sql_cache.cc
+diff -ruN a/sql/sql_cache.cc b/sql/sql_cache.cc
--- a/sql/sql_cache.cc Tue Jul 28 23:39:12 2009 -0700
+++ b/sql/sql_cache.cc Tue Jul 28 23:42:44 2009 -0700
@@ -1402,6 +1402,7 @@
DBUG_RETURN(0); // Query was not cached
}
-diff -r 1242d4575291 sql/sql_class.cc
+diff -ruN a/sql/sql_class.cc b/sql/sql_class.cc
--- a/sql/sql_class.cc Tue Jul 28 23:39:12 2009 -0700
+++ b/sql/sql_class.cc Tue Jul 28 23:42:44 2009 -0700
@@ -190,7 +190,7 @@
last_insert_id_used(0), last_insert_id_used_bin_log(0), insert_id_used(0),
clear_next_insert_id(0), in_lock_tables(0), bootstrap(0),
derived_tables_processing(FALSE), spcont(NULL),
-@@ -2251,6 +2251,12 @@
+@@ -2253,6 +2253,12 @@
backup->cuted_fields= cuted_fields;
backup->client_capabilities= client_capabilities;
backup->savepoints= transaction.savepoints;
if (!lex->requires_prelocking() || is_update_query(lex->sql_command))
options&= ~OPTION_BIN_LOG;
-@@ -2267,7 +2273,13 @@
+@@ -2269,7 +2275,13 @@
sent_row_count= 0;
cuted_fields= 0;
transaction.savepoints= 0;
/* Surpress OK packets in case if we will execute statements */
net.no_send_ok= TRUE;
}
-@@ -2320,6 +2332,12 @@
+@@ -2322,6 +2334,12 @@
*/
examined_row_count+= backup->examined_row_count;
cuted_fields+= backup->cuted_fields;
}
-diff -r 1242d4575291 sql/sql_class.h
+diff -ruN a/sql/sql_class.h b/sql/sql_class.h
--- a/sql/sql_class.h Tue Jul 28 23:39:12 2009 -0700
+++ b/sql/sql_class.h Tue Jul 28 23:42:44 2009 -0700
@@ -43,6 +43,7 @@
extern const char **errmesg;
+extern ulonglong frequency;
- #define TC_LOG_PAGE_SIZE 8192
- #define TC_LOG_MIN_SIZE (3*TC_LOG_PAGE_SIZE)
-@@ -321,7 +322,7 @@
+ extern bool volatile shutdown_in_progress;
+
+@@ -323,7 +324,7 @@
bool write(THD *thd, enum enum_server_command command,
const char *format, ...) ATTRIBUTE_FORMAT(printf, 4, 5);
bool write(THD *thd, const char *query, uint query_length,
bool write(Log_event* event_info); // binary log write
bool write(THD *thd, IO_CACHE *cache, Log_event *commit_event);
-@@ -527,13 +528,14 @@
+@@ -529,13 +530,14 @@
ulong auto_increment_increment, auto_increment_offset;
ulong bulk_insert_buff_size;
ulong join_buff_size;
ulong multi_range_count;
ulong myisam_repair_threads;
ulong myisam_sort_buff_size;
-@@ -549,10 +551,13 @@
+@@ -551,10 +553,13 @@
ulong preload_buff_size;
ulong profiling_history_size;
ulong query_cache_type;
ulong table_type;
ulong tx_isolation;
ulong completion_type;
-@@ -1129,6 +1134,12 @@
+@@ -1127,6 +1132,12 @@
uint in_sub_stmt;
bool enable_slow_log, insert_id_used, clear_next_insert_id;
bool last_insert_id_used;
my_bool no_send_ok;
SAVEPOINT *savepoints;
};
-@@ -1185,6 +1196,11 @@
+@@ -1183,6 +1194,11 @@
class THD :public Statement,
public Open_tables_state
{
public:
/*
Constant for THD::where initialization in the beginning of every query.
-@@ -1293,10 +1309,24 @@
+@@ -1299,10 +1315,24 @@
*/
const char *where;
time_t start_time,time_after_lock,user_time;
/* <> 0 if we are inside of trigger or stored function. */
uint in_sub_stmt;
-@@ -1696,11 +1726,11 @@
+@@ -1702,11 +1732,11 @@
sql_print_information("time() failed with %d", errno);
}
inline void insert_id(ulonglong id_arg)
{
last_insert_id= id_arg;
-diff -r 1242d4575291 sql/sql_parse.cc
+diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
--- a/sql/sql_parse.cc Tue Jul 28 23:39:12 2009 -0700
+++ b/sql/sql_parse.cc Tue Jul 28 23:42:44 2009 -0700
@@ -20,6 +20,7 @@
#ifdef HAVE_INNOBASE_DB
#include "ha_innodb.h"
-@@ -1227,6 +1228,15 @@
+@@ -1233,6 +1234,15 @@
my_net_set_read_timeout(net, thd->variables.net_read_timeout);
my_net_set_write_timeout(net, thd->variables.net_write_timeout);
while (!net->error && net->vio != 0 &&
!(thd->killed == THD::KILL_CONNECTION))
{
-@@ -2353,28 +2363,57 @@
+@@ -2394,28 +2404,57 @@
return; // Don't set time for sub stmt
start_of_query= thd->start_time;
}
}
}
-@@ -2669,6 +2708,8 @@
+@@ -2710,6 +2749,8 @@
context.resolve_in_table_list_only((TABLE_LIST*)select_lex->
table_list.first);
/*
Reset warning count for each query that uses tables
A better approach would be to reset this for any commands
-@@ -6203,6 +6244,15 @@
+@@ -6233,6 +6274,15 @@
thd->total_warn_count=0; // Warnings for this query
thd->rand_used= 0;
thd->sent_row_count= thd->examined_row_count= 0;
}
DBUG_VOID_RETURN;
}
-diff -r 1242d4575291 sql/sql_select.cc
+diff -ruN a/sql/sql_select.cc b/sql/sql_select.cc
--- a/sql/sql_select.cc Tue Jul 28 23:39:12 2009 -0700
+++ b/sql/sql_select.cc Tue Jul 28 23:42:44 2009 -0700
-@@ -6272,8 +6272,11 @@
+@@ -6371,8 +6371,11 @@
{
join->thd->server_status|=SERVER_QUERY_NO_INDEX_USED;
if (statistics)
}
}
else
-@@ -6288,8 +6291,11 @@
+@@ -6387,8 +6390,11 @@
{
join->thd->server_status|=SERVER_QUERY_NO_INDEX_USED;
if (statistics)
}
}
if (!table->no_keyread)
-@@ -9350,6 +9356,7 @@
+@@ -9464,6 +9470,7 @@
(ulong) rows_limit,test(group)));
statistic_increment(thd->status_var.created_tmp_tables, &LOCK_status);
if (use_temp_pool && !(test_flags & TEST_KEEP_TMP_TABLES))
temp_pool_slot = bitmap_set_next(&temp_pool);
-@@ -10210,6 +10217,7 @@
+@@ -10325,6 +10332,7 @@
}
statistic_increment(table->in_use->status_var.created_tmp_disk_tables,
&LOCK_status);
table->s->db_record_offset= 1;
DBUG_RETURN(0);
err:
-diff -r 1242d4575291 sql/sql_show.cc
+diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
--- a/sql/sql_show.cc Tue Jul 28 23:39:12 2009 -0700
+++ b/sql/sql_show.cc Tue Jul 28 23:42:44 2009 -0700
-@@ -1560,6 +1560,12 @@
+@@ -1558,6 +1558,12 @@
case SHOW_LONGLONG:
end= longlong10_to_str(*(longlong*) value, buff, 10);
break;
case SHOW_HA_ROWS:
end= longlong10_to_str((longlong) *(ha_rows*) value, buff, 10);
break;
-diff -r 1242d4575291 sql/structs.h
+diff -ruN a/sql/structs.h b/sql/structs.h
--- a/sql/structs.h Tue Jul 28 23:39:12 2009 -0700
+++ b/sql/structs.h Tue Jul 28 23:42:44 2009 -0700
-@@ -168,8 +168,8 @@
+@@ -174,8 +174,8 @@
enum SHOW_TYPE
{
SHOW_UNDEF,
-diff -r 4636d2e0b0d0 patch_info/profiling_slow.info
+diff -ruN /dev/null b/patch_info/profiling_slow.info
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patch_info/profiling_slow.info Fri Jul 03 15:40:29 2009 -0700
@@ -0,0 +1,9 @@
+Changelog
+2009-05-18
+Initial implementation
-diff -r 4636d2e0b0d0 sql/log.cc
+diff -ruN a/sql/log.cc b/sql/log.cc
--- a/sql/log.cc Fri Jul 03 15:40:20 2009 -0700
+++ b/sql/log.cc Fri Jul 03 15:40:29 2009 -0700
-@@ -2402,6 +2402,11 @@
+@@ -2404,6 +2404,11 @@
tmp_errno=errno;
}
}
if (thd->db && strcmp(thd->db,db))
{ // Database changed
if (my_b_printf(&log_file,"use %s;\n",thd->db) == (uint) -1)
-diff -r 4636d2e0b0d0 sql/mysqld.cc
+diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc Fri Jul 03 15:40:20 2009 -0700
+++ b/sql/mysqld.cc Fri Jul 03 15:40:29 2009 -0700
-@@ -5052,6 +5052,8 @@
+@@ -5069,6 +5069,8 @@
OPT_PORT_OPEN_TIMEOUT,
OPT_MERGE,
OPT_PROFILING,
OPT_SLOW_LOG,
OPT_SLOW_QUERY_LOG_FILE,
OPT_USE_GLOBAL_LONG_QUERY_TIME,
-@@ -5675,6 +5677,16 @@
+@@ -5693,6 +5695,16 @@
(gptr*) &global_system_variables.profiling_history_size,
(gptr*) &max_system_variables.profiling_history_size,
0, GET_ULONG, REQUIRED_ARG, 15, 0, 100, 0, 0, 0},
#endif
{"relay-log", OPT_RELAY_LOG,
"The location and name to use for relay logs.",
-diff -r 4636d2e0b0d0 sql/set_var.cc
+diff -ruN a/sql/set_var.cc b/sql/set_var.cc
--- a/sql/set_var.cc Fri Jul 03 15:40:20 2009 -0700
+++ b/sql/set_var.cc Fri Jul 03 15:40:29 2009 -0700
-@@ -592,6 +592,10 @@
+@@ -593,6 +593,10 @@
ulonglong(OPTION_PROFILING));
static sys_var_thd_ulong sys_profiling_history_size("profiling_history_size",
&SV::profiling_history_size);
#endif
/* Local state variables */
-@@ -764,6 +768,8 @@
+@@ -770,6 +774,8 @@
#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER)
&sys_profiling,
&sys_profiling_history_size,
#endif
&sys_pseudo_thread_id,
&sys_query_alloc_block_size,
-@@ -1094,6 +1100,8 @@
+@@ -1101,6 +1107,8 @@
#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER)
{sys_profiling.name, (char*) &sys_profiling, SHOW_SYS},
{sys_profiling_history_size.name, (char*) &sys_profiling_history_size, SHOW_SYS},
#endif
{"protocol_version", (char*) &protocol_version, SHOW_INT},
{sys_query_alloc_block_size.name, (char*) &sys_query_alloc_block_size,
-diff -r 4636d2e0b0d0 sql/sql_class.h
+diff -ruN a/sql/sql_class.h b/sql/sql_class.h
--- a/sql/sql_class.h Fri Jul 03 15:40:20 2009 -0700
+++ b/sql/sql_class.h Fri Jul 03 15:40:29 2009 -0700
-@@ -550,6 +550,8 @@
+@@ -552,6 +552,8 @@
ulong optimizer_search_depth;
ulong preload_buff_size;
ulong profiling_history_size;
ulong query_cache_type;
ulong log_slow_rate_limit;
ulong read_buff_size;
-diff -r 4636d2e0b0d0 sql/sql_profile.cc
+diff -ruN a/sql/sql_profile.cc b/sql/sql_profile.cc
--- a/sql/sql_profile.cc Fri Jul 03 15:40:20 2009 -0700
+++ b/sql/sql_profile.cc Fri Jul 03 15:40:29 2009 -0700
@@ -221,9 +221,22 @@
/**
Fill the information schema table, "query_profile", as defined in show.cc .
There are two ways to get to this function: Selecting from the information
-diff -r 4636d2e0b0d0 sql/sql_profile.h
+diff -ruN a/sql/sql_profile.h b/sql/sql_profile.h
--- a/sql/sql_profile.h Fri Jul 03 15:40:20 2009 -0700
+++ b/sql/sql_profile.h Fri Jul 03 15:40:29 2009 -0700
@@ -193,6 +193,7 @@
-diff -r c3e57b0c22c4 patch_info/show_patches.info
+diff -ruN /dev/null b/patch_info/show_patches.info
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patch_info/show_patches.info Mon Dec 22 00:25:06 2008 -0800
@@ -0,0 +1,6 @@
+Author=Jeremy Cole
+License=N/A
+Comment
-diff -r c3e57b0c22c4 sql/Makefile.am
+diff -ruN a/sql/Makefile.am b/sql/Makefile.am
--- a/sql/Makefile.am Mon Dec 22 00:20:06 2008 -0800
+++ b/sql/Makefile.am Mon Dec 22 00:25:06 2008 -0800
@@ -118,7 +118,7 @@
# Don't update the files from bitkeeper
%::SCCS/s.%
-diff -r c3e57b0c22c4 sql/Makefile.in
+diff -ruN a/sql/Makefile.in b/sql/Makefile.in
--- a/sql/Makefile.in Mon Dec 22 00:20:06 2008 -0800
+++ b/sql/Makefile.in Mon Dec 22 00:25:06 2008 -0800
-@@ -561,7 +561,7 @@
+@@ -566,7 +566,7 @@
gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS)
mysql_tzinfo_to_sql_SOURCES = mysql_tzinfo_to_sql.cc
mysql_tzinfo_to_sql_LDADD = @MYSQLD_EXTRA_LDFLAGS@ $(LDADD) $(CXXLDFLAGS)
EXTRA_DIST = $(BUILT_SOURCES) nt_servc.cc nt_servc.h \
message.mc message.h message.rc MSG00001.bin \
examples/CMakeLists.txt CMakeLists.txt \
-@@ -1237,6 +1237,9 @@
+@@ -1227,6 +1227,9 @@
./gen_lex_hash$(EXEEXT) > $@-t
$(MV) $@-t $@
# Don't update the files from bitkeeper
%::SCCS/s.%
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -r c3e57b0c22c4 sql/lex.h
+diff -ruN a/sql/lex.h b/sql/lex.h
--- a/sql/lex.h Mon Dec 22 00:20:06 2008 -0800
+++ b/sql/lex.h Mon Dec 22 00:25:06 2008 -0800
@@ -367,6 +367,7 @@
{ "PHASE", SYM(PHASE_SYM)},
{ "POINT", SYM(POINT_SYM)},
{ "POLYGON", SYM(POLYGON)},
-diff -r c3e57b0c22c4 sql/mysql_priv.h
+diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h
--- a/sql/mysql_priv.h Mon Dec 22 00:20:06 2008 -0800
+++ b/sql/mysql_priv.h Mon Dec 22 00:25:06 2008 -0800
-@@ -968,6 +968,7 @@
+@@ -987,6 +987,7 @@
int mysqld_show_status(THD *thd);
int mysqld_show_variables(THD *thd,const char *wild);
bool mysqld_show_storage_engines(THD *thd);
bool mysqld_show_privileges(THD *thd);
bool mysqld_show_column_types(THD *thd);
bool mysqld_help (THD *thd, const char *text);
-diff -r c3e57b0c22c4 sql/patch_info.h.pl
+diff -ruN /dev/null b/sql/patch_info.h.pl
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/patch_info.h.pl Mon Dec 22 00:25:06 2008 -0800
@@ -0,0 +1,65 @@
+};
+
+HEADER
-diff -r c3e57b0c22c4 sql/sp_head.cc
+diff -ruN a/sql/sp_head.cc b/sql/sp_head.cc
--- a/sql/sp_head.cc Mon Dec 22 00:20:06 2008 -0800
+++ b/sql/sp_head.cc Mon Dec 22 00:25:06 2008 -0800
@@ -191,6 +191,7 @@
case SQLCOM_SHOW_PRIVILEGES:
case SQLCOM_SHOW_PROCESSLIST:
case SQLCOM_SHOW_SLAVE_HOSTS:
-diff -r c3e57b0c22c4 sql/sql_lex.h
+diff -ruN a/sql/sql_lex.h b/sql/sql_lex.h
--- a/sql/sql_lex.h Mon Dec 22 00:20:06 2008 -0800
+++ b/sql/sql_lex.h Mon Dec 22 00:25:06 2008 -0800
@@ -95,6 +95,7 @@
/*
When a command is added here, be sure it's also added in mysqld.cc
-diff -r c3e57b0c22c4 sql/sql_parse.cc
+diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
--- a/sql/sql_parse.cc Mon Dec 22 00:20:06 2008 -0800
+++ b/sql/sql_parse.cc Mon Dec 22 00:25:06 2008 -0800
-@@ -3947,6 +3947,9 @@
- break;
+@@ -4081,6 +4081,9 @@
case SQLCOM_SHOW_STORAGE_ENGINES:
res= mysqld_show_storage_engines(thd);
-+ break;
+ break;
+ case SQLCOM_SHOW_PATCHES:
+ res= mysqld_show_patches(thd);
- break;
++ break;
case SQLCOM_SHOW_PRIVILEGES:
res= mysqld_show_privileges(thd);
-diff -r c3e57b0c22c4 sql/sql_prepare.cc
+ break;
+diff -ruN a/sql/sql_prepare.cc b/sql/sql_prepare.cc
--- a/sql/sql_prepare.cc Mon Dec 22 00:20:06 2008 -0800
+++ b/sql/sql_prepare.cc Mon Dec 22 00:25:06 2008 -0800
@@ -1790,6 +1790,7 @@
case SQLCOM_SHOW_PRIVILEGES:
case SQLCOM_SHOW_COLUMN_TYPES:
case SQLCOM_SHOW_STATUS:
-diff -r c3e57b0c22c4 sql/sql_show.cc
+diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
--- a/sql/sql_show.cc Mon Dec 22 00:20:06 2008 -0800
+++ b/sql/sql_show.cc Mon Dec 22 00:25:06 2008 -0800
@@ -22,6 +22,7 @@
#include <my_dir.h>
#ifdef HAVE_BERKELEY_DB
-@@ -45,6 +46,47 @@
- static int
+@@ -46,6 +47,47 @@
view_store_create_info(THD *thd, TABLE_LIST *table, String *buff);
bool schema_table_store_record(THD *thd, TABLE *table);
-+
+
+/***************************************************************************
+** List patches built into this release
+***************************************************************************/
+ DBUG_RETURN(FALSE);
+
+}
-
++
/***************************************************************************
-diff -r c3e57b0c22c4 sql/sql_yacc.yy
+ ** List all table types supported
+diff -ruN a/sql/sql_yacc.yy b/sql/sql_yacc.yy
--- a/sql/sql_yacc.yy Mon Dec 22 00:20:06 2008 -0800
+++ b/sql/sql_yacc.yy Mon Dec 22 00:25:06 2008 -0800
-@@ -824,6 +824,7 @@
+@@ -858,6 +858,7 @@
%token PAGE_SYM
%token PARTIAL
%token PASSWORD
%token PARAM_MARKER
%token PHASE_SYM
%token POINTFROMTEXT
-@@ -8019,7 +8020,7 @@
+@@ -8060,7 +8061,7 @@
;
show_param:
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SELECT;
-@@ -8119,6 +8120,10 @@
- LEX *lex=Lex;
+@@ -8161,6 +8162,10 @@
lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES;
WARN_DEPRECATED("SHOW TABLE TYPES", "SHOW [STORAGE] ENGINES");
-+ }
+ }
+ | PATCHES
+ {
+ Lex->sql_command= SQLCOM_SHOW_PATCHES;
- }
++ }
| opt_storage ENGINES_SYM
{
-@@ -9554,6 +9559,7 @@
+ LEX *lex=Lex;
+@@ -9592,6 +9597,7 @@
| PAGE_SYM {}
| PARTIAL {}
| PASSWORD {}
-diff -r 592f6c3641ba BUILD/Makefile.in
+diff -ruN a/BUILD/Makefile.in b/BUILD/Makefile.in
--- a/BUILD/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/BUILD/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -146,6 +146,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba Docs/Makefile.in
+diff -ruN a/Docs/Makefile.in b/Docs/Makefile.in
--- a/Docs/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/Docs/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -144,6 +144,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba Makefile.in
+diff -ruN a/Makefile.in b/Makefile.in
--- a/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -171,6 +171,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba SSL/Makefile.in
+diff -ruN a/SSL/Makefile.in b/SSL/Makefile.in
--- a/SSL/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/SSL/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -144,6 +144,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba client/Makefile.in
+diff -ruN a/client/Makefile.in b/client/Makefile.in
--- a/client/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/client/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -247,6 +247,7 @@
LIBS = @CLIENT_LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba cmd-line-utils/Makefile.in
+diff -ruN a/cmd-line-utils/Makefile.in b/cmd-line-utils/Makefile.in
--- a/cmd-line-utils/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/cmd-line-utils/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -157,6 +157,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba cmd-line-utils/libedit/Makefile.in
+diff -ruN a/cmd-line-utils/libedit/Makefile.in b/cmd-line-utils/libedit/Makefile.in
--- a/cmd-line-utils/libedit/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/cmd-line-utils/libedit/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -166,6 +166,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba cmd-line-utils/readline/Makefile.in
+diff -ruN a/cmd-line-utils/readline/Makefile.in b/cmd-line-utils/readline/Makefile.in
--- a/cmd-line-utils/readline/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/cmd-line-utils/readline/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -173,6 +173,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba configure
-diff -r 592f6c3641ba configure.in
+diff -ruN a/configure b/configure
+diff -ruN a/configure.in b/configure.in
--- a/configure.in Wed Jul 29 13:33:34 2009 -0700
+++ b/configure.in Wed Jul 29 13:34:11 2009 -0700
-@@ -2136,7 +2136,18 @@
+@@ -2140,7 +2140,18 @@
# We also disable for SCO for the time being, the headers for the
# thread library we use conflicts with other headers.
;;
;;
esac
-@@ -2772,7 +2783,7 @@
+@@ -2776,7 +2787,7 @@
AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe])
fi
AC_SUBST(CLIENT_LIBS)
AC_SUBST(NON_THREADED_LIBS)
-diff -r 592f6c3641ba dbug/Makefile.in
+diff -ruN a/dbug/Makefile.in b/dbug/Makefile.in
--- a/dbug/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/dbug/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -192,6 +192,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba extra/Makefile.in
+diff -ruN a/extra/Makefile.in b/extra/Makefile.in
--- a/extra/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/extra/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -240,6 +240,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba extra/yassl/Makefile.in
+diff -ruN a/extra/yassl/Makefile.in b/extra/yassl/Makefile.in
--- a/extra/yassl/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/extra/yassl/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -142,6 +142,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba extra/yassl/src/Makefile.in
+diff -ruN a/extra/yassl/src/Makefile.in b/extra/yassl/src/Makefile.in
--- a/extra/yassl/src/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/extra/yassl/src/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -151,6 +151,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba extra/yassl/taocrypt/Makefile.in
+diff -ruN a/extra/yassl/taocrypt/Makefile.in b/extra/yassl/taocrypt/Makefile.in
--- a/extra/yassl/taocrypt/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/extra/yassl/taocrypt/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -142,6 +142,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba extra/yassl/taocrypt/benchmark/Makefile.in
+diff -ruN a/extra/yassl/taocrypt/benchmark/Makefile.in b/extra/yassl/taocrypt/benchmark/Makefile.in
--- a/extra/yassl/taocrypt/benchmark/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/extra/yassl/taocrypt/benchmark/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -153,6 +153,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba extra/yassl/taocrypt/src/Makefile.in
+diff -ruN a/extra/yassl/taocrypt/src/Makefile.in b/extra/yassl/taocrypt/src/Makefile.in
--- a/extra/yassl/taocrypt/src/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/extra/yassl/taocrypt/src/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -164,6 +164,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba extra/yassl/taocrypt/test/Makefile.in
+diff -ruN a/extra/yassl/taocrypt/test/Makefile.in b/extra/yassl/taocrypt/test/Makefile.in
--- a/extra/yassl/taocrypt/test/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/extra/yassl/taocrypt/test/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -153,6 +153,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba extra/yassl/testsuite/Makefile.in
+diff -ruN a/extra/yassl/testsuite/Makefile.in b/extra/yassl/testsuite/Makefile.in
--- a/extra/yassl/testsuite/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/extra/yassl/testsuite/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -156,6 +156,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba heap/Makefile.in
+diff -ruN a/heap/Makefile.in b/heap/Makefile.in
--- a/heap/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/heap/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -202,6 +202,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba include/Makefile.in
+diff -ruN a/include/Makefile.in b/include/Makefile.in
--- a/include/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/include/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -160,6 +160,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba include/mysql_com.h
+diff -ruN a/include/mysql_com.h b/include/mysql_com.h
--- a/include/mysql_com.h Wed Jul 29 13:33:34 2009 -0700
+++ b/include/mysql_com.h Wed Jul 29 13:34:11 2009 -0700
@@ -25,6 +25,7 @@
/* The following can't be set with mysql_refresh() */
#define REFRESH_READ_LOCK 16384 /* Lock tables for read */
-diff -r 592f6c3641ba libmysql/Makefile.in
+@@ -219,7 +225,7 @@
+
+ my_bool report_error; /* We should report error (we have unreported error) */
+ my_bool return_errno;
+-#if defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY)
++#if defined(MYSQL_SERVER)
+ /*
+ Controls whether a big packet should be skipped.
+
+diff -ruN a/libmysql/Makefile.in b/libmysql/Makefile.in
--- a/libmysql/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/libmysql/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -224,6 +224,7 @@
LIBS = @CLIENT_LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba libmysql_r/Makefile.in
+diff -ruN a/libmysql_r/Makefile.in b/libmysql_r/Makefile.in
--- a/libmysql_r/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/libmysql_r/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -221,6 +221,7 @@
LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba libmysqld/Makefile.in
+diff -ruN a/libmysqld/Makefile.in b/libmysqld/Makefile.in
--- a/libmysqld/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/libmysqld/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -246,6 +246,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba libmysqld/examples/Makefile.in
+diff -ruN a/libmysqld/examples/Makefile.in b/libmysqld/examples/Makefile.in
--- a/libmysqld/examples/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/libmysqld/examples/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -192,6 +192,7 @@
LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba man/Makefile.in
+diff -ruN a/man/Makefile.in b/man/Makefile.in
--- a/man/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/man/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -151,6 +151,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba myisam/Makefile.in
+diff -ruN a/myisam/Makefile.in b/myisam/Makefile.in
--- a/myisam/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/myisam/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -235,6 +235,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba myisammrg/Makefile.in
+diff -ruN a/myisammrg/Makefile.in b/myisammrg/Makefile.in
--- a/myisammrg/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/myisammrg/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -183,6 +183,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba mysql-test/Makefile.in
+diff -ruN a/mysql-test/Makefile.in b/mysql-test/Makefile.in
--- a/mysql-test/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/mysql-test/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -161,6 +161,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba mysql-test/ndb/Makefile.in
+diff -ruN a/mysql-test/ndb/Makefile.in b/mysql-test/ndb/Makefile.in
--- a/mysql-test/ndb/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/mysql-test/ndb/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -147,6 +147,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba mysql-test/r/information_schema.result
+diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
--- a/mysql-test/r/information_schema.result Wed Jul 29 13:33:34 2009 -0700
+++ b/mysql-test/r/information_schema.result Wed Jul 29 13:34:11 2009 -0700
@@ -37,10 +37,12 @@
VIEWS information_schema.VIEWS 1
create table t1(f1 int);
create view v1 as select f1+1 as a from t1;
-diff -r 592f6c3641ba mysql-test/r/information_schema_db.result
+diff -ruN a/mysql-test/r/information_schema_db.result b/mysql-test/r/information_schema_db.result
--- a/mysql-test/r/information_schema_db.result Wed Jul 29 13:33:34 2009 -0700
+++ b/mysql-test/r/information_schema_db.result Wed Jul 29 13:34:11 2009 -0700
@@ -6,10 +6,12 @@
TRIGGERS
create database `inf%`;
create database mbase;
-diff -r 592f6c3641ba mysql-test/r/mysqlshow.result
+diff -ruN a/mysql-test/r/mysqlshow.result b/mysql-test/r/mysqlshow.result
--- a/mysql-test/r/mysqlshow.result Wed Jul 29 13:33:34 2009 -0700
+++ b/mysql-test/r/mysqlshow.result Wed Jul 29 13:34:11 2009 -0700
@@ -80,10 +80,12 @@
| VIEWS |
+---------------------------------------+
Wildcard: inf_rmation_schema
-diff -r 592f6c3641ba mysys/Makefile.in
+diff -ruN a/mysys/Makefile.in b/mysys/Makefile.in
--- a/mysys/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/mysys/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -228,6 +228,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/Makefile.in
+diff -ruN a/ndb/Makefile.in b/ndb/Makefile.in
--- a/ndb/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -171,6 +171,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/docs/Makefile.in
+diff -ruN a/ndb/docs/Makefile.in b/ndb/docs/Makefile.in
--- a/ndb/docs/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/docs/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -149,6 +149,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/include/Makefile.in
+diff -ruN a/ndb/include/Makefile.in b/ndb/include/Makefile.in
--- a/ndb/include/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/include/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -179,6 +179,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/Makefile.in
+diff -ruN a/ndb/src/Makefile.in b/ndb/src/Makefile.in
--- a/ndb/src/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -204,6 +204,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/common/Makefile.in
+diff -ruN a/ndb/src/common/Makefile.in b/ndb/src/common/Makefile.in
--- a/ndb/src/common/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/common/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -174,6 +174,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/common/debugger/Makefile.in
+diff -ruN a/ndb/src/common/debugger/Makefile.in b/ndb/src/common/debugger/Makefile.in
--- a/ndb/src/common/debugger/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/common/debugger/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -206,6 +206,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/common/debugger/signaldata/Makefile.in
+diff -ruN a/ndb/src/common/debugger/signaldata/Makefile.in b/ndb/src/common/debugger/signaldata/Makefile.in
--- a/ndb/src/common/debugger/signaldata/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/common/debugger/signaldata/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -211,6 +211,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/common/logger/Makefile.in
+diff -ruN a/ndb/src/common/logger/Makefile.in b/ndb/src/common/logger/Makefile.in
--- a/ndb/src/common/logger/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/common/logger/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -197,6 +197,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/common/mgmcommon/Makefile.in
+diff -ruN a/ndb/src/common/mgmcommon/Makefile.in b/ndb/src/common/mgmcommon/Makefile.in
--- a/ndb/src/common/mgmcommon/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/common/mgmcommon/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -211,6 +211,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/common/portlib/Makefile.in
+diff -ruN a/ndb/src/common/portlib/Makefile.in b/ndb/src/common/portlib/Makefile.in
--- a/ndb/src/common/portlib/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/common/portlib/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -222,6 +222,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/common/transporter/Makefile.in
+diff -ruN a/ndb/src/common/transporter/Makefile.in b/ndb/src/common/transporter/Makefile.in
--- a/ndb/src/common/transporter/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/common/transporter/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -197,6 +197,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/common/util/Makefile.in
+diff -ruN a/ndb/src/common/util/Makefile.in b/ndb/src/common/util/Makefile.in
--- a/ndb/src/common/util/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/common/util/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -217,6 +217,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/cw/Makefile.in
+diff -ruN a/ndb/src/cw/Makefile.in b/ndb/src/cw/Makefile.in
--- a/ndb/src/cw/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/cw/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -156,6 +156,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/cw/cpcd/Makefile.in
+diff -ruN a/ndb/src/cw/cpcd/Makefile.in b/ndb/src/cw/cpcd/Makefile.in
--- a/ndb/src/cw/cpcd/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/cw/cpcd/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -207,6 +207,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/Makefile.in
+diff -ruN a/ndb/src/kernel/Makefile.in b/ndb/src/kernel/Makefile.in
--- a/ndb/src/kernel/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -227,6 +227,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/Makefile.in b/ndb/src/kernel/blocks/Makefile.in
--- a/ndb/src/kernel/blocks/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -156,6 +156,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/backup/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/backup/Makefile.in b/ndb/src/kernel/blocks/backup/Makefile.in
--- a/ndb/src/kernel/blocks/backup/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/backup/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -196,6 +196,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/cmvmi/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/cmvmi/Makefile.in b/ndb/src/kernel/blocks/cmvmi/Makefile.in
--- a/ndb/src/kernel/blocks/cmvmi/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/cmvmi/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -196,6 +196,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/dbacc/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/dbacc/Makefile.in b/ndb/src/kernel/blocks/dbacc/Makefile.in
--- a/ndb/src/kernel/blocks/dbacc/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/dbacc/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -196,6 +196,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/dbdict/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/dbdict/Makefile.in b/ndb/src/kernel/blocks/dbdict/Makefile.in
--- a/ndb/src/kernel/blocks/dbdict/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/dbdict/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -206,6 +206,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/dbdih/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/dbdih/Makefile.in b/ndb/src/kernel/blocks/dbdih/Makefile.in
--- a/ndb/src/kernel/blocks/dbdih/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/dbdih/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -203,6 +203,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/dblqh/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/dblqh/Makefile.in b/ndb/src/kernel/blocks/dblqh/Makefile.in
--- a/ndb/src/kernel/blocks/dblqh/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/dblqh/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -204,6 +204,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/dbtc/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/dbtc/Makefile.in b/ndb/src/kernel/blocks/dbtc/Makefile.in
--- a/ndb/src/kernel/blocks/dbtc/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/dbtc/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -196,6 +196,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/dbtup/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/dbtup/Makefile.in b/ndb/src/kernel/blocks/dbtup/Makefile.in
--- a/ndb/src/kernel/blocks/dbtup/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/dbtup/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -204,6 +204,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/dbtux/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/dbtux/Makefile.in b/ndb/src/kernel/blocks/dbtux/Makefile.in
--- a/ndb/src/kernel/blocks/dbtux/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/dbtux/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -199,6 +199,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/dbutil/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/dbutil/Makefile.in b/ndb/src/kernel/blocks/dbutil/Makefile.in
--- a/ndb/src/kernel/blocks/dbutil/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/dbutil/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -196,6 +196,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/ndbcntr/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/ndbcntr/Makefile.in b/ndb/src/kernel/blocks/ndbcntr/Makefile.in
--- a/ndb/src/kernel/blocks/ndbcntr/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/ndbcntr/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -197,6 +197,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/ndbfs/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/ndbfs/Makefile.in b/ndb/src/kernel/blocks/ndbfs/Makefile.in
--- a/ndb/src/kernel/blocks/ndbfs/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/ndbfs/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -197,6 +197,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/qmgr/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/qmgr/Makefile.in b/ndb/src/kernel/blocks/qmgr/Makefile.in
--- a/ndb/src/kernel/blocks/qmgr/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/qmgr/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -196,6 +196,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/suma/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/suma/Makefile.in b/ndb/src/kernel/blocks/suma/Makefile.in
--- a/ndb/src/kernel/blocks/suma/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/suma/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -196,6 +196,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/blocks/trix/Makefile.in
+diff -ruN a/ndb/src/kernel/blocks/trix/Makefile.in b/ndb/src/kernel/blocks/trix/Makefile.in
--- a/ndb/src/kernel/blocks/trix/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/blocks/trix/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -196,6 +196,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/error/Makefile.in
+diff -ruN a/ndb/src/kernel/error/Makefile.in b/ndb/src/kernel/error/Makefile.in
--- a/ndb/src/kernel/error/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/error/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -206,6 +206,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/kernel/vm/Makefile.in
+diff -ruN a/ndb/src/kernel/vm/Makefile.in b/ndb/src/kernel/vm/Makefile.in
--- a/ndb/src/kernel/vm/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/kernel/vm/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -207,6 +207,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/mgmapi/Makefile.in
+diff -ruN a/ndb/src/mgmapi/Makefile.in b/ndb/src/mgmapi/Makefile.in
--- a/ndb/src/mgmapi/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/mgmapi/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -205,6 +205,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/mgmclient/Makefile.in
+diff -ruN a/ndb/src/mgmclient/Makefile.in b/ndb/src/mgmclient/Makefile.in
--- a/ndb/src/mgmclient/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/mgmclient/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -216,6 +216,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/mgmsrv/Makefile.in
+diff -ruN a/ndb/src/mgmsrv/Makefile.in b/ndb/src/mgmsrv/Makefile.in
--- a/ndb/src/mgmsrv/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/mgmsrv/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -213,6 +213,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/src/ndbapi/Makefile.in
+diff -ruN a/ndb/src/ndbapi/Makefile.in b/ndb/src/ndbapi/Makefile.in
--- a/ndb/src/ndbapi/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/src/ndbapi/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -215,6 +215,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/test/Makefile.in
+diff -ruN a/ndb/test/Makefile.in b/ndb/test/Makefile.in
--- a/ndb/test/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/test/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -156,6 +156,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/test/ndbapi/Makefile.in
+diff -ruN a/ndb/test/ndbapi/Makefile.in b/ndb/test/ndbapi/Makefile.in
--- a/ndb/test/ndbapi/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/test/ndbapi/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -595,6 +595,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/test/ndbapi/bank/Makefile.in
+diff -ruN a/ndb/test/ndbapi/bank/Makefile.in b/ndb/test/ndbapi/bank/Makefile.in
--- a/ndb/test/ndbapi/bank/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/test/ndbapi/bank/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -282,6 +282,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/test/run-test/Makefile.in
+diff -ruN a/ndb/test/run-test/Makefile.in b/ndb/test/run-test/Makefile.in
--- a/ndb/test/run-test/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/test/run-test/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -243,6 +243,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/test/src/Makefile.in
+diff -ruN a/ndb/test/src/Makefile.in b/ndb/test/src/Makefile.in
--- a/ndb/test/src/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/test/src/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -213,6 +213,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/test/tools/Makefile.in
+diff -ruN a/ndb/test/tools/Makefile.in b/ndb/test/tools/Makefile.in
--- a/ndb/test/tools/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/test/tools/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -325,6 +325,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba ndb/tools/Makefile.in
+diff -ruN a/ndb/tools/Makefile.in b/ndb/tools/Makefile.in
--- a/ndb/tools/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/ndb/tools/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -344,6 +344,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba netware/Makefile.in
+diff -ruN a/netware/Makefile.in b/netware/Makefile.in
--- a/netware/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/netware/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -199,6 +199,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba os2/Makefile.in
+diff -ruN a/os2/Makefile.in b/os2/Makefile.in
--- a/os2/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/os2/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -156,6 +156,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba os2/include/Makefile.in
+diff -ruN a/os2/include/Makefile.in b/os2/include/Makefile.in
--- a/os2/include/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/os2/include/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -156,6 +156,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba os2/include/sys/Makefile.in
+diff -ruN a/os2/include/sys/Makefile.in b/os2/include/sys/Makefile.in
--- a/os2/include/sys/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/os2/include/sys/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -144,6 +144,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba patch_info/userstats.info
+diff -ruN /dev/null b/patch_info/userstats.info
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patch_info/userstats.info Wed Jul 29 13:34:11 2009 -0700
@@ -0,0 +1,14 @@
+
+2008-12-09
+YK: fixed "Row_sent: 0" problem at microslow_innodb.patch
-diff -r 592f6c3641ba pstack/Makefile.in
+diff -ruN a/pstack/Makefile.in b/pstack/Makefile.in
--- a/pstack/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/pstack/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -196,6 +196,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba pstack/aout/Makefile.in
+diff -ruN a/pstack/aout/Makefile.in b/pstack/aout/Makefile.in
--- a/pstack/aout/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/pstack/aout/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -134,6 +134,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba regex/Makefile.in
+diff -ruN a/regex/Makefile.in b/regex/Makefile.in
--- a/regex/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/regex/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -180,6 +180,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba scripts/Makefile.in
+diff -ruN a/scripts/Makefile.in b/scripts/Makefile.in
--- a/scripts/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/scripts/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -176,6 +176,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba server-tools/Makefile.in
+diff -ruN a/server-tools/Makefile.in b/server-tools/Makefile.in
--- a/server-tools/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/server-tools/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -155,6 +155,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba server-tools/instance-manager/Makefile.in
+diff -ruN a/server-tools/instance-manager/Makefile.in b/server-tools/instance-manager/Makefile.in
--- a/server-tools/instance-manager/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/server-tools/instance-manager/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -205,6 +205,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba sql/Makefile.in
+diff -ruN a/sql/Makefile.in b/sql/Makefile.in
--- a/sql/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -274,6 +274,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba sql/ha_innodb.cc
+diff -ruN a/sql/ha_innodb.cc b/sql/ha_innodb.cc
--- a/sql/ha_innodb.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/ha_innodb.cc Wed Jul 29 13:34:11 2009 -0700
-@@ -3341,6 +3341,8 @@
+@@ -3329,6 +3329,8 @@
error = row_insert_for_mysql((byte*) record, prebuilt);
if (error == DB_SUCCESS && auto_inc_used) {
/* Fetch the value that was set in the autoincrement field */
-@@ -3613,6 +3615,8 @@
+@@ -3601,6 +3603,8 @@
}
}
innodb_srv_conc_exit_innodb(prebuilt->trx);
error = convert_error_code_to_mysql(error, user_thd);
-@@ -3661,6 +3665,8 @@
+@@ -3649,6 +3653,8 @@
error = row_update_for_mysql((byte*) record, prebuilt);
innodb_srv_conc_exit_innodb(prebuilt->trx);
error = convert_error_code_to_mysql(error, user_thd);
-@@ -4092,6 +4098,9 @@
+@@ -4080,6 +4086,9 @@
if (ret == DB_SUCCESS) {
error = 0;
table->status = 0;
} else if (ret == DB_RECORD_NOT_FOUND) {
error = HA_ERR_END_OF_FILE;
-diff -r 592f6c3641ba sql/ha_myisam.cc
+diff -ruN a/sql/ha_myisam.cc b/sql/ha_myisam.cc
--- a/sql/ha_myisam.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/ha_myisam.cc Wed Jul 29 13:34:11 2009 -0700
@@ -670,7 +670,9 @@
}
int ha_myisam::check(THD* thd, HA_CHECK_OPT* check_opt)
-@@ -1521,13 +1523,17 @@
+@@ -1516,13 +1518,17 @@
statistic_increment(table->in_use->status_var.ha_update_count,&LOCK_status);
if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE)
table->timestamp_field->set_time();
}
int ha_myisam::index_read(byte * buf, const byte * key,
-@@ -1538,6 +1544,13 @@
+@@ -1533,6 +1539,13 @@
&LOCK_status);
int error=mi_rkey(file,buf,active_index, key, key_len, find_flag);
table->status=error ? STATUS_NOT_FOUND: 0;
return error;
}
-@@ -1548,6 +1561,13 @@
+@@ -1543,6 +1556,13 @@
&LOCK_status);
int error=mi_rkey(file,buf,index, key, key_len, find_flag);
table->status=error ? STATUS_NOT_FOUND: 0;
return error;
}
-@@ -1558,6 +1578,13 @@
+@@ -1553,6 +1573,13 @@
&LOCK_status);
int error=mi_rkey(file,buf,active_index, key, key_len, HA_READ_PREFIX_LAST);
table->status=error ? STATUS_NOT_FOUND: 0;
return error;
}
-@@ -1568,6 +1595,13 @@
+@@ -1563,6 +1590,13 @@
&LOCK_status);
int error=mi_rnext(file,buf,active_index);
table->status=error ? STATUS_NOT_FOUND: 0;
return error;
}
-@@ -1578,6 +1612,13 @@
+@@ -1573,6 +1607,13 @@
&LOCK_status);
int error=mi_rprev(file,buf, active_index);
table->status=error ? STATUS_NOT_FOUND: 0;
return error;
}
-@@ -1588,6 +1629,13 @@
+@@ -1583,6 +1624,13 @@
&LOCK_status);
int error=mi_rfirst(file, buf, active_index);
table->status=error ? STATUS_NOT_FOUND: 0;
return error;
}
-@@ -1598,6 +1646,13 @@
+@@ -1593,6 +1641,13 @@
&LOCK_status);
int error=mi_rlast(file, buf, active_index);
table->status=error ? STATUS_NOT_FOUND: 0;
return error;
}
-@@ -1614,6 +1669,13 @@
+@@ -1609,6 +1664,13 @@
error= mi_rnext_same(file,buf);
} while (error == HA_ERR_RECORD_DELETED);
table->status=error ? STATUS_NOT_FOUND: 0;
return error;
}
-@@ -1631,6 +1693,7 @@
+@@ -1626,6 +1688,7 @@
&LOCK_status);
int error=mi_scan(file, buf);
table->status=error ? STATUS_NOT_FOUND: 0;
return error;
}
-@@ -1645,6 +1708,7 @@
+@@ -1640,6 +1703,7 @@
&LOCK_status);
int error=mi_rrnd(file, buf, my_get_ptr(pos,ref_length));
table->status=error ? STATUS_NOT_FOUND: 0;
return error;
}
-diff -r 592f6c3641ba sql/handler.cc
+diff -ruN a/sql/handler.cc b/sql/handler.cc
--- a/sql/handler.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/handler.cc Wed Jul 29 13:34:11 2009 -0700
-@@ -726,6 +726,8 @@
+@@ -727,6 +727,8 @@
if (cookie)
tc_log->unlog(cookie, xid);
DBUG_EXECUTE_IF("crash_commit_after", abort(););
end:
if (is_real_trans)
start_waiting_global_read_lock(thd);
-@@ -783,6 +785,7 @@
+@@ -784,6 +786,7 @@
thd->transaction.cleanup();
}
}
#endif /* USING_TRANSACTIONS */
DBUG_RETURN(error);
}
-@@ -1223,6 +1226,7 @@
+@@ -1224,6 +1227,7 @@
statistic_increment(thd->status_var.ha_rollback_count,&LOCK_status);
*ht=0; // keep it conveniently zero-filled
}
DBUG_RETURN(error);
}
-@@ -1453,6 +1457,8 @@
+@@ -1454,6 +1458,8 @@
else
dupp_ref=ref+ALIGN_SIZE(ref_length);
}
DBUG_RETURN(error);
}
-@@ -2287,6 +2293,111 @@
+@@ -2291,6 +2297,111 @@
return error;
}
/****************************************************************************
** Some general functions that isn't in the handler class
-diff -r 592f6c3641ba sql/handler.h
+diff -ruN a/sql/handler.h b/sql/handler.h
--- a/sql/handler.h Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/handler.h Wed Jul 29 13:34:11 2009 -0700
@@ -32,6 +32,10 @@
/*
default rename_table() and delete_table() rename/delete files with a
given name and extensions from bas_ext()
-diff -r 592f6c3641ba sql/lex.h
+diff -ruN a/sql/lex.h b/sql/lex.h
--- a/sql/lex.h Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/lex.h Wed Jul 29 13:34:11 2009 -0700
@@ -109,6 +109,7 @@
{ "USE_FRM", SYM(USE_FRM)},
{ "USING", SYM(USING)},
{ "UTC_DATE", SYM(UTC_DATE_SYM)},
-diff -r 592f6c3641ba sql/log.cc
+diff -ruN a/sql/log.cc b/sql/log.cc
--- a/sql/log.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/log.cc Wed Jul 29 13:34:11 2009 -0700
-@@ -1958,18 +1958,24 @@
+@@ -1960,18 +1960,24 @@
thd->current_insert_id);
if (e.write(file))
goto err;
}
if (thd->user_var_events.elements)
{
-@@ -1985,6 +1991,8 @@
+@@ -1987,6 +1993,8 @@
user_var_event->charset_number);
if (e.write(file))
goto err;
}
}
}
-@@ -1995,6 +2003,8 @@
+@@ -1997,6 +2005,8 @@
if (event_info->write(file))
goto err;
if (file == &log_file) // we are writing to the real log (disk)
{
-@@ -2117,6 +2127,7 @@
+@@ -2119,6 +2129,7 @@
*/
if (qinfo.write(&log_file))
goto err;
/* Read from the file used to cache the queries .*/
if (reinit_io_cache(cache, READ_CACHE, 0, 0, 0))
-@@ -2163,6 +2174,7 @@
+@@ -2165,6 +2176,7 @@
/* write the first half of the split header */
if (my_b_write(&log_file, header, carry))
goto err;
/*
copy fixed second half of header to cache so the correct
-@@ -2231,6 +2243,8 @@
+@@ -2233,6 +2245,8 @@
/* Write data to the binary log file */
if (my_b_write(&log_file, cache->read_pos, length))
goto err;
cache->read_pos=cache->read_end; // Mark buffer used up
DBUG_EXECUTE_IF("half_binlogged_transaction", goto DBUG_skip_commit;);
} while ((length=my_b_fill(cache)));
-@@ -2239,6 +2253,8 @@
+@@ -2241,6 +2255,8 @@
if (commit_event->write(&log_file))
goto err;
#ifndef DBUG_OFF
DBUG_skip_commit:
#endif
-diff -r 592f6c3641ba sql/mysql_priv.h
+diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h
--- a/sql/mysql_priv.h Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/mysql_priv.h Wed Jul 29 13:34:11 2009 -0700
@@ -837,7 +837,15 @@
extern const char *opt_date_time_formats[];
extern KNOWN_DATE_TIME_FORMAT known_date_time_formats[];
-diff -r 592f6c3641ba sql/mysqld.cc
+diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/mysqld.cc Wed Jul 29 13:34:11 2009 -0700
@@ -417,6 +417,7 @@
sp_cache_init();
/* Parameter for threads created for connections */
(void) pthread_attr_init(&connection_attrib);
-@@ -3428,6 +3446,10 @@
+@@ -3431,6 +3449,10 @@
sql_print_error("Out of memory");
unireg_abort(1);
}
if (ha_init())
{
sql_print_error("Can't init databases");
-@@ -3510,6 +3532,8 @@
+@@ -3513,6 +3535,8 @@
init_max_user_conn();
init_update_queries();
DBUG_RETURN(0);
}
-@@ -4236,6 +4260,7 @@
+@@ -4252,6 +4276,7 @@
{
DBUG_PRINT("error",("Too many connections"));
close_connection(thd, ER_CON_COUNT_ERROR, 1);
delete thd;
DBUG_VOID_RETURN;
}
-@@ -5056,6 +5081,7 @@
+@@ -5073,6 +5098,7 @@
OPT_PROFILING_USE_GETRUSAGE,
OPT_SLOW_LOG,
OPT_SLOW_QUERY_LOG_FILE,
OPT_USE_GLOBAL_LONG_QUERY_TIME,
OPT_INNODB_ROLLBACK_ON_TIMEOUT,
OPT_SECURE_FILE_PRIV,
-@@ -6523,6 +6549,10 @@
+@@ -6545,6 +6571,10 @@
(gptr*) &max_system_variables.net_wait_timeout, 0, GET_ULONG,
REQUIRED_ARG, NET_WAIT_TIMEOUT, 1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT),
0, 1, 0},
{0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
};
-diff -r 592f6c3641ba sql/set_var.cc
+diff -ruN a/sql/set_var.cc b/sql/set_var.cc
--- a/sql/set_var.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/set_var.cc Wed Jul 29 13:34:11 2009 -0700
-@@ -325,6 +325,7 @@
+@@ -326,6 +326,7 @@
sys_var_thd_ulong sys_read_buff_size("read_buffer_size",
&SV::read_buff_size);
sys_var_bool_ptr sys_readonly("read_only", &opt_readonly);
sys_var_thd_ulong sys_read_rnd_buff_size("read_rnd_buffer_size",
&SV::read_rnd_buff_size);
sys_var_thd_ulong sys_div_precincrement("div_precision_increment",
-@@ -837,6 +838,7 @@
+@@ -843,6 +844,7 @@
&sys_trans_alloc_block_size,
&sys_trans_prealloc_size,
&sys_tx_isolation,
&sys_version,
#ifdef HAVE_BERKELEY_DB
&sys_version_bdb,
-@@ -1190,6 +1192,7 @@
+@@ -1197,6 +1199,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
-diff -r 592f6c3641ba sql/share/Makefile.in
+diff -ruN a/sql/share/Makefile.in b/sql/share/Makefile.in
--- a/sql/share/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/share/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -144,6 +144,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba sql/sql_base.cc
+diff -ruN a/sql/sql_base.cc b/sql/sql_base.cc
--- a/sql/sql_base.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/sql_base.cc Wed Jul 29 13:34:11 2009 -0700
@@ -624,6 +624,12 @@
db_type table_type=table->s->db_type;
strmov(path,table->s->path);
free_io_cache(table);
-diff -r 592f6c3641ba sql/sql_class.cc
+diff -ruN a/sql/sql_class.cc b/sql/sql_class.cc
--- a/sql/sql_class.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/sql_class.cc Wed Jul 29 13:34:11 2009 -0700
@@ -239,6 +239,13 @@
}
-@@ -2108,6 +2226,7 @@
+@@ -2110,6 +2228,7 @@
if (likely(thd != 0))
{ /* current_thd==0 when close_connection() calls net_send_error() */
thd->status_var.bytes_sent+= length;
}
}
-@@ -2115,6 +2234,7 @@
+@@ -2117,6 +2236,7 @@
void thd_increment_bytes_received(ulong length)
{
current_thd->status_var.bytes_received+= length;
}
-diff -r 592f6c3641ba sql/sql_class.h
+diff -ruN a/sql/sql_class.h b/sql/sql_class.h
--- a/sql/sql_class.h Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/sql_class.h Wed Jul 29 13:34:11 2009 -0700
-@@ -1302,6 +1302,8 @@
+@@ -1308,6 +1308,8 @@
first byte of the packet in do_command()
*/
enum enum_server_command command;
uint32 server_id;
uint32 file_id; // for LOAD DATA INFILE
/*
-@@ -1498,6 +1500,8 @@
+@@ -1504,6 +1506,8 @@
/* variables.transaction_isolation is reset to this after each commit */
enum_tx_isolation session_tx_isolation;
enum_check_fields count_cuted_fields;
DYNAMIC_ARRAY user_var_events; /* For user variables replication */
MEM_ROOT *user_var_events_alloc; /* Allocate above array elements here */
-@@ -1607,6 +1611,49 @@
+@@ -1613,6 +1617,49 @@
*/
LOG_INFO* current_linfo;
NET* slave_net; // network connection from slave -> m.
/* Used by the sys_var class to store temporary values */
union
{
-@@ -1662,6 +1709,11 @@
+@@ -1668,6 +1715,11 @@
alloc_root.
*/
void init_for_queries();
void change_user(void);
void cleanup(void);
void cleanup_after_query();
-@@ -1891,8 +1943,14 @@
+@@ -1901,8 +1953,14 @@
if (p_db_length)
*p_db_length= db_length;
return FALSE;
public:
/**
Add an internal error handler to the thread execution context.
-@@ -1935,6 +1993,10 @@
+@@ -1953,6 +2011,10 @@
MEM_ROOT main_mem_root;
};
#define tmp_disable_binlog(A) \
{ulonglong tmp_disable_binlog__save_options= (A)->options; \
-diff -r 592f6c3641ba sql/sql_delete.cc
+diff -ruN a/sql/sql_delete.cc b/sql/sql_delete.cc
--- a/sql/sql_delete.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/sql_delete.cc Wed Jul 29 13:34:11 2009 -0700
-@@ -358,6 +358,7 @@
+@@ -366,6 +366,7 @@
send_ok(thd,deleted);
DBUG_PRINT("info",("%ld records deleted",(long) deleted));
}
DBUG_RETURN(error >= 0 || thd->net.report_error);
}
-@@ -887,6 +888,7 @@
+@@ -895,6 +896,7 @@
thd->row_count_func= deleted;
::send_ok(thd, deleted);
}
return 0;
}
-diff -r 592f6c3641ba sql/sql_insert.cc
+diff -ruN a/sql/sql_insert.cc b/sql/sql_insert.cc
--- a/sql/sql_insert.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/sql_insert.cc Wed Jul 29 13:34:11 2009 -0700
-@@ -990,6 +990,7 @@
+@@ -999,6 +999,7 @@
thd->row_count_func= info.copied + info.deleted + updated;
::send_ok(thd, (ulong) thd->row_count_func, id, buff);
}
thd->abort_on_warning= 0;
DBUG_RETURN(FALSE);
-@@ -3094,6 +3095,7 @@
+@@ -3103,6 +3104,7 @@
autoinc_value_of_first_inserted_row : thd->insert_id_used ?
thd->last_insert_id : 0;
::send_ok(thd, (ulong) thd->row_count_func, id, buff);
DBUG_RETURN(0);
}
-diff -r 592f6c3641ba sql/sql_lex.h
+diff -ruN a/sql/sql_lex.h b/sql/sql_lex.h
--- a/sql/sql_lex.h Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/sql_lex.h Wed Jul 29 13:34:11 2009 -0700
@@ -101,6 +101,9 @@
/* This should be the last !!! */
SQLCOM_END
};
-diff -r 592f6c3641ba sql/sql_parse.cc
+diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
--- a/sql/sql_parse.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/sql_parse.cc Wed Jul 29 13:34:11 2009 -0700
@@ -78,6 +78,12 @@
#ifdef __WIN__
extern void win_install_sigabrt_handler(void);
#endif
-@@ -504,6 +521,7 @@
+@@ -511,6 +528,7 @@
mysql_log.write(thd,COM_CONNECT,"%s",ER(ER_NOT_SUPPORTED_AUTH_MODE));
DBUG_RETURN(-1);
}
net_printf_error(thd, ER_ACCESS_DENIED_ERROR,
thd->main_security_ctx.user,
thd->main_security_ctx.host_or_ip,
-@@ -536,12 +554,190 @@
+@@ -543,13 +561,191 @@
void init_max_user_conn(void)
{
#ifndef NO_EMBEDDED_ACCESS_CHECKS
- 0,0,
- (hash_get_key) get_key_conn, (hash_free_key) free_user,
- 0);
--#endif
--}
+ if (hash_init(&hash_user_connections,system_charset_info,max_connections,
+ 0,0,
+ (hash_get_key) get_key_conn, (hash_free_key) free_user,
+ sql_print_error("Initializing hash_user_connections failed.");
+ exit(1);
+ }
-+#endif
-+}
-+
+ #endif
+ }
+
+byte *get_key_user_stats(USER_STATS *user_stats, uint *length,
+ my_bool not_used __attribute__((unused)))
+{
+ }
+}
+
-
++
/*
-@@ -599,7 +795,10 @@
+ check if user has already too many connections
+@@ -606,7 +802,10 @@
end:
if (error)
(void) pthread_mutex_unlock(&LOCK_user_conn);
DBUG_RETURN(error);
}
-@@ -646,6 +845,25 @@
+@@ -653,6 +852,25 @@
#endif /* NO_EMBEDDED_ACCESS_CHECKS */
}
/*
-@@ -698,6 +916,214 @@
+@@ -705,6 +923,214 @@
return uc_update_queries[command] != 0;
}
/*
Reset per-hour user resource limits when it has been more than
an hour since they were last checked
-@@ -1184,6 +1610,8 @@
+@@ -1190,6 +1616,8 @@
my_net_set_read_timeout(net, connect_timeout);
my_net_set_write_timeout(net, connect_timeout);
if ((error=check_connection(thd)))
{ // Wrong permissions
if (error > 0)
-@@ -1193,8 +1621,22 @@
+@@ -1199,8 +1627,22 @@
my_sleep(1000); /* must wait after eof() */
#endif
statistic_increment(aborted_connects,&LOCK_status);
#ifdef __NETWARE__
netware_reg_user(sctx->ip, sctx->user, "MySQL");
#endif
-@@ -1251,6 +1693,7 @@
+@@ -1257,6 +1699,7 @@
(net->vio && net->error && net->report_error))
{
statistic_increment(aborted_threads, &LOCK_status);
}
if (net->error && net->vio != 0 && net->report_error)
-@@ -1270,6 +1713,8 @@
+@@ -1276,6 +1719,8 @@
end_thread:
close_connection(thd, 0, 1);
end_thread(thd,1);
/*
If end_thread returns, we are either running with --one-thread
-@@ -1601,6 +2046,13 @@
+@@ -1606,6 +2051,13 @@
thd->clear_error(); // Clear error message
net_new_transaction(net);
packet_length= my_net_read(net);
-@@ -1759,6 +2211,9 @@
+@@ -1764,6 +2216,9 @@
}
thd->command=command;
/*
Commands which always take a long time are logged into
the slow log only if opt_log_slow_admin_statements is set.
-@@ -4539,6 +4994,15 @@
+@@ -4569,6 +5024,15 @@
if (check_global_access(thd,RELOAD_ACL))
goto error;
/*
reload_acl_and_cache() will tell us if we are allowed to write to the
binlog or not.
-@@ -4847,6 +5311,7 @@
+@@ -4877,6 +5341,7 @@
{
if (check_global_access(thd, SUPER_ACL))
{
my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), "SUPER");
goto create_sp_error;
}
-@@ -5691,6 +6156,7 @@
+@@ -5721,6 +6186,7 @@
if (!no_errors)
{
const char *db_name= db ? db : thd->db;
my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
sctx->priv_user, sctx->priv_host, db_name);
}
-@@ -5726,6 +6192,7 @@
+@@ -5756,6 +6222,7 @@
{ // We can never grant this
DBUG_PRINT("error",("No possible access"));
if (!no_errors)
my_error(ER_ACCESS_DENIED_ERROR, MYF(0),
sctx->priv_user,
sctx->priv_host,
-@@ -5758,11 +6225,15 @@
+@@ -5788,11 +6255,15 @@
DBUG_PRINT("error",("Access denied"));
if (!no_errors)
DBUG_RETURN(TRUE); /* purecov: tested */
#endif /* NO_EMBEDDED_ACCESS_CHECKS */
}
-@@ -5796,6 +6267,7 @@
+@@ -5826,6 +6297,7 @@
if ((thd->security_ctx->master_access & want_access))
return 0;
get_privilege_desc(command, sizeof(command), want_access);
my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), command);
return 1;
#endif /* NO_EMBEDDED_ACCESS_CHECKS */
-@@ -5828,6 +6300,7 @@
+@@ -5858,6 +6330,7 @@
if (!thd->col_access && check_grant_db(thd, dst_db_name))
{
my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
thd->security_ctx->priv_user,
thd->security_ctx->priv_host,
-@@ -5859,6 +6332,12 @@
+@@ -5889,6 +6362,12 @@
check_grant(thd, SELECT_ACL, dst_table, 2, UINT_MAX, FALSE);
}
case SCH_OPEN_TABLES:
case SCH_VARIABLES:
case SCH_STATUS:
-@@ -5912,8 +6391,8 @@
+@@ -5942,8 +6421,8 @@
#ifndef NO_EMBEDDED_ACCESS_CHECKS
TABLE_LIST *org_tables= tables;
#endif
-+ Security_context *sctx= thd->security_ctx, *backup_ctx= thd->security_ctx;
- TABLE_LIST *first_not_own_table= thd->lex->first_not_own_table();
-- Security_context *sctx= thd->security_ctx, *backup_ctx= thd->security_ctx;
+- TABLE_LIST *first_not_own_table= thd->lex->first_not_own_table();
+ Security_context *sctx= thd->security_ctx, *backup_ctx= thd->security_ctx;
++ TABLE_LIST *first_not_own_table= thd->lex->first_not_own_table();
/*
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
-@@ -5930,9 +6409,12 @@
+@@ -5960,9 +6439,12 @@
(want_access & ~(SELECT_ACL | EXTRA_ACL | FILE_ACL)))
{
if (!no_errors)
return TRUE;
}
/*
-@@ -6442,6 +6924,30 @@
+@@ -6472,6 +6954,30 @@
lex_start(thd);
mysql_reset_thd_for_next_command(thd);
if (query_cache_send_result_to_client(thd, (char*) inBuf, length) <= 0)
{
LEX *lex= thd->lex;
-@@ -6520,6 +7026,43 @@
+@@ -6550,6 +7056,43 @@
*found_semicolon= NULL;
}
DBUG_VOID_RETURN;
}
-@@ -7531,8 +8074,35 @@
+@@ -7561,8 +8104,35 @@
pthread_mutex_unlock(&LOCK_active_mi);
}
#endif
*write_to_binlog= tmp_write_to_binlog;
return result;
}
-diff -r 592f6c3641ba sql/sql_prepare.cc
+diff -ruN a/sql/sql_prepare.cc b/sql/sql_prepare.cc
--- a/sql/sql_prepare.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/sql_prepare.cc Wed Jul 29 13:34:11 2009 -0700
@@ -81,6 +81,9 @@
DBUG_VOID_RETURN;
}
-@@ -2281,8 +2346,32 @@
+@@ -2280,8 +2345,32 @@
/* First of all clear possible warnings from the previous command */
mysql_reset_thd_for_next_command(thd);
#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER)
thd->profiling.set_query_source(stmt->query, stmt->query_length);
-@@ -2325,11 +2414,50 @@
+@@ -2324,11 +2413,50 @@
test(flags & (ulong) CURSOR_TYPE_READ_ONLY));
if (!(specialflag & SPECIAL_NO_PRIOR))
my_pthread_setprio(pthread_self(), WAIT_PRIOR);
DBUG_VOID_RETURN;
}
-@@ -2423,6 +2551,31 @@
+@@ -2422,6 +2550,31 @@
/* First of all clear possible warnings from the previous command */
mysql_reset_thd_for_next_command(thd);
statistic_increment(thd->status_var.com_stmt_fetch, &LOCK_status);
if (!(stmt= find_prepared_statement(thd, stmt_id, "mysql_stmt_fetch")))
DBUG_VOID_RETURN;
-@@ -2455,6 +2608,43 @@
+@@ -2454,6 +2607,43 @@
thd->restore_backup_statement(stmt, &stmt_backup);
thd->stmt_arena= thd;
DBUG_VOID_RETURN;
}
-@@ -2487,6 +2677,30 @@
+@@ -2486,6 +2676,30 @@
/* First of all clear possible warnings from the previous command */
mysql_reset_thd_for_next_command(thd);
statistic_increment(thd->status_var.com_stmt_reset, &LOCK_status);
if (!(stmt= find_prepared_statement(thd, stmt_id, "mysql_stmt_reset")))
DBUG_VOID_RETURN;
-@@ -2503,6 +2717,43 @@
+@@ -2502,6 +2716,43 @@
send_ok(thd);
DBUG_VOID_RETURN;
}
-diff -r 592f6c3641ba sql/sql_show.cc
+diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
--- a/sql/sql_show.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/sql_show.cc Wed Jul 29 13:34:11 2009 -0700
@@ -540,6 +540,7 @@
my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
sctx->priv_user, sctx->host_or_ip, dbname);
mysql_log.write(thd,COM_INIT_DB,ER(ER_DBACCESS_DENIED_ERROR),
-@@ -1890,6 +1891,300 @@
+@@ -1888,6 +1889,300 @@
DBUG_RETURN(FALSE);
}
/* collect status for all running threads */
-@@ -4500,6 +4795,77 @@
+@@ -4495,6 +4790,77 @@
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
};
/*
Description of ST_FIELD_INFO in table.h
-@@ -4509,6 +4875,8 @@
+@@ -4504,6 +4870,8 @@
{
{"CHARACTER_SETS", charsets_fields_info, create_schema_table,
fill_schema_charsets, make_character_sets_old_format, 0, -1, -1, 0},
{"COLLATIONS", collation_fields_info, create_schema_table,
fill_schema_collation, make_old_format, 0, -1, -1, 0},
{"COLLATION_CHARACTER_SET_APPLICABILITY", coll_charset_app_fields_info,
-@@ -4517,6 +4885,8 @@
+@@ -4512,6 +4880,8 @@
get_all_tables, make_columns_old_format, get_schema_column_record, 1, 2, 0},
{"COLUMN_PRIVILEGES", column_privileges_fields_info, create_schema_table,
fill_schema_column_privileges, 0, 0, -1, -1, 0},
{"KEY_COLUMN_USAGE", key_column_usage_fields_info, create_schema_table,
get_all_tables, 0, get_schema_key_column_usage_record, 4, 5, 0},
{"OPEN_TABLES", open_tables_fields_info, create_schema_table,
-@@ -4542,10 +4912,14 @@
+@@ -4537,10 +4907,14 @@
get_all_tables, make_table_names_old_format, 0, 1, 2, 1},
{"TABLE_PRIVILEGES", table_privileges_fields_info, create_schema_table,
fill_schema_table_privileges, 0, 0, -1, -1, 0},
{"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 592f6c3641ba sql/sql_update.cc
+diff -ruN a/sql/sql_update.cc b/sql/sql_update.cc
--- a/sql/sql_update.cc Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/sql_update.cc Wed Jul 29 13:34:11 2009 -0700
-@@ -601,7 +601,8 @@
+@@ -607,7 +607,8 @@
(thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated;
send_ok(thd, (ulong) thd->row_count_func,
thd->insert_id_used ? thd->last_insert_id : 0L,buff);
}
thd->count_cuted_fields= CHECK_FIELD_IGNORE; /* calc cuted fields */
thd->abort_on_warning= 0;
-@@ -1832,5 +1833,6 @@
+@@ -1838,5 +1839,6 @@
(thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated;
::send_ok(thd, (ulong) thd->row_count_func,
thd->insert_id_used ? thd->last_insert_id : 0L,buff);
+ thd->updated_row_count += thd->row_count_func;
return FALSE;
}
-diff -r 592f6c3641ba sql/sql_yacc.yy
+diff -ruN a/sql/sql_yacc.yy b/sql/sql_yacc.yy
--- a/sql/sql_yacc.yy Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/sql_yacc.yy Wed Jul 29 13:34:11 2009 -0700
-@@ -523,6 +523,7 @@
+@@ -557,6 +557,7 @@
%token CHECK_SYM
%token CIPHER_SYM
%token CLIENT_SYM
%token CLOSE_SYM
%token COALESCE
%token CODE_SYM
-@@ -680,6 +681,7 @@
+@@ -714,6 +715,7 @@
%token IMPORT
%token INDEXES
%token INDEX_SYM
%token INFILE
%token INNER_SYM
%token INNOBASE_SYM
-@@ -909,6 +911,7 @@
+@@ -943,6 +945,7 @@
%token SIGNED_SYM
%token SIMPLE_SYM
%token SLAVE
%token SMALLINT
%token SNAPSHOT_SYM
%token SOUNDS_SYM
-@@ -949,6 +952,7 @@
+@@ -983,6 +986,7 @@
%token TABLES
%token TABLESPACE
%token TABLE_SYM
%token TEMPORARY
%token TEMPTABLE_SYM
%token TERMINATED
-@@ -991,6 +995,7 @@
+@@ -1025,6 +1029,7 @@
%token UPGRADE_SYM
%token USAGE
%token USER
%token USE_FRM
%token USE_SYM
%token USING
-@@ -8255,6 +8260,38 @@
+@@ -8285,6 +8290,38 @@
{
Lex->sql_command = SQLCOM_SHOW_SLAVE_STAT;
}
| CREATE PROCEDURE sp_name
{
LEX *lex= Lex;
-@@ -8459,9 +8496,14 @@
+@@ -8485,9 +8522,14 @@
| LOGS_SYM { Lex->type|= REFRESH_LOG; }
| STATUS_SYM { Lex->type|= REFRESH_STATUS; }
| SLAVE { Lex->type|= REFRESH_SLAVE; }
opt_table_list:
/* empty */ {;}
-@@ -9450,6 +9492,7 @@
+@@ -9477,6 +9519,7 @@
| CHAIN_SYM {}
| CHANGED {}
| CIPHER_SYM {}
| CLIENT_SYM {}
| CODE_SYM {}
| COLLATION_SYM {}
-@@ -9502,6 +9545,7 @@
+@@ -9529,6 +9572,7 @@
| HOSTS_SYM {}
| HOUR_SYM {}
| IDENTIFIED_SYM {}
| INVOKER_SYM {}
| IMPORT {}
| INDEXES {}
-@@ -9611,6 +9655,7 @@
+@@ -9638,6 +9682,7 @@
| SIMPLE_SYM {}
| SHARE_SYM {}
| SHUTDOWN {}
| SNAPSHOT_SYM {}
| SOUNDS_SYM {}
| SOURCE_SYM {}
-@@ -9627,6 +9672,7 @@
+@@ -9654,6 +9699,7 @@
| SUSPEND_SYM {}
| SWAPS_SYM {}
| SWITCHES_SYM {}
| TABLES {}
| TABLESPACE {}
| TEMPORARY {}
-@@ -9647,6 +9693,7 @@
+@@ -9674,6 +9720,7 @@
| UNKNOWN_SYM {}
| UNTIL_SYM {}
| USER {}
| USE_FRM {}
| VARIABLES {}
| VIEW_SYM {}
-diff -r 592f6c3641ba sql/structs.h
+diff -ruN a/sql/structs.h b/sql/structs.h
--- a/sql/structs.h Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/structs.h Wed Jul 29 13:34:11 2009 -0700
-@@ -273,6 +273,98 @@
+@@ -279,6 +279,98 @@
time_t intime;
} USER_CONN;
/* 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 592f6c3641ba sql/table.h
+diff -ruN a/sql/table.h b/sql/table.h
--- a/sql/table.h Wed Jul 29 13:33:34 2009 -0700
+++ b/sql/table.h Wed Jul 29 13:34:11 2009 -0700
@@ -371,10 +371,12 @@
SCH_VARIABLES,
SCH_VIEWS
};
-diff -r 592f6c3641ba strings/Makefile.in
+diff -ruN a/strings/Makefile.in b/strings/Makefile.in
--- a/strings/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/strings/Makefile.in Wed Jul 29 13:34:11 2009 -0700
-@@ -342,6 +342,7 @@
+@@ -344,6 +344,7 @@
LIBDL = @LIBDL@
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba support-files/MacOSX/Makefile.in
+diff -ruN a/support-files/MacOSX/Makefile.in b/support-files/MacOSX/Makefile.in
--- a/support-files/MacOSX/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/support-files/MacOSX/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -148,6 +148,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba support-files/Makefile.in
+diff -ruN a/support-files/Makefile.in b/support-files/Makefile.in
--- a/support-files/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/support-files/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -171,6 +171,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba support-files/RHEL4-SElinux/Makefile.in
+diff -ruN a/support-files/RHEL4-SElinux/Makefile.in b/support-files/RHEL4-SElinux/Makefile.in
--- a/support-files/RHEL4-SElinux/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/support-files/RHEL4-SElinux/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -146,6 +146,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba tests/Makefile.in
+diff -ruN a/tests/Makefile.in b/tests/Makefile.in
--- a/tests/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/tests/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -193,6 +193,7 @@
LIBS = @CLIENT_LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba tools/Makefile.in
+diff -ruN a/tools/Makefile.in b/tools/Makefile.in
--- a/tools/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/tools/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -167,6 +167,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba vio/Makefile.in
+diff -ruN a/vio/Makefile.in b/vio/Makefile.in
--- a/vio/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/vio/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -176,6 +176,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba win/Makefile.in
+diff -ruN a/win/Makefile.in b/win/Makefile.in
--- a/win/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/win/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -144,6 +144,7 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 592f6c3641ba zlib/Makefile.in
+diff -ruN a/zlib/Makefile.in b/zlib/Makefile.in
--- a/zlib/Makefile.in Wed Jul 29 13:33:34 2009 -0700
+++ b/zlib/Makefile.in Wed Jul 29 13:34:11 2009 -0700
@@ -187,6 +187,7 @@
LIBS = $(NON_THREADED_LIBS)
LIBTOOL = @LIBTOOL@
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -Nur a/include/mysql_com.h b/include/mysql_com.h
---- a/include/mysql_com.h 2010-05-22 00:26:45.000000000 -0700
-+++ b/include/mysql_com.h 2010-05-22 00:27:14.000000000 -0700
-@@ -228,7 +228,7 @@
-
- my_bool report_error; /* We should report error (we have unreported error) */
- my_bool return_errno;
--#if defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY)
-+#if defined(MYSQL_SERVER)
- /*
- Controls whether a big packet should be skipped.
-
projects / packages / mysql.git / commitdiff