- desc fixes merge from HEAD

Changed files:
    mysql-microslow_innodb.patch -> 1.1.2.14
    mysql-userstatv2.patch -> 1.1.2.16
    mysql.spec -> 1.353.2.101

diff --git a/mysql-microslow_innodb.patch b/mysql-microslow_innodb.patch
index 5304e0506060ae00a6383f7daffb9c9b032551a3..c4bf18e23cf382b851bdadefc831e27face98950 100644 (file)
--- a/mysql-microslow_innodb.patch
+++ b/mysql-microslow_innodb.patch
@@ -2178,8 +2178,9 @@ diff -ruN a/sql/sql_class.cc b/sql/sql_class.cc
  }
  
  
  }
  
  

---- mysql-5.0.92/sql/sql_class.h       Tue Jul 28 23:39:12 2009 -0700
-+++ mysql-5.0.92/sql/sql_class.h       Tue Jul 28 23:42:44 2009 -0700
+diff -ruN a/sql/sql_class.h b/sql/sql_class.h
+--- a/sql/sql_class.h  Tue Jul 28 23:39:12 2009 -0700
++++ b/sql/sql_class.h  Tue Jul 28 23:42:44 2009 -0700

 @@ -43,6 +43,7 @@
  extern char internal_table_name[2];
  extern char empty_c_string[1];
 @@ -43,6 +43,7 @@
  extern char internal_table_name[2];
  extern char empty_c_string[1];


@@ -2277,7 +2278,7 @@ diff -ruN a/sql/sql_class.cc b/sql/sql_class.cc
    /* <> 0 if we are inside of trigger or stored function. */
    uint in_sub_stmt;
  
    /* <> 0 if we are inside of trigger or stored function. */
    uint in_sub_stmt;
  

-@@ -1732,11 +1732,11 @@
+@@ -1702,11 +1732,11 @@

        sql_print_information("time() failed with %d", errno);
    }
  
        sql_print_information("time() failed with %d", errno);
    }
  


@@ -2291,9 +2292,9 @@ diff -ruN a/sql/sql_class.cc b/sql/sql_class.cc
 +  inline void end_time()    { end_timer(); safe_time(&start_time); }
 +  inline void set_time(time_t t) { set_timer(); time_after_lock=start_time=user_time=t; }
 +  inline void lock_time()   { lock_timer(); safe_time(&time_after_lock); }
 +  inline void end_time()    { end_timer(); safe_time(&start_time); }
 +  inline void set_time(time_t t) { set_timer(); time_after_lock=start_time=user_time=t; }
 +  inline void lock_time()   { lock_timer(); safe_time(&time_after_lock); }

-   /*TODO: this will be obsolete when we have support for 64 bit my_time_t */
-   inline bool is_valid_time() 
-   { 
+   inline void insert_id(ulonglong id_arg)
+   {
+     last_insert_id= id_arg;

 diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
 --- a/sql/sql_parse.cc Tue Jul 28 23:39:12 2009 -0700
 +++ b/sql/sql_parse.cc Tue Jul 28 23:42:44 2009 -0700
 diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
 --- a/sql/sql_parse.cc Tue Jul 28 23:39:12 2009 -0700
 +++ b/sql/sql_parse.cc Tue Jul 28 23:42:44 2009 -0700

diff --git a/mysql-userstatv2.patch b/mysql-userstatv2.patch
index 6393c09a92c2e2446b479ec0548d13a098697f15..6eb4e3d97fd531f85f8d033b4317e058eb671a3e 100644 (file)
--- a/mysql-userstatv2.patch
+++ b/mysql-userstatv2.patch
@@ -1147,6 +1147,39 @@ diff -ruN a/netware/Makefile.in b/netware/Makefile.in
  LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
  LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
  LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
  LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@

+diff -ruN a/os2/Makefile.in b/os2/Makefile.in
+--- a/os2/Makefile.in  Wed Jul 29 13:33:34 2009 -0700
++++ b/os2/Makefile.in  Wed Jul 29 13:34:11 2009 -0700
+@@ -156,6 +156,7 @@
+ LIBDL = @LIBDL@
+ LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
+ LIBOBJS = @LIBOBJS@
++LIBRT = @LIBRT@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
+diff -ruN a/os2/include/Makefile.in b/os2/include/Makefile.in
+--- a/os2/include/Makefile.in  Wed Jul 29 13:33:34 2009 -0700
++++ b/os2/include/Makefile.in  Wed Jul 29 13:34:11 2009 -0700
+@@ -156,6 +156,7 @@
+ LIBDL = @LIBDL@
+ LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
+ LIBOBJS = @LIBOBJS@
++LIBRT = @LIBRT@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
+diff -ruN a/os2/include/sys/Makefile.in b/os2/include/sys/Makefile.in
+--- a/os2/include/sys/Makefile.in      Wed Jul 29 13:33:34 2009 -0700
++++ b/os2/include/sys/Makefile.in      Wed Jul 29 13:34:11 2009 -0700
+@@ -144,6 +144,7 @@
+ LIBDL = @LIBDL@
+ LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
+ LIBOBJS = @LIBOBJS@
++LIBRT = @LIBRT@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@

 diff -ruN /dev/null b/patch_info/userstats.info
 --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
 +++ b/patch_info/userstats.info        Wed Jul 29 13:34:11 2009 -0700
 diff -ruN /dev/null b/patch_info/userstats.info
 --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
 +++ b/patch_info/userstats.info        Wed Jul 29 13:34:11 2009 -0700


@@ -3454,8 +3487,9 @@ diff -ruN a/sql/sql_prepare.cc b/sql/sql_prepare.cc
    DBUG_VOID_RETURN;
  }
  
    DBUG_VOID_RETURN;
  }
  

