[packages/percona-server/v5.0.x: 171/202] - up to 5.0.96, fixes CVE-2010-3840

[glen]

commit 635227ee277706e16bb2eeba807992348f4691da
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Tue May 8 22:00:52 2012 +0000

    - up to 5.0.96, fixes CVE-2010-3840
    
    Changed files:
        mysql-userstatv2.patch -> 1.1.2.18
        mysql.spec -> 1.353.2.106

 mysql-userstatv2.patch | 12 ++++++------
 mysql.spec             |  9 ++++++---
 2 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index cfe46be..a70fb0e 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,6 +1,8 @@
 # TODO:
 # - C(XX)FLAGS for innodb subdirs are overriden by ./configure!
 # - http://bugs.mysql.com/bug.php?id=16470
+# NOTE:
+# - 5.0 Changes: http://dev.mysql.com/doc/refman/5.0/en/news-5-0-x.html
 #
 # Conditional build:
 %bcond_without	big_tables	# Support tables with more than 4G rows even on 32 bit platforms
@@ -24,12 +26,13 @@ Summary(ru.UTF-8):	MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):	MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):	MySQL数据库服务器
 Name:		mysql
-Version:	5.0.92
-Release:	4
+Version:	5.0.96
+Release:	1
 License:	GPL + MySQL FLOSS Exception
 Group:		Applications/Databases
+# Source0Download: http://dev.mysql.com/downloads/mysql/5.0.html#source
 Source0:	ftp://gd.tuwien.ac.at/db/mysql/Downloads/MySQL-5.0/%{name}-%{version}.tar.gz
-# Source0-md5:	a72ee3d1d54bff74836de9500858a311
+# Source0-md5:	bf280949049161aa68cf29e600d9ec79
 #Source0:	http://downloads.mysql.com/archives/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.tar.gz
diff --git a/mysql-userstatv2.patch b/mysql-userstatv2.patch
index 6393c09..d2f5fe6 100644
--- a/mysql-userstatv2.patch
+++ b/mysql-userstatv2.patch
@@ -2332,9 +2332,8 @@ diff -ruN a/sql/sql_lex.h b/sql/sql_lex.h
    /* This should be the last !!! */
    SQLCOM_END
  };
-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
+--- mysql-5.0.96/sql/sql_parse.cc~	2012-05-08 23:53:39.000000000 +0300
++++ mysql-5.0.96/sql/sql_parse.cc	2012-05-09 00:06:42.467315321 +0300
 @@ -78,6 +78,12 @@
  			       const char *table_name);
  static bool check_show_create_table_access(THD *thd, TABLE_LIST *table);
@@ -3003,7 +3002,7 @@ diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
        return TRUE;
      }
      /*
-@@ -6472,6 +6954,30 @@
+@@ -6993,6 +6993,31 @@
    lex_start(thd);
    mysql_reset_thd_for_next_command(thd);
  
@@ -3020,7 +3019,7 @@ diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
 +
 +  if (opt_userstat_running) {
 +#ifdef HAVE_CLOCK_GETTIME
-+    /* get start cputime */ 
++    /* get start cputime */
 +    if (!(cputime_error = clock_gettime(CLOCK_THREAD_CPUTIME_ID, &tp)))
 +      start_cpu_nsecs = tp.tv_sec*1000000000.0+tp.tv_nsec;
 +#endif
@@ -3031,7 +3030,8 @@ diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
 +    }
 +  }
 +
-   if (query_cache_send_result_to_client(thd, (char*) inBuf, length) <= 0)
++
+   if (query_cache_send_result_to_client(thd, rawbuf, length) <= 0)
    {
      LEX *lex= thd->lex;
 @@ -6550,6 +7056,43 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/percona-server.git/commitdiff/431f68fe79a66d5dfdd53f2655709e6c925fbc22