packages: mysql/mysql-acc-pslist.patch, mysql/mysql-microslow.patch, mysql/...
arekm
arekm at pld-linux.org
Fri Jun 19 23:40:51 CEST 2009
Author: arekm Date: Fri Jun 19 21:40:51 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- update patches
---- Files affected:
packages/mysql:
mysql-acc-pslist.patch (1.4 -> 1.5) , mysql-microslow.patch (1.1 -> 1.2) , mysql-userstats.patch (1.4 -> 1.5) , mysql.spec (1.452 -> 1.453) , mysql-innodb_rw_lock.patch (1.1 -> 1.2) , mysql-split_buf_pool_mutex_fixed_optimistic_safe.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/mysql/mysql-acc-pslist.patch
diff -u packages/mysql/mysql-acc-pslist.patch:1.4 packages/mysql/mysql-acc-pslist.patch:1.5
--- packages/mysql/mysql-acc-pslist.patch:1.4 Sat Apr 25 12:26:55 2009
+++ packages/mysql/mysql-acc-pslist.patch Fri Jun 19 23:40:45 2009
@@ -1,6 +1,6 @@
-diff -r 174803e7e869 mysql-test/r/create.result
---- a/mysql-test/r/create.result Thu Sep 04 12:17:56 2008 -0700
-+++ b/mysql-test/r/create.result Thu Sep 04 12:20:19 2008 -0700
+diff -r 1a59073d658d mysql-test/r/create.result
+--- a/mysql-test/r/create.result Sat Sep 13 17:31:30 2008 -0700
++++ b/mysql-test/r/create.result Sat Sep 13 17:31:40 2008 -0700
@@ -1720,7 +1720,8 @@
`COMMAND` varchar(16) NOT NULL DEFAULT '',
`TIME` bigint(7) NOT NULL DEFAULT '0',
@@ -21,19 +21,9 @@
) ENGINE=MyISAM DEFAULT CHARSET=utf8
drop table t1;
create table t1 like information_schema.character_sets;
-diff -r 174803e7e869 patch_info/acc-pslist.info
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/patch_info/acc-pslist.info Thu Sep 04 12:20:19 2008 -0700
-@@ -0,0 +1,6 @@
-+File=acc-pslist.patch
-+Name=Milliseconds in PROCESSLIST
-+Version=1.0
-+Author=Percona <info at percona.com>
-+License=GPL
-+Comment=
-diff -r 174803e7e869 sql/sql_show.cc
---- a/sql/sql_show.cc Thu Sep 04 12:17:56 2008 -0700
-+++ b/sql/sql_show.cc Thu Sep 04 12:20:19 2008 -0700
+diff -r 1a59073d658d sql/sql_show.cc
+--- a/sql/sql_show.cc Sat Sep 13 17:31:30 2008 -0700
++++ b/sql/sql_show.cc Sat Sep 13 17:31:40 2008 -0700
@@ -1803,7 +1803,7 @@
TABLE *table= tables->table;
CHARSET_INFO *cs= system_charset_info;
@@ -43,7 +33,7 @@
DBUG_ENTER("fill_process_list");
user= thd->security_ctx->master_access & PROCESS_ACL ?
-@@ -1861,8 +1861,8 @@
+@@ -1873,8 +1873,8 @@
table->field[4]->store(command_name[tmp->command].str,
command_name[tmp->command].length, cs);
/* MYSQL_TIME */
@@ -70,7 +60,7 @@
}
}
-@@ -5532,7 +5536,7 @@
+@@ -5531,7 +5535,7 @@
into it two numbers, based on modulus of base-10 numbers. In the ones
position is the number of decimals. Tens position is unused. In the
hundreds and thousands position is a two-digit decimal number representing
@@ -79,7 +69,7 @@
0<decimals<10 and 0<=length<100 .
@param
-@@ -6540,6 +6544,8 @@
+@@ -6539,6 +6543,8 @@
{"STATE", 64, MYSQL_TYPE_STRING, 0, 1, "State", SKIP_OPEN_TABLE},
{"INFO", PROCESS_LIST_INFO_WIDTH, MYSQL_TYPE_STRING, 0, 1, "Info",
SKIP_OPEN_TABLE},
================================================================
Index: packages/mysql/mysql-microslow.patch
diff -u packages/mysql/mysql-microslow.patch:1.1 packages/mysql/mysql-microslow.patch:1.2
--- packages/mysql/mysql-microslow.patch:1.1 Sat Dec 6 21:46:09 2008
+++ packages/mysql/mysql-microslow.patch Fri Jun 19 23:40:45 2009
@@ -1,16 +1,6 @@
-diff -r debbd352c16a patch_info/microslow.info
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/patch_info/microslow.info Thu Sep 04 12:16:10 2008 -0700
-@@ -0,0 +1,6 @@
-+File=microslow.patch
-+Name=Extended statistics in slow.log
-+Version=1.0
-+Author=Percona <info at percona.com>
-+License=GPL
-+Comment=
-diff -r debbd352c16a sql/event_scheduler.cc
---- a/sql/event_scheduler.cc Thu Sep 04 12:13:31 2008 -0700
-+++ b/sql/event_scheduler.cc Thu Sep 04 12:16:10 2008 -0700
+diff -r 0b1f42e1aacf sql/event_scheduler.cc
+--- a/sql/event_scheduler.cc Thu Dec 04 08:55:22 2008 -0800
++++ b/sql/event_scheduler.cc Thu Dec 04 08:55:29 2008 -0800
@@ -192,6 +192,7 @@
thd->client_capabilities|= CLIENT_MULTI_RESULTS;
pthread_mutex_lock(&LOCK_thread_count);
@@ -19,9 +9,9 @@
pthread_mutex_unlock(&LOCK_thread_count);
/*
-diff -r debbd352c16a sql/filesort.cc
---- a/sql/filesort.cc Thu Sep 04 12:13:31 2008 -0700
-+++ b/sql/filesort.cc Thu Sep 04 12:16:10 2008 -0700
+diff -r 0b1f42e1aacf sql/filesort.cc
+--- a/sql/filesort.cc Thu Dec 04 08:55:22 2008 -0800
++++ b/sql/filesort.cc Thu Dec 04 08:55:29 2008 -0800
@@ -188,6 +188,7 @@
{
status_var_increment(thd->status_var.filesort_scan_count);
@@ -38,7 +28,7 @@
if (table_sort.buffpek && table_sort.buffpek_len < maxbuffer)
{
x_free(table_sort.buffpek);
-@@ -1162,6 +1164,7 @@
+@@ -1202,6 +1204,7 @@
DBUG_ENTER("merge_buffers");
status_var_increment(current_thd->status_var.filesort_merge_passes);
@@ -46,10 +36,10 @@
if (param->not_killable)
{
killed= ¬_killable;
-diff -r debbd352c16a sql/log.cc
---- a/sql/log.cc Thu Sep 04 12:13:31 2008 -0700
-+++ b/sql/log.cc Thu Sep 04 12:16:10 2008 -0700
-@@ -955,7 +955,7 @@
+diff -r 0b1f42e1aacf sql/log.cc
+--- a/sql/log.cc Thu Dec 04 08:55:22 2008 -0800
++++ b/sql/log.cc Thu Dec 04 08:55:29 2008 -0800
+@@ -963,7 +963,7 @@
/* fill in user_host value: the format is "%s[%s] @ %s [%s]" */
user_host_len= (strxnmov(user_host_buff, MAX_USER_HOST_SIZE,
sctx->priv_user ? sctx->priv_user : "", "[",
@@ -58,7 +48,7 @@
sctx->host ? sctx->host : "", " [",
sctx->ip ? sctx->ip : "", "]", NullS) -
user_host_buff);
-@@ -977,6 +977,13 @@
+@@ -985,6 +985,13 @@
query= command_name[thd->command].str;
query_length= command_name[thd->command].length;
}
@@ -72,7 +62,7 @@
for (current_handler= slow_log_handler_list; *current_handler ;)
error= (*current_handler++)->log_slow(thd, current_time, thd->start_time,
-@@ -2233,16 +2240,31 @@
+@@ -2242,16 +2249,31 @@
if (my_b_write(&log_file, (uchar*) "\n", 1))
tmp_errno= errno;
}
@@ -106,10 +96,10 @@
if (thd->db && strcmp(thd->db, db))
{ // Database changed
if (my_b_printf(&log_file,"use %s;\n",thd->db) == (uint) -1)
-diff -r debbd352c16a sql/mysql_priv.h
---- a/sql/mysql_priv.h Thu Sep 04 12:13:31 2008 -0700
-+++ b/sql/mysql_priv.h Thu Sep 04 12:16:10 2008 -0700
-@@ -595,6 +595,73 @@
+diff -r 0b1f42e1aacf sql/mysql_priv.h
+--- a/sql/mysql_priv.h Thu Dec 04 08:55:22 2008 -0800
++++ b/sql/mysql_priv.h Thu Dec 04 08:55:29 2008 -0800
+@@ -597,6 +597,73 @@
#define WEEK_FIRST_WEEKDAY 4
#define STRING_BUFFER_USUAL_SIZE 80
@@ -183,9 +173,9 @@
/*
Some defines for exit codes for ::is_equal class functions.
-diff -r debbd352c16a sql/mysqld.cc
---- a/sql/mysqld.cc Thu Sep 04 12:13:31 2008 -0700
-+++ b/sql/mysqld.cc Thu Sep 04 12:16:10 2008 -0700
+diff -r 0b1f42e1aacf sql/mysqld.cc
+--- a/sql/mysqld.cc Thu Dec 04 08:55:22 2008 -0800
++++ b/sql/mysqld.cc Thu Dec 04 08:55:29 2008 -0800
@@ -5553,6 +5553,9 @@
OPT_SECURE_FILE_PRIV,
OPT_MIN_EXAMINED_ROW_LIMIT,
@@ -194,9 +184,9 @@
+ OPT_LOG_SLOW_VERBOSITY,
+ OPT_LOG_SLOW_FILTER,
OPT_OLD_MODE,
- OPT_SLAVE_EXEC_MODE
- };
-@@ -6467,6 +6470,17 @@
+ OPT_SLAVE_EXEC_MODE,
+ OPT_GENERAL_LOG_FILE,
+@@ -6480,6 +6483,17 @@
(uchar**) 0,
0, (GET_ULONG | GET_ASK_ADDR) , REQUIRED_ARG, 100,
1, 100, 0, 1, 0},
@@ -214,7 +204,7 @@
{"long_query_time", OPT_LONG_QUERY_TIME,
"Log all queries that have taken more than long_query_time seconds to execute to file. "
"The argument will be treated as a decimal value with microsecond precission.",
-@@ -7542,6 +7556,10 @@
+@@ -7556,6 +7570,10 @@
global_system_variables.old_passwords= 0;
global_system_variables.old_alter_table= 0;
global_system_variables.binlog_format= BINLOG_FORMAT_UNSPEC;
@@ -225,7 +215,7 @@
/*
Default behavior for 4.1 and 5.0 is to treat NULL values as unequal
when collecting index statistics for MyISAM tables.
-@@ -7988,6 +8006,24 @@
+@@ -8007,6 +8025,24 @@
case OPT_BOOTSTRAP:
opt_noacl=opt_bootstrap=1;
break;
@@ -250,9 +240,9 @@
case OPT_SERVER_ID:
server_id_supplied = 1;
break;
-diff -r debbd352c16a sql/set_var.cc
---- a/sql/set_var.cc Thu Sep 04 12:13:31 2008 -0700
-+++ b/sql/set_var.cc Thu Sep 04 12:16:10 2008 -0700
+diff -r 0b1f42e1aacf sql/set_var.cc
+--- a/sql/set_var.cc Thu Dec 04 08:55:22 2008 -0800
++++ b/sql/set_var.cc Thu Dec 04 08:55:29 2008 -0800
@@ -336,6 +336,20 @@
&SV::max_join_size,
fix_max_join_size);
@@ -274,7 +264,7 @@
static sys_var_long_ptr_global
sys_max_prepared_stmt_count(&vars, "max_prepared_stmt_count",
&max_prepared_stmt_count,
-@@ -3605,6 +3619,192 @@
+@@ -3631,6 +3645,192 @@
#endif
}
@@ -467,9 +457,9 @@
/****************************************************************************
Functions to handle table_type
****************************************************************************/
-diff -r debbd352c16a sql/set_var.h
---- a/sql/set_var.h Thu Sep 04 12:13:31 2008 -0700
-+++ b/sql/set_var.h Thu Sep 04 12:16:10 2008 -0700
+diff -r 0b1f42e1aacf sql/set_var.h
+--- a/sql/set_var.h Thu Dec 04 08:55:22 2008 -0800
++++ b/sql/set_var.h Thu Dec 04 08:55:29 2008 -0800
@@ -1057,6 +1057,68 @@
bool update(THD *thd, set_var *var);
};
@@ -539,7 +529,7 @@
/**
Handler for setting the system variable --read-only.
-@@ -1322,3 +1384,10 @@
+@@ -1323,3 +1385,10 @@
bool process_key_caches(process_key_cache_t func);
void delete_elements(I_List<NAMED_LIST> *list,
void (*free_element)(const char*, uchar*));
@@ -550,9 +540,9 @@
+ 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 debbd352c16a sql/slave.cc
---- a/sql/slave.cc Thu Sep 04 12:13:31 2008 -0700
-+++ b/sql/slave.cc Thu Sep 04 12:16:10 2008 -0700
+diff -r 0b1f42e1aacf sql/slave.cc
+--- a/sql/slave.cc Thu Dec 04 08:55:22 2008 -0800
++++ b/sql/slave.cc Thu Dec 04 08:55:29 2008 -0800
@@ -1561,6 +1561,7 @@
+ MAX_LOG_EVENT_HEADER; /* note, incr over the global not session var */
thd->slave_thread = 1;
@@ -561,9 +551,9 @@
set_slave_thread_options(thd);
thd->client_capabilities = CLIENT_LOCAL_FILES;
pthread_mutex_lock(&LOCK_thread_count);
-diff -r debbd352c16a sql/sql_cache.cc
---- a/sql/sql_cache.cc Thu Sep 04 12:13:31 2008 -0700
-+++ b/sql/sql_cache.cc Thu Sep 04 12:16:10 2008 -0700
+diff -r 0b1f42e1aacf sql/sql_cache.cc
+--- a/sql/sql_cache.cc Thu Dec 04 08:55:22 2008 -0800
++++ b/sql/sql_cache.cc Thu Dec 04 08:55:29 2008 -0800
@@ -1465,6 +1465,7 @@
thd->limit_found_rows = query->found_rows();
@@ -580,22 +570,22 @@
DBUG_RETURN(0); // Query was not cached
}
-diff -r debbd352c16a sql/sql_class.h
---- a/sql/sql_class.h Thu Sep 04 12:13:31 2008 -0700
-+++ b/sql/sql_class.h Thu Sep 04 12:16:10 2008 -0700
+diff -r 0b1f42e1aacf sql/sql_class.h
+--- a/sql/sql_class.h Thu Dec 04 08:55:22 2008 -0800
++++ b/sql/sql_class.h Thu Dec 04 08:55:29 2008 -0800
@@ -396,6 +396,11 @@
DATE_TIME_FORMAT *datetime_format;
DATE_TIME_FORMAT *time_format;
my_bool sysdate_is_now;
+
-+ ulong log_slow_rate_limit;
-+ ulong log_slow_filter;
-+ ulong log_slow_verbosity;
-+
++ ulong log_slow_rate_limit;
++ ulong log_slow_filter;
++ ulong log_slow_verbosity;
++
};
-@@ -1322,6 +1326,11 @@
+@@ -1339,6 +1344,11 @@
thr_lock_type update_lock_default;
Delayed_insert *di;
@@ -607,9 +597,9 @@
/* <> 0 if we are inside of trigger or stored function. */
uint in_sub_stmt;
-diff -r debbd352c16a sql/sql_connect.cc
---- a/sql/sql_connect.cc Thu Sep 04 12:13:31 2008 -0700
-+++ b/sql/sql_connect.cc Thu Sep 04 12:16:10 2008 -0700
+diff -r 0b1f42e1aacf sql/sql_connect.cc
+--- a/sql/sql_connect.cc Thu Dec 04 08:55:22 2008 -0800
++++ b/sql/sql_connect.cc Thu Dec 04 08:55:29 2008 -0800
@@ -1124,6 +1124,15 @@
prepare_new_connection_state(thd);
@@ -626,10 +616,10 @@
while (!net->error && net->vio != 0 &&
!(thd->killed == THD::KILL_CONNECTION))
{
-diff -r debbd352c16a sql/sql_parse.cc
---- a/sql/sql_parse.cc Thu Sep 04 12:13:31 2008 -0700
-+++ b/sql/sql_parse.cc Thu Sep 04 12:16:10 2008 -0700
-@@ -1629,6 +1629,27 @@
+diff -r 0b1f42e1aacf sql/sql_parse.cc
+--- a/sql/sql_parse.cc Thu Dec 04 08:55:22 2008 -0800
++++ b/sql/sql_parse.cc Thu Dec 04 08:55:29 2008 -0800
+@@ -1692,6 +1692,27 @@
if (unlikely(thd->in_sub_stmt))
DBUG_VOID_RETURN; // Don't set time for sub stmt
@@ -657,7 +647,7 @@
/*
Do not log administrative statements unless the appropriate option is
set; do not log into slow log if reading from backup.
-@@ -5640,6 +5661,9 @@
+@@ -5773,6 +5794,9 @@
thd->total_warn_count=0; // Warnings for this query
thd->rand_used= 0;
thd->sent_row_count= thd->examined_row_count= 0;
@@ -667,10 +657,10 @@
/*
Because we come here only for start of top-statements, binlog format is
-diff -r debbd352c16a sql/sql_select.cc
---- a/sql/sql_select.cc Thu Sep 04 12:13:31 2008 -0700
-+++ b/sql/sql_select.cc Thu Sep 04 12:16:10 2008 -0700
-@@ -6479,7 +6479,10 @@
+diff -r 0b1f42e1aacf sql/sql_select.cc
+--- a/sql/sql_select.cc Thu Dec 04 08:55:22 2008 -0800
++++ b/sql/sql_select.cc Thu Dec 04 08:55:29 2008 -0800
+@@ -6480,7 +6480,10 @@
{
join->thd->server_status|=SERVER_QUERY_NO_INDEX_USED;
if (statistics)
@@ -681,7 +671,7 @@
}
}
else
-@@ -6493,7 +6496,10 @@
+@@ -6494,7 +6497,10 @@
{
join->thd->server_status|=SERVER_QUERY_NO_INDEX_USED;
if (statistics)
@@ -692,7 +682,7 @@
}
}
if (!table->no_keyread)
-@@ -9629,6 +9635,7 @@
+@@ -9638,6 +9644,7 @@
(ulong) rows_limit,test(group)));
status_var_increment(thd->status_var.created_tmp_tables);
@@ -700,7 +690,7 @@
if (use_temp_pool && !(test_flags & TEST_KEEP_TMP_TABLES))
temp_pool_slot = bitmap_lock_set_next(&temp_pool);
-@@ -10499,6 +10506,7 @@
+@@ -10508,6 +10515,7 @@
goto err;
}
status_var_increment(table->in_use->status_var.created_tmp_disk_tables);
================================================================
Index: packages/mysql/mysql-userstats.patch
diff -u packages/mysql/mysql-userstats.patch:1.4 packages/mysql/mysql-userstats.patch:1.5
--- packages/mysql/mysql-userstats.patch:1.4 Fri Apr 3 21:44:22 2009
+++ packages/mysql/mysql-userstats.patch Fri Jun 19 23:40:45 2009
@@ -1,6 +1,6 @@
-diff -r ab66c8ca382a include/mysql_com.h
---- a/include/mysql_com.h Thu Sep 04 12:08:00 2008 -0700
-+++ b/include/mysql_com.h Thu Sep 04 12:12:44 2008 -0700
+diff -r 3ed7e96969f9 include/mysql_com.h
+--- a/include/mysql_com.h Thu Dec 04 08:54:17 2008 -0800
++++ b/include/mysql_com.h Thu Dec 04 08:54:27 2008 -0800
@@ -115,6 +115,8 @@
thread */
#define REFRESH_MASTER 128 /* Remove all bin logs in the index
@@ -10,20 +10,10 @@
/* The following can't be set with mysql_refresh() */
#define REFRESH_READ_LOCK 16384 /* Lock tables for read */
-diff -r ab66c8ca382a patch_info/userstats.info
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/patch_info/userstats.info Thu Sep 04 12:12:44 2008 -0700
-@@ -0,0 +1,6 @@
-+File=userstats.patch
-+Name=SHOW USER/TABLE/INDEX statistics
-+Version=1.0
-+Author=Google
-+License=GPL
-+Comment=Added INFORMATION_SCHEMA.*_STATISTICS
-diff -r ab66c8ca382a sql/handler.cc
---- a/sql/handler.cc Thu Sep 04 12:08:00 2008 -0700
-+++ b/sql/handler.cc Thu Sep 04 12:12:44 2008 -0700
-@@ -1168,6 +1168,7 @@
+diff -r 3ed7e96969f9 sql/handler.cc
+--- a/sql/handler.cc Thu Dec 04 08:54:17 2008 -0800
++++ b/sql/handler.cc Thu Dec 04 08:54:27 2008 -0800
+@@ -1205,6 +1205,7 @@
error=1;
}
status_var_increment(thd->status_var.ha_commit_count);
@@ -31,7 +21,7 @@
ha_info_next= ha_info->next();
ha_info->reset(); /* keep it conveniently zero-filled */
}
-@@ -1235,6 +1236,7 @@
+@@ -1272,6 +1273,7 @@
error=1;
}
status_var_increment(thd->status_var.ha_rollback_count);
@@ -39,7 +29,7 @@
ha_info_next= ha_info->next();
ha_info->reset(); /* keep it conveniently zero-filled */
}
-@@ -1682,6 +1684,7 @@
+@@ -1724,6 +1726,7 @@
error=1;
}
status_var_increment(thd->status_var.ha_rollback_count);
@@ -47,7 +37,7 @@
ha_info_next= ha_info->next();
ha_info->reset(); /* keep it conveniently zero-filled */
}
-@@ -2016,6 +2019,8 @@
+@@ -2058,6 +2061,8 @@
dup_ref=ref+ALIGN_SIZE(ref_length);
cached_table_flags= table_flags();
}
@@ -56,7 +46,7 @@
DBUG_RETURN(error);
}
-@@ -3448,6 +3453,97 @@
+@@ -3487,6 +3492,97 @@
return;
}
@@ -154,9 +144,9 @@
/****************************************************************************
** Some general functions that isn't in the handler class
-diff -r ab66c8ca382a sql/handler.h
---- a/sql/handler.h Thu Sep 04 12:08:00 2008 -0700
-+++ b/sql/handler.h Thu Sep 04 12:12:44 2008 -0700
+diff -r 3ed7e96969f9 sql/handler.h
+--- a/sql/handler.h Thu Dec 04 08:54:17 2008 -0800
++++ b/sql/handler.h Thu Dec 04 08:54:27 2008 -0800
@@ -29,6 +29,10 @@
#endif
@@ -176,9 +166,9 @@
/*
Iterators creator.
Presence of the pointer should be checked before using
-@@ -1130,6 +1135,10 @@
+@@ -1137,6 +1142,10 @@
*/
- Discrete_interval auto_inc_interval_for_cur_row;
+ uint auto_inc_intervals_count;
+ ulonglong rows_read;
+ ulonglong rows_changed;
@@ -187,7 +177,7 @@
handler(handlerton *ht_arg, TABLE_SHARE *share_arg)
:table_share(share_arg), table(0),
estimation_rows_to_insert(0), ht(ht_arg),
-@@ -1154,8 +1154,10 @@
+@@ -1145,8 +1154,10 @@
ft_handler(0), inited(NONE),
locked(FALSE), implicit_emptied(0),
pushed_cond(0), next_insert_id(0), insert_id_for_cur_row(0),
@@ -195,12 +185,12 @@
- {}
+ auto_inc_intervals_count(0), rows_read(0), rows_changed(0)
+ {
-+ memset(index_rows_read, 0, sizeof(index_rows_read));
++ memset(index_rows_read, 0, sizeof(index_rows_read));
+ }
virtual ~handler(void)
{
DBUG_ASSERT(locked == FALSE);
-@@ -1262,7 +1273,13 @@
+@@ -1267,7 +1278,13 @@
{
table= table_arg;
table_share= share;
@@ -214,9 +204,9 @@
virtual double scan_time()
{ return ulonglong2double(stats.data_file_length) / IO_SIZE + 2; }
virtual double read_time(uint index, uint ranges, ha_rows rows)
-diff -r ab66c8ca382a sql/lex.h
---- a/sql/lex.h Thu Sep 04 12:08:00 2008 -0700
-+++ b/sql/lex.h Thu Sep 04 12:12:44 2008 -0700
+diff -r 3ed7e96969f9 sql/lex.h
+--- a/sql/lex.h Thu Dec 04 08:54:17 2008 -0800
++++ b/sql/lex.h Thu Dec 04 08:54:27 2008 -0800
@@ -245,6 +245,7 @@
{ "IN", SYM(IN_SYM)},
{ "INDEX", SYM(INDEX_SYM)},
@@ -241,10 +231,10 @@
{ "USE_FRM", SYM(USE_FRM)},
{ "USING", SYM(USING)},
{ "UTC_DATE", SYM(UTC_DATE_SYM)},
-diff -r ab66c8ca382a sql/mysql_priv.h
---- a/sql/mysql_priv.h Thu Sep 04 12:08:00 2008 -0700
-+++ b/sql/mysql_priv.h Thu Sep 04 12:12:44 2008 -0700
-@@ -1058,7 +1058,19 @@
+diff -r 3ed7e96969f9 sql/mysql_priv.h
+--- a/sql/mysql_priv.h Thu Dec 04 08:54:17 2008 -0800
++++ b/sql/mysql_priv.h Thu Dec 04 08:54:27 2008 -0800
+@@ -1060,7 +1060,19 @@
bool multi_delete_set_locks_and_link_aux_tables(LEX *lex);
void init_max_user_conn(void);
void init_update_queries(void);
@@ -264,7 +254,7 @@
pthread_handler_t handle_bootstrap(void *arg);
int mysql_execute_command(THD *thd);
bool do_command(THD *thd);
-@@ -2009,6 +2021,12 @@
+@@ -2015,6 +2027,12 @@
extern struct system_variables max_system_variables;
extern struct system_status_var global_status_var;
extern struct rand_struct sql_rand;
@@ -277,10 +267,10 @@
extern const char *opt_date_time_formats[];
extern KNOWN_DATE_TIME_FORMAT known_date_time_formats[];
-diff -r ab66c8ca382a sql/mysqld.cc
---- a/sql/mysqld.cc Thu Sep 04 12:08:00 2008 -0700
-+++ b/sql/mysqld.cc Thu Sep 04 12:12:44 2008 -0700
-@@ -588,6 +588,11 @@
+diff -r 3ed7e96969f9 sql/mysqld.cc
+--- a/sql/mysqld.cc Thu Dec 04 08:54:17 2008 -0800
++++ b/sql/mysqld.cc Thu Dec 04 08:54:27 2008 -0800
+@@ -589,6 +589,11 @@
LOCK_global_system_variables,
LOCK_user_conn, LOCK_slave_list, LOCK_active_mi,
LOCK_connection_count;
@@ -292,7 +282,7 @@
/**
The below lock protects access to two global server variables:
max_prepared_stmt_count and prepared_stmt_count. These variables
-@@ -1265,6 +1270,9 @@
+@@ -1266,6 +1271,9 @@
x_free(opt_secure_file_priv);
bitmap_free(&temp_pool);
free_max_user_conn();
@@ -302,7 +292,7 @@
#ifdef HAVE_REPLICATION
end_slave_list();
#endif
-@@ -1377,6 +1385,9 @@
+@@ -1378,6 +1386,9 @@
(void) pthread_cond_destroy(&COND_thread_cache);
(void) pthread_cond_destroy(&COND_flush_thread_cache);
(void) pthread_cond_destroy(&COND_manager);
@@ -312,7 +302,7 @@
}
#endif /*EMBEDDED_LIBRARY*/
-@@ -3069,6 +3080,7 @@
+@@ -3072,6 +3083,7 @@
{"show_function_status", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_STATUS_FUNC]), SHOW_LONG_STATUS},
{"show_grants", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_GRANTS]), SHOW_LONG_STATUS},
{"show_keys", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_KEYS]), SHOW_LONG_STATUS},
@@ -320,7 +310,7 @@
{"show_master_status", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_MASTER_STAT]), SHOW_LONG_STATUS},
{"show_new_master", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_NEW_MASTER]), SHOW_LONG_STATUS},
{"show_open_tables", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_OPEN_TABLES]), SHOW_LONG_STATUS},
-@@ -3085,9 +3097,11 @@
+@@ -3089,9 +3101,11 @@
{"show_slave_status", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_SLAVE_STAT]), SHOW_LONG_STATUS},
{"show_status", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_STATUS]), SHOW_LONG_STATUS},
{"show_storage_engines", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_STORAGE_ENGINES]), SHOW_LONG_STATUS},
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-acc-pslist.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-microslow.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-userstats.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.452&r2=1.453&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_rw_lock.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-split_buf_pool_mutex_fixed_optimistic_safe.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list