- up to 5.1.40

Changed files:
    mysql-microslow.patch -> 1.5
    mysql-userstats.patch -> 1.8
    mysql.spec -> 1.463

diff --git a/mysql-microslow.patch b/mysql-microslow.patch
index 15085d8b66ce1939211ad3e022177b3d04524d99..8a37088566979ede9c16cbc1b9e9b7709b493850 100644 (file)
--- a/mysql-microslow.patch
+++ b/mysql-microslow.patch
@@ -183,9 +183,9 @@ diff -r 0b1f42e1aacf sql/mysqld.cc
 +  OPT_LOG_SLOW_RATE_LIMIT, 
 +  OPT_LOG_SLOW_VERBOSITY, 
 +  OPT_LOG_SLOW_FILTER, 
-   OPT_OLD_MODE,
-   OPT_SLAVE_EXEC_MODE,
-   OPT_GENERAL_LOG_FILE,
+ #if defined(ENABLED_DEBUG_SYNC)
+   OPT_DEBUG_SYNC_TIMEOUT,
+ #endif /* defined(ENABLED_DEBUG_SYNC) */
 @@ -6480,6 +6483,17 @@
     (uchar**) 0,
     0, (GET_ULONG | GET_ASK_ADDR) , REQUIRED_ARG, 100,

diff --git a/mysql-userstats.patch b/mysql-userstats.patch
index 09392a1bd244f4524078983c5330bb4fd7072cd2..29b5727b1b4809739d49d00531c7df75f04db4d7 100644 (file)
--- a/mysql-userstats.patch
+++ b/mysql-userstats.patch
@@ -388,11 +388,16 @@ diff -r 3ed7e96969f9 sql/sql_class.cc
    enable_slow_log= 0;
  #ifndef DBUG_OFF
    dbug_sentry=THD_SENTRY_MAGIC;
-@@ -762,8 +764,55 @@
+@@ -838,6 +838,7 @@
    reset_current_stmt_binlog_row_based();
    bzero((char *) &status_var, sizeof(status_var));
    sql_log_bin_toplevel= options & OPTION_BIN_LOG;
 +  reset_stats();
+ 
+ #if defined(ENABLED_DEBUG_SYNC)
+   /* Initialize the Debug Sync Facility. See debug_sync.cc. */
+@@ -845,6 +846,52 @@
+ #endif /* defined(ENABLED_DEBUG_SYNC) */
  }
  
 +// Resets stats in a THD.

diff --git a/mysql.spec b/mysql.spec
index 40cc70975fb2cee2aea02e15c5b53014008d16cf..7c629d2fe7b8221483bae48fbe8af0c5a0b51caa 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -32,13 +32,13 @@ Summary(ru.UTF-8):  MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):     MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql
-Version:       5.1.39
+Version:       5.1.40
 Release:       1
 License:       GPL + MySQL FLOSS Exception
 Group:         Applications/Databases
 #Source0Download: http://dev.mysql.com/downloads/mysql/5.1.html#source
 Source0:       http://mysql.easynet.be/Downloads/MySQL-5.1/%{name}-%{version}.tar.gz
-# Source0-md5: 55a398daeb69a778fc46573623143268
+# Source0-md5: 32e7373c16271606007374396e6742ad
 Source100:     http://www.sphinxsearch.com/downloads/sphinx-0.9.7.tar.gz
 # Source100-md5:       32f2b7e98d8485c86108851d52c5cef4
 Source1:       %{name}.init