Author: glen Date: Sat Dec 18 18:48:46 2010 GMT
Module: packages Tag: MYSQL_5_0
---- Log message:
- updated percona patches (release-5.0.91-22); rel 3
---- Files affected:
packages/mysql:
mysql-innodb_show_bp.patch (1.1.2.2 -> 1.1.2.3) ,
mysql-innodb_split_buf_pool_mutex.patch (1.1.2.2 -> 1.1.2.3) ,
mysql-mysql-test.patch (1.1 -> 1.1.2.1) , mysql-userstatv2.patch (1.1.2.12 ->
1.1.2.13) , mysql.spec (1.353.2.97 -> 1.353.2.98) , percona.sh (1.7 -> 1.7.2.1)
, mysql-fixes.patch (1.1.2.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/mysql/mysql-innodb_show_bp.patch
diff -u packages/mysql/mysql-innodb_show_bp.patch:1.1.2.2
packages/mysql/mysql-innodb_show_bp.patch:1.1.2.3
--- packages/mysql/mysql-innodb_show_bp.patch:1.1.2.2 Wed Aug 26 12:17:02 2009
+++ packages/mysql/mysql-innodb_show_bp.patch Sat Dec 18 19:48:41 2010
@@ -248,7 +248,7 @@
+ dict_index_t* index;
+ buf_block_t* block;
+
-+ char *p;
++ const char *p;
+ char db_name_raw[NAME_LEN*5+1];
+ char table_name_raw[NAME_LEN*5+1];
+
@@ -314,7 +314,7 @@
+ table->field[10]->store(index->name,
strlen(index->name), system_charset_info);
+ // fprintf(stderr, " index %s, table %s",
index->name, index->table_name);
+
-+ if((p = strchr(index->table_name, '/')))
++ if((p = strchr((char *) index->table_name,
'/')))
+ {
+ strncpy(db_name_raw, index->table_name,
p-index->table_name);
+ db_name_raw[p-index->table_name] = 0;
@@ -322,7 +322,7 @@
+ p++;
+ } else {
+ table->field[11]->store(NULL, 0,
system_charset_info);
-+ p = (char *)index->table_name;
++ p = index->table_name;
+ }
+ strcpy(table_name_raw, p);
+
================================================================
Index: packages/mysql/mysql-innodb_split_buf_pool_mutex.patch
diff -u packages/mysql/mysql-innodb_split_buf_pool_mutex.patch:1.1.2.2
packages/mysql/mysql-innodb_split_buf_pool_mutex.patch:1.1.2.3
--- packages/mysql/mysql-innodb_split_buf_pool_mutex.patch:1.1.2.2 Tue Oct
27 11:04:57 2009
+++ packages/mysql/mysql-innodb_split_buf_pool_mutex.patch Sat Dec 18
19:48:41 2010
@@ -832,16 +832,25 @@
(buf_pool->init_flush)[flush_type] = FALSE;
if ((buf_pool->n_flush[flush_type] == 0)
-@@ -1014,7 +1048,7 @@
+@@ -1013,11 +1047,15 @@
+ buf_block_t* block;
ulint n_replaceable;
ulint distance = 0;
++ ibool optimistic = TRUE;
- mutex_enter(&(buf_pool->mutex));
-+ //mutex_enter(&(buf_pool->mutex)); /* optimistic */
-
+-
++ //mutex_enter(&(buf_pool->mutex));
++retry:
n_replaceable = UT_LIST_GET_LEN(buf_pool->free);
-@@ -1025,6 +1059,12 @@
++ if (!optimistic)
++ mutex_enter(&(buf_pool->LRU_mutex));
++
+ block = UT_LIST_GET_LAST(buf_pool->LRU);
+
+ while ((block != NULL)
+@@ -1025,6 +1063,12 @@
+ BUF_FLUSH_EXTRA_MARGIN)
&& (distance < BUF_LRU_FREE_SEARCH_LEN)) {
@@ -854,16 +863,26 @@
mutex_enter(&block->mutex);
if (buf_flush_ready_for_replace(block)) {
-@@ -1038,7 +1078,7 @@
+@@ -1038,11 +1082,17 @@
block = UT_LIST_GET_PREV(LRU, block);
}
- mutex_exit(&(buf_pool->mutex));
-+ //mutex_exit(&(buf_pool->mutex)); /* optimistic */
++ //mutex_exit(&(buf_pool->mutex));
++ if (!optimistic)
++ mutex_exit(&(buf_pool->LRU_mutex));
if (n_replaceable >= BUF_FLUSH_FREE_BLOCK_MARGIN) {
-@@ -1057,8 +1097,9 @@
+ return(0);
++ } else if (optimistic) {
++ /* confirm it again with LRU_mutex for exactness */
++ optimistic = FALSE;
++ goto retry;
+ }
+
+ return(BUF_FLUSH_FREE_BLOCK_MARGIN + BUF_FLUSH_EXTRA_MARGIN
+@@ -1057,8 +1107,9 @@
immediately, without waiting. */
void
@@ -874,7 +893,7 @@
{
ulint n_to_flush;
ulint n_flushed;
-@@ -1068,7 +1109,7 @@
+@@ -1068,7 +1119,7 @@
if (n_to_flush > 0) {
n_flushed = buf_flush_batch(BUF_FLUSH_LRU, n_to_flush,
ut_dulint_zero);
@@ -883,7 +902,7 @@
/* There was an LRU type flush batch already running;
let us wait for it to end */
-@@ -1118,11 +1159,11 @@
+@@ -1118,11 +1169,11 @@
{
ibool ret;
================================================================
Index: packages/mysql/mysql-mysql-test.patch
diff -u packages/mysql/mysql-mysql-test.patch:1.1
packages/mysql/mysql-mysql-test.patch:1.1.2.1
--- packages/mysql/mysql-mysql-test.patch:1.1 Thu Jul 16 15:01:56 2009
+++ packages/mysql/mysql-mysql-test.patch Sat Dec 18 19:48:41 2010
@@ -106,3 +106,35 @@
select @@profiling;
@@profiling
1
+--- a/mysql-test/r/mysql.result 2010-02-19 23:59:36.000000000 -0500
++++ b/mysql-test/r/mysql.result 2010-02-19 23:58:50.000000000 -0500
+@@ -162,8 +162,8 @@
+ ERROR 1049 (42000) at line 1: Unknown database 'invalid'
+ Test connect with dbname + hostname
+ Test connect with dbname + _invalid_ hostname
+-ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname'
(errno)
+-ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname'
(errno)
++ERROR 2003 (HY000) at line 1: Can't connect to MySQL server on
'invalid_hostname' (errno)
++ERROR 2003 (HY000) at line 1: Can't connect to MySQL server on
'invalid_hostname' (errno)
+ The commands reported in the bug report
+ ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyril has found a
bug
:)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
(errno)
+ Too long dbname
+@@ -198,6 +198,6 @@
+ 1
+ COUNT (*)
+ 1
+-ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname'
(errno)
++ERROR 2003 (HY000) at line 1: Can't connect to MySQL server on
'invalid_hostname' (errno)
+ <TABLE BORDER=1><TR><TH><</TH></TR><TR><TD>< &
></TD></TR></TABLE>
+ End of 5.0 tests
+--- a/mysql-test/r/mysql_upgrade.result 2010-02-19 23:58:16.000000000 -0500
++++ b/mysql-test/r/mysql_upgrade.result 2010-02-20 00:01:34.000000000 -0500
+@@ -58,7 +58,7 @@
+ mysql.user OK
+ DROP USER mysqltest1@'%';
+ Run mysql_upgrade with a non existing server socket
+-mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host'
(errno) when trying to connect
++mysqlcheck: Got error: 2003: Can't connect to MySQL server on
'not_existing_host' (errno) when trying to connect
+ FATAL ERROR: Upgrade failed
+ set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE';
+ mysql.columns_priv OK
================================================================
Index: packages/mysql/mysql-userstatv2.patch
diff -u packages/mysql/mysql-userstatv2.patch:1.1.2.12
packages/mysql/mysql-userstatv2.patch:1.1.2.13
--- packages/mysql/mysql-userstatv2.patch:1.1.2.12 Tue Oct 27 11:04:57 2009
+++ packages/mysql/mysql-userstatv2.patch Sat Dec 18 19:48:41 2010
@@ -4288,3 +4288,15 @@
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.
+
================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.353.2.97
packages/mysql/mysql.spec:1.353.2.98
--- packages/mysql/mysql.spec:1.353.2.97 Sat Jul 24 16:14:53 2010
+++ packages/mysql/mysql.spec Sat Dec 18 19:48:41 2010
@@ -26,7 +26,7 @@
Summary(zh_CN.UTF-8): MySQL数据库服务器
Name: mysql
Version: 5.0.91
-Release: 2
+Release: 3
License: GPL + MySQL FLOSS Exception
Group: Applications/Databases
#Source0:
http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.0/%{name}-%{version}.tar.gz
@@ -68,7 +68,6 @@
Patch15: %{name}-system-users.patch
Patch16: %{name}-errorlog-no-rename.patch
Patch18: %{name}-xtrabackup.patch
-Patch19: %{name}-fixes.patch
Patch21: %{name}-atomic.patch
Patch22: %{name}-fix-dummy-thread-race-condition.patch
# ourdelta
@@ -564,7 +563,6 @@
%patch120 -p1
# </percona>
-%patch19 -p1
%patch21 -p0
%patch22 -p1
%patch23 -p1
@@ -1122,6 +1120,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.353.2.98 2010/12/18 18:48:41 glen
+- updated percona patches (release-5.0.91-22); rel 3
+
Revision 1.353.2.97 2010/07/24 14:14:53 glen
- update sphinx to 0.9.9
================================================================
Index: packages/mysql/percona.sh
diff -u packages/mysql/percona.sh:1.7 packages/mysql/percona.sh:1.7.2.1
--- packages/mysql/percona.sh:1.7 Thu Dec 16 19:25:16 2010
+++ packages/mysql/percona.sh Sat Dec 18 19:48:41 2010
@@ -1,8 +1,9 @@
#!/bin/sh
# updates percona patches
# http://www.percona.com/docs/wiki/release:start
+# https://launchpad.net/percona-server/release-5.0.91-22
-version=release-5.1.53-11
+version=release-5.0.91-22
bzr_branch=lp:percona-server/$version
branch=MYSQL_5_1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_show_bp.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_split_buf_pool_mutex.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-mysql-test.patch?r1=1.1&r2=1.1.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-userstatv2.patch?r1=1.1.2.12&r2=1.1.2.13&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.353.2.97&r2=1.353.2.98&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/percona.sh?r1=1.7&r2=1.7.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