---- mysql-5.0.92/sql/sql_show.cc~      2011-02-24 15:55:10.000000000 +0200
-+++ mysql-5.0.92/sql/sql_show.cc       2011-02-24 15:56:28.993570019 +0200
+diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
+--- a/sql/sql_show.cc  Wed Jul 29 13:33:34 2009 -0700
++++ b/sql/sql_show.cc  Wed Jul 29 13:34:11 2009 -0700

 @@ -540,6 +540,7 @@
                sctx->master_access);
    if (!(db_access & DB_ACLS) && (!grant_option || check_grant_db(thd,dbname)))
 @@ -540,6 +540,7 @@
                sctx->master_access);
    if (!(db_access & DB_ACLS) && (!grant_option || check_grant_db(thd,dbname)))


@@ -3843,13 +3877,13 @@ diff -ruN a/sql/sql_prepare.cc b/sql/sql_prepare.cc
  
  /*
    Description of ST_FIELD_INFO in table.h
  
  /*
    Description of ST_FIELD_INFO in table.h

-@@ -4906,6 +4906,8 @@
+@@ -4504,6 +4870,8 @@

  {
  {

-   {"CHARACTER_SETS", charsets_fields_info, create_schema_table,
+   {"CHARACTER_SETS", charsets_fields_info, create_schema_table, 

     fill_schema_charsets, make_character_sets_old_format, 0, -1, -1, 0},
 +  {"CLIENT_STATISTICS", client_stats_fields_info, create_schema_table, 
 +    fill_schema_client_stats, make_old_format, 0, -1, -1, 0},
     fill_schema_charsets, make_character_sets_old_format, 0, -1, -1, 0},
 +  {"CLIENT_STATISTICS", client_stats_fields_info, create_schema_table, 
 +    fill_schema_client_stats, make_old_format, 0, -1, -1, 0},

-   {"COLLATIONS", collation_fields_info, create_schema_table,
+   {"COLLATIONS", collation_fields_info, create_schema_table, 

     fill_schema_collation, make_old_format, 0, -1, -1, 0},
    {"COLLATION_CHARACTER_SET_APPLICABILITY", coll_charset_app_fields_info,
 @@ -4512,6 +4880,8 @@
     fill_schema_collation, make_old_format, 0, -1, -1, 0},
    {"COLLATION_CHARACTER_SET_APPLICABILITY", coll_charset_app_fields_info,
 @@ -4512,6 +4880,8 @@


@@ -3861,7 +3895,7 @@ diff -ruN a/sql/sql_prepare.cc b/sql/sql_prepare.cc
    {"KEY_COLUMN_USAGE", key_column_usage_fields_info, create_schema_table,
      get_all_tables, 0, get_schema_key_column_usage_record, 4, 5, 0},
    {"OPEN_TABLES", open_tables_fields_info, create_schema_table,
    {"KEY_COLUMN_USAGE", key_column_usage_fields_info, create_schema_table,
      get_all_tables, 0, get_schema_key_column_usage_record, 4, 5, 0},
    {"OPEN_TABLES", open_tables_fields_info, create_schema_table,

-@@ -4941,10 +4943,14 @@
+@@ -4537,10 +4907,14 @@

     get_all_tables, make_table_names_old_format, 0, 1, 2, 1},
    {"TABLE_PRIVILEGES", table_privileges_fields_info, create_schema_table,
      fill_schema_table_privileges, 0, 0, -1, -1, 0},
     get_all_tables, make_table_names_old_format, 0, 1, 2, 1},
    {"TABLE_PRIVILEGES", table_privileges_fields_info, create_schema_table,
      fill_schema_table_privileges, 0, 0, -1, -1, 0},


@@ -3869,13 +3903,13 @@ diff -ruN a/sql/sql_prepare.cc b/sql/sql_prepare.cc
 +    fill_schema_table_stats, make_old_format, 0, -1, -1, 0},
    {"TRIGGERS", triggers_fields_info, create_schema_table,
     get_all_tables, make_old_format, get_schema_triggers_record, 5, 6, 0},
 +    fill_schema_table_stats, make_old_format, 0, -1, -1, 0},
    {"TRIGGERS", triggers_fields_info, create_schema_table,
     get_all_tables, make_old_format, get_schema_triggers_record, 5, 6, 0},

-   {"USER_PRIVILEGES", user_privileges_fields_info, create_schema_table,
+   {"USER_PRIVILEGES", user_privileges_fields_info, create_schema_table, 

      fill_schema_user_privileges, 0, 0, -1, -1, 0},
 +  {"USER_STATISTICS", user_stats_fields_info, create_schema_table, 
 +    fill_schema_user_stats, make_old_format, 0, -1, -1, 0},
    {"VARIABLES", variables_fields_info, create_schema_table, fill_variables,
     make_old_format, 0, -1, -1, 1},
      fill_schema_user_privileges, 0, 0, -1, -1, 0},
 +  {"USER_STATISTICS", user_stats_fields_info, create_schema_table, 
 +    fill_schema_user_stats, make_old_format, 0, -1, -1, 0},
    {"VARIABLES", variables_fields_info, create_schema_table, fill_variables,
     make_old_format, 0, -1, -1, 1},

-   {"VIEWS", view_fields_info, create_schema_table,
+   {"VIEWS", view_fields_info, create_schema_table, 

 diff -ruN a/sql/sql_update.cc b/sql/sql_update.cc
 --- a/sql/sql_update.cc        Wed Jul 29 13:33:34 2009 -0700
 +++ b/sql/sql_update.cc        Wed Jul 29 13:34:11 2009 -0700
 diff -ruN a/sql/sql_update.cc b/sql/sql_update.cc
 --- a/sql/sql_update.cc        Wed Jul 29 13:33:34 2009 -0700
 +++ b/sql/sql_update.cc        Wed Jul 29 13:34:11 2009 -0700

diff --git a/mysql.spec b/mysql.spec
index 99ed29c5ec3a4defed2e1d56ab60e94280303aaf..e04662a9a74551996e6671141513788761849791 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -127,6 +127,7 @@ Requires:   /usr/bin/setsid
 Requires:      rc-scripts >= 0.2.0
 Suggests:      mysql-client
 %{?with_tcpd:Suggests: tcp_wrappers}
 Requires:      rc-scripts >= 0.2.0
 Suggests:      mysql-client
 %{?with_tcpd:Suggests: tcp_wrappers}

+Suggests:      vim-syntax-mycnf

 Provides:      MySQL-server
 Provides:      group(mysql)
 Provides:      msqlormysql
 Provides:      MySQL-server
 Provides:      group(mysql)
 Provides:      msqlormysql


@@ -345,7 +346,7 @@ Este pacote contém os clientes padrão para o MySQL.
 
 %package libs
 Summary:       Shared libraries for MySQL
 
 %package libs
 Summary:       Shared libraries for MySQL

-Summary(pl.UTF-8):     Biblioteki dzielone MySQL
+Summary(pl.UTF-8):     Biblioteki współdzielone MySQL

 Group:         Libraries
 Requires:      glibc >= 6:2.3.6-15
 Obsoletes:     libmysql10
 Group:         Libraries
 Requires:      glibc >= 6:2.3.6-15
 Obsoletes:     libmysql10


@@ -355,11 +356,11 @@ Obsoletes:        mysql-doc < 4.1.12
 Shared libraries for MySQL.
 
 %description libs -l pl.UTF-8
 Shared libraries for MySQL.
 
 %description libs -l pl.UTF-8

-Biblioteki dzielone MySQL.
+Biblioteki współdzielone MySQL.

 
 %package devel
 
 %package devel

-Summary:       MySQL - Development header files and libraries
-Summary(pl.UTF-8):     MySQL - Pliki nagłówkowe i biblioteki dla programistów
+Summary:       MySQL - development header files and other files
+Summary(pl.UTF-8):     MySQL - Pliki nagłówkowe i inne dla programistów

 Summary(pt.UTF-8):     MySQL - Medições de desempenho
 Summary(ru.UTF-8):     MySQL - хедеры и библиотеки разработчика
 Summary(uk.UTF-8):     MySQL - хедери та бібліотеки програміста
 Summary(pt.UTF-8):     MySQL - Medições de desempenho
 Summary(ru.UTF-8):     MySQL - хедеры и библиотеки разработчика
 Summary(uk.UTF-8):     MySQL - хедери та бібліотеки програміста


@@ -371,7 +372,7 @@ Obsoletes:  MySQL-devel
 Obsoletes:     libmysql10-devel
 
 %description devel
 Obsoletes:     libmysql10-devel
 
 %description devel

-This package contains the development header files and libraries
+This package contains the development header files and other files

 necessary to develop MySQL client applications.
 
 %description devel -l fr.UTF-8
 necessary to develop MySQL client applications.
 
 %description devel -l fr.UTF-8


@@ -380,7 +381,7 @@ developpement necessaires pour developper des applications clientes
 MySQL.
 
 %description devel -l pl.UTF-8
 MySQL.
 
 %description devel -l pl.UTF-8

-Pliki nagłówkowe i biblioteki konieczne do kompilacji aplikacji
+Pliki nagłówkowe i inne pliki konieczne do kompilacji aplikacji

 klienckich MySQL.
 
 %description devel -l pt_BR.UTF-8
 klienckich MySQL.
 
 %description devel -l pt_BR.UTF-8


@@ -817,32 +818,32 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %triggerpostun -- mysql < 4.0.20-2.4
 %postun libs -p /sbin/ldconfig
 
 %triggerpostun -- mysql < 4.0.20-2.4

-# For clusters in /etc/mysql/clusters.conf
+# For clusters in /etc/%{name}/clusters.conf

 if [ -f /etc/sysconfig/mysql ]; then
        . /etc/sysconfig/mysql
        if [ -n "$MYSQL_DB_CLUSTERS" ]; then
                for i in "$MYSQL_DB_CLUSTERS"; do
 if [ -f /etc/sysconfig/mysql ]; then
        . /etc/sysconfig/mysql
        if [ -n "$MYSQL_DB_CLUSTERS" ]; then
                for i in "$MYSQL_DB_CLUSTERS"; do

-                       echo "$i/mysqld.conf=$i" >> /etc/mysql/clusters.conf
+                       echo "$i/mysqld.conf=$i" >> /etc/%{name}/clusters.conf

                done
                echo "# Do not use **obsolete** option MYSQL_DB_CLUSTERS" >> /etc/sysconfig/mysql
                done
                echo "# Do not use **obsolete** option MYSQL_DB_CLUSTERS" >> /etc/sysconfig/mysql

-               echo "# USE /etc/mysql/clusters.conf instead" >> /etc/sysconfig/mysql
-               echo "Converted clusters from MYSQL_DB_CLUSTERS to /etc/mysql/clusters.conf."
-               echo "You NEED to fix your /etc/sysconfig/mysql and verify /etc/mysql/clusters.conf."
+               echo "# USE /etc/%{name}/clusters.conf instead" >> /etc/sysconfig/mysql
+               echo "Converted clusters from MYSQL_DB_CLUSTERS to /etc/%{name}/clusters.conf."
+               echo "You NEED to fix your /etc/sysconfig/mysql and verify /etc/%{name}/clusters.conf."

        fi
 fi
 
 %triggerpostun -- mysql < 4.1.1
 # For better compatibility with prevoius versions:
        fi
 fi
 
 %triggerpostun -- mysql < 4.1.1
 # For better compatibility with prevoius versions:

-for config in $(awk -F= '!/^#/ && /=/{print $1}' /etc/mysql/clusters.conf); do
+for config in $(awk -F= '!/^#/ && /=/{print $1}' /etc/%{name}/clusters.conf); do

        if echo "$config" | grep -q '^/'; then
                config_file="$config"
        if echo "$config" | grep -q '^/'; then
                config_file="$config"

-       elif [ -f "/etc/mysql/$config" ]; then
-               config_file=/etc/mysql/$config
+       elif [ -f "/etc/%{name}/$config" ]; then
+               config_file=/etc/%{name}/$config

        else
        else

-               clusterdir=$(awk -F= "/^$config/{print \$2}" /etc/mysql/clusters.conf)
+               clusterdir=$(awk -F= "/^$config/{print \$2}" /etc/%{name}/clusters.conf)

                if [ -z "$clusterdir" ]; then
                        echo >&2 "Can't find cluster dir for $config!"
                if [ -z "$clusterdir" ]; then
                        echo >&2 "Can't find cluster dir for $config!"

-                       echo >&2 "Please remove extra (leading) spaces from /etc/mysql/clusters.conf"
+                       echo >&2 "Please remove extra (leading) spaces from /etc/%{name}/clusters.conf"

                        exit 1
                fi
                config_file="$clusterdir/mysqld.conf"
                        exit 1
                fi
                config_file="$clusterdir/mysqld.conf"