- up to 5.0.81

Changed files:
    mysql-fixes.patch -> 1.1.2.1
    mysql-microslow_innodb.patch -> 1.1.2.7
    mysql-userstatv2.patch -> 1.1.2.7
    mysql.spec -> 1.353.2.67

diff --git a/mysql-fixes.patch b/mysql-fixes.patch
new file mode 100644 (file)
index 0000000..aa75ba2
--- /dev/null
+++ b/mysql-fixes.patch
@@ -0,0 +1,11 @@
+--- mysql-5.0.81/sql/ha_innodb.cc.orig 2009-05-20 21:59:21.165842451 +0200
++++ mysql-5.0.81/sql/ha_innodb.cc      2009-05-20 22:08:31.797661582 +0200
+@@ -6660,7 +6756,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 = (char *)strchr(index->table_name, '/'))
+                               {
+                                       strncpy(db_name_raw, index->table_name, p-index->table_name);
+                                       db_name_raw[p-index->table_name] = 0;

diff --git a/mysql-microslow_innodb.patch b/mysql-microslow_innodb.patch
index 6c21043b4fcfae1c8945837be681103949b24137..f8b3bbb4dcb44175051eb4360fcdf77bbd8fbe0e 100644 (file)
--- a/mysql-microslow_innodb.patch
+++ b/mysql-microslow_innodb.patch
@@ -2349,21 +2349,18 @@ diff -r 04958490fc6d sql/sql_parse.cc
    {
      thd_proc_info(thd, "logging slow query");
  
--    if ((ulong) (thd->start_time - thd->time_after_lock) >
--      thd->variables.long_query_time ||
--        (thd->server_status &
--        (SERVER_QUERY_NO_INDEX_USED | SERVER_QUERY_NO_GOOD_INDEX_USED)) &&
--        opt_log_queries_not_using_indexes &&
--        /* == SQLCOM_END unless this is a SHOW command */
+-    if ((thd->start_time > thd->time_after_lock && 
+-         (ulong) (thd->start_time - thd->time_after_lock) >
++    if (((thd->start_time > thd->time_after_lock && 
++         (ulong) (thd->start_time - thd->time_after_lock) >=
+       thd->variables.long_query_time) ||
+         (thd->server_status &
+         (SERVER_QUERY_NO_INDEX_USED | SERVER_QUERY_NO_GOOD_INDEX_USED)) &&
+         opt_log_queries_not_using_indexes &&
+         /* == SQLCOM_END unless this is a SHOW command */
 -        thd->lex->orig_sql_command == SQLCOM_END)
-+    if (((ulong) (thd->start_timer - thd->timer_after_lock) >=
-+         thd->variables.long_query_time ||
-+         (thd->server_status &
-+              (SERVER_QUERY_NO_INDEX_USED | SERVER_QUERY_NO_GOOD_INDEX_USED)) &&
-+         opt_log_queries_not_using_indexes &&
-+         /* == SQLCOM_END unless this is a SHOW command */
-+         thd->lex->orig_sql_command == SQLCOM_END) &&
-+        thd->examined_row_count >= thd->variables.min_examined_row_limit)
++        thd->lex->orig_sql_command == SQLCOM_END) &&
++          thd->examined_row_count >= thd->variables.min_examined_row_limit)
      {
        thd_proc_info(thd, "logging slow query");
        thd->status_var.long_query_count++;

diff --git a/mysql-userstatv2.patch b/mysql-userstatv2.patch
index a5efe3e7260b5f14e4563c9f94f598b078296f7f..649ccd3f17ffcc90cadbda850bc2971d8c4b0558 100644 (file)
--- a/mysql-userstatv2.patch
+++ b/mysql-userstatv2.patch
@@ -2271,16 +2271,6 @@ diff -r 23e5576aa59a sql/sql_class.cc
  }
  
  
-@@ -408,6 +497,9 @@
- 
- void THD::change_user(void)
- {
-+  pthread_mutex_lock(&LOCK_status);
-+  add_to_status(&global_status_var, &status_var);
-+  pthread_mutex_unlock(&LOCK_status);
-   cleanup();
-   cleanup_done= 0;
-   init();
 @@ -892,6 +984,33 @@
  }
  #endif

diff --git a/mysql.spec b/mysql.spec
index e2fdfc2866225ddda589901558b023a38603a6e9..6a147beb5b43e11e7810500a35e8d8627c1f1698 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -25,13 +25,13 @@ Summary(ru.UTF-8):  MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):     MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql
-Version:       5.0.77
-Release:       2
+Version:       5.0.81
+Release:       1
 License:       GPL + MySQL FLOSS Exception
 Group:         Applications/Databases
 #Source0:      ftp://ftp.mysql.com/pub/mysql/src/%{name}-%{version}.tar.gz
 Source0:       http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.0/%{name}-%{version}.tar.gz
-# Source0-md5: 6c30a20c9059daf053a301e927eb1667
+# Source0-md5: 2d35e4980f279c839172a6efdb0f0b15
 #Source0:      http://mysql.he.net/Downloads/MySQL-5.0/%{name}-%{version}.tar.gz
 #Source0:      http://mirror.provenscaling.com/mysql/enterprise/source/5.0/%{name}-%{version}.tar.gz
 Source100:     http://www.sphinxsearch.com/downloads/sphinx-0.9.9-rc1.tar.gz
@@ -82,6 +82,7 @@ Patch28:      %{name}-innodb_check_fragmentation.patch
 Patch29:       %{name}-errorlog-no-rename.patch
 Patch30:       %{name}-alpha-stack.patch
 Patch31:       %{name}-xtrabackup.patch
+Patch32:       %{name}-fixes.patch
 URL:           http://www.mysql.com/products/database/mysql/community_edition.html
 BuildRequires: autoconf
 BuildRequires: automake
@@ -509,6 +510,7 @@ mv sphinx-*/mysqlse sql/sphinx
 %patch30 -p1
 %endif
 %{?with_xtrabackup:%patch31 -p1}
+%patch32 -p1
 
 %build
 %{__libtoolize}