From d6be93aa27becf6864b15a699cf62c394620355e Mon Sep 17 00:00:00 2001
From: unknown <vva@eagle.mysql.r18.ru>
Date: Wed, 17 Dec 2003 16:37:47 -0400
Subject: [PATCH 1/7] added error message for receiving variable with wrong
 GLOBAL|LOCAL type (bug #2086)

include/mysqld_error.h:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
mysql-test/r/variables.result:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
mysql-test/t/variables.test:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/set_var.cc:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/czech/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/danish/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/dutch/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/english/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/estonian/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/french/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/german/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/greek/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/hungarian/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/italian/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/japanese/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/korean/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/norwegian-ny/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/norwegian/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/polish/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/portuguese/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/romanian/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/russian/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/slovak/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/spanish/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/swedish/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/ukrainian/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
---
 include/mysqld_error.h            | 3 ++-
 mysql-test/r/variables.result     | 6 ++++--
 mysql-test/t/variables.test       | 7 +++++--
 sql/set_var.cc                    | 5 ++---
 sql/share/czech/errmsg.txt        | 1 +
 sql/share/danish/errmsg.txt       | 1 +
 sql/share/dutch/errmsg.txt        | 1 +
 sql/share/english/errmsg.txt      | 1 +
 sql/share/estonian/errmsg.txt     | 1 +
 sql/share/french/errmsg.txt       | 1 +
 sql/share/german/errmsg.txt       | 1 +
 sql/share/greek/errmsg.txt        | 1 +
 sql/share/hungarian/errmsg.txt    | 1 +
 sql/share/italian/errmsg.txt      | 1 +
 sql/share/japanese/errmsg.txt     | 1 +
 sql/share/korean/errmsg.txt       | 1 +
 sql/share/norwegian-ny/errmsg.txt | 1 +
 sql/share/norwegian/errmsg.txt    | 1 +
 sql/share/polish/errmsg.txt       | 1 +
 sql/share/portuguese/errmsg.txt   | 1 +
 sql/share/romanian/errmsg.txt     | 1 +
 sql/share/russian/errmsg.txt      | 1 +
 sql/share/slovak/errmsg.txt       | 1 +
 sql/share/spanish/errmsg.txt      | 1 +
 sql/share/swedish/errmsg.txt      | 1 +
 sql/share/ukrainian/errmsg.txt    | 1 +
 26 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index 9d3197c0bd4..acc9b5961c6 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -254,4 +254,5 @@
 #define ER_NOT_SUPPORTED_YET	1235
 #define ER_MASTER_FATAL_ERROR_READING_BINLOG 1236
 #define ER_SLAVE_IGNORED_TABLE 1237 /* only the slave SQL thread can be sent this */
-#define ER_ERROR_MESSAGES 238
+#define ER_INCORRECT_GLOBAL_LOCAL_VAR 1238
+#define ER_ERROR_MESSAGES 239
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 8afdced206b..b4a607cb174 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -231,7 +231,7 @@ Wrong argument type to variable 'convert_character_set'
 set global autocommit=1;
 Variable 'autocommit' is a LOCAL variable and can't be used with SET GLOBAL
 select @@global.timestamp;
-Variable 'timestamp' is a LOCAL variable and can't be used with SET GLOBAL
+Variable 'timestamp' is a LOCAL variable
 set @@version='';
 Unknown system variable 'version'
 set @@concurrent_insert=1;
@@ -239,7 +239,7 @@ Variable 'concurrent_insert' is a GLOBAL variable and should be set with SET GLO
 set @@global.sql_auto_is_null=1;
 Variable 'sql_auto_is_null' is a LOCAL variable and can't be used with SET GLOBAL
 select @@global.sql_auto_is_null;
-Variable 'sql_auto_is_null' is a LOCAL variable and can't be used with SET GLOBAL
+Variable 'sql_auto_is_null' is a LOCAL variable
 set myisam_max_sort_file_size=100;
 Variable 'myisam_max_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
 set myisam_max_extra_sort_file_size=100;
@@ -375,3 +375,5 @@ Unknown system variable 'xxxxxxxxxx'
 select 1;
 1
 1
+select @@session.key_buffer_size;
+Variable 'key_buffer_size' is a GLOBAL variable
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index 8e38160c60b..ec86a763023 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -139,7 +139,7 @@ set character set unknown;
 set character set 0;
 --error 1228
 set global autocommit=1;
---error 1228
+--error 1238
 select @@global.timestamp;
 --error 1193
 set @@version='';
@@ -147,7 +147,7 @@ set @@version='';
 set @@concurrent_insert=1;
 --error 1228
 set @@global.sql_auto_is_null=1;
---error 1228
+--error 1238
 select @@global.sql_auto_is_null;
 --error 1229
 set myisam_max_sort_file_size=100;
@@ -266,3 +266,6 @@ drop table t1,t2;
 --error 1193
 select @@xxxxxxxxxx;
 select 1;
+
+--error 1238
+select @@session.key_buffer_size;
\ No newline at end of file
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 4aea611e401..4e22d7983dd 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -1032,9 +1032,8 @@ Item *sys_var::item(THD *thd, enum_var_type var_type)
   {
     if (var_type != OPT_DEFAULT)
     {
-      net_printf(&thd->net,
-		 var_type == OPT_GLOBAL ? ER_LOCAL_VARIABLE :
-		 ER_GLOBAL_VARIABLE, name);
+      net_printf(&thd->net,ER_INCORRECT_GLOBAL_LOCAL_VAR,
+		 name, var_type == OPT_GLOBAL ? "LOCAL" : "GLOBAL");
       return 0;
     }
     /* As there was no local variable, return the global value */
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 72a593cf5f7..6e8f060b6b1 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -248,3 +248,4 @@
 "This version of MySQL doesn't yet support '%s'",
 "Got fatal error %d: '%-.128s' from master when reading data from binary log",
 "Slave SQL thread ignored the query because of replicate-*-table rules"
+"Variable '%-.64s' is a %s variable"
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index f59abfeb6da..fe2cedb69bb 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -242,3 +242,4 @@
 "This version of MySQL doesn't yet support '%s'",
 "Got fatal error %d: '%-.128s' from master when reading data from binary log",
 "Slave SQL thread ignored the query because of replicate-*-table rules"
+"Variable '%-.64s' is a %s variable"
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 974b4601ac8..e2e5bd6839c 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -250,3 +250,4 @@
 "Deze versie van MySQL ondersteunt nog geen '%s'",
 "Kreeg fatale fout %d: '%-.128s' van master tijdens lezen van data uit binaire log",
 "Slave SQL thread ignored the query because of replicate-*-table rules"
+"Variable '%-.64s' is a %s variable"
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 0ce90ac0dab..9d4fd9af41c 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -239,3 +239,4 @@
 "This version of MySQL doesn't yet support '%s'",
 "Got fatal error %d: '%-.128s' from master when reading data from binary log",
 "Slave SQL thread ignored the query because of replicate-*-table rules"
+"Variable '%-.64s' is a %s variable"
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index 38b45c1443b..6cbd7249374 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -244,3 +244,4 @@
 "This version of MySQL doesn't yet support '%s'",
 "Got fatal error %d: '%-.128s' from master when reading data from binary log",
 "Slave SQL thread ignored the query because of replicate-*-table rules"
+"Variable '%-.64s' is a %s variable"
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index df2be2803b4..d85ef75bb3a 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -239,3 +239,4 @@
 "This version of MySQL doesn't yet support '%s'",
 "Got fatal error %d: '%-.128s' from master when reading data from binary log",
 "Slave SQL thread ignored the query because of replicate-*-table rules"
+"Variable '%-.64s' is a %s variable"
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index cdeab579eca..6258171e34e 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -242,3 +242,4 @@
 "This version of MySQL doesn't yet support '%s'",
 "Got fatal error %d: '%-.128s' from master when reading data from binary log",
 "Slave SQL thread ignored the query because of replicate-*-table rules"
+"Variable '%-.64s' is a %s variable"
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index e3778aaac10..e9d812cab0f 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -239,3 +239,4 @@
 "This version of MySQL doesn't yet support '%s'",
 "Got fatal error %d: '%-.128s' from master when reading data from binary log",
 "Slave SQL thread ignored the query because of replicate-*-table rules"
+"Variable '%-.64s' is a %s variable"
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 85ea5c2e742..5390511ba74 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -241,3 +241,4 @@
 "This version of MySQL doesn't yet support '%s'",
 "Got fatal error %d: '%-.128s' from master when reading data from binary log",
 "Slave SQL thread ignored the query because of replicate-*-table rules"
+"Variable '%-.64s' is a %s variable"
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 3be8058661a..cf094da76d2 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -239,3 +239,4 @@
 "Questa versione di MySQL non supporta ancora '%s'",
 "Errore fatale %d: '%-.128s' dal master leggendo i dati dal log binario",
 "Slave SQL thread ignored the query because of replicate-*-table rules"
+"Variable '%-.64s' is a %s variable"
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index f99d262a689..89a770d0be8 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -241,3 +241,4 @@
 "This version of MySQL doesn't yet support '%s'",
 "Got fatal error %d: '%-.128s' from master when reading data from binary log",
 "Slave SQL thread ignored the query because of replicate-*-table rules"
+"Variable '%-.64s' is a %s variable"
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 2a7e03b026d..f808a7f0f5d 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -239,3 +239,4 @@
 "This version of MySQL doesn't yet support '%s'",
 "Got fatal error %d: '%-.128s' from master when reading data from binary log",
 "Slave SQL thread ignored the query because of replicate-*-table rules"
+"Variable '%-.64s' is a %s variable"
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index e6ec84e98a0..4a8207bebff 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -241,3 +241,4 @@
 "This version of MySQL doesn't yet support '%s'",
 "Got fatal error %d: '%-.128s' from master when reading data from binary log",
 "Slave SQL thread ignored the query because of replicate-*-table rules"
+"Variable '%-.64s' is a %s variable"
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index fe379261151..e441ef3e3fc 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -241,3 +241,4 @@
 "This version of MySQL doesn't yet support '%s'",
 "Got fatal error %d: '%-.128s' from master when reading data from binary log",
 "Slave SQL thread ignored the query because of replicate-*-table rules"
+"Variable '%-.64s' is a %s variable"
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index a300dc1e2ab..4429a187599 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -243,3 +243,4 @@
 "This version of MySQL doesn't yet support '%s'",
 "Got fatal error %d: '%-.128s' from master when reading data from binary log",
 "Slave SQL thread ignored the query because of replicate-*-table rules"
+"Variable '%-.64s' is a %s variable"
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 89af701f21a..bdb721d9e94 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -239,3 +239,4 @@
 "Esta versão de MySQL não suporta ainda '%s'",
 "Obteve fatal erro %d: '%-.128s' do master quando lendo dados do binary log",
 "Slave SQL thread ignorado a consulta devido às normas de replicação-*-tabela"
+"Variable '%-.64s' is a %s variable"
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index bf1306cd332..49524349087 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -243,3 +243,4 @@
 "This version of MySQL doesn't yet support '%s'",
 "Got fatal error %d: '%-.128s' from master when reading data from binary log",
 "Slave SQL thread ignored the query because of replicate-*-table rules"
+"Variable '%-.64s' is a %s variable"
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index 03964efb26b..03e6874549e 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -241,3 +241,4 @@
 "üÔÁ ×ÅÒÓÉÑ MySQL ÐÏËÁ ÅÝÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ '%s'",
 "ðÏÌÕÞÅÎÁ ÎÅÉÓÐÒÁ×ÉÍÁÑ ÏÛÉÂËÁ %d: '%-.128s' ÏÔ ÇÏÌÏ×ÎÏÇÏ ÓÅÒ×ÅÒÁ × ÐÒÏÃÅÓÓÅ ×ÙÂÏÒËÉ ÄÁÎÎÙÈ ÉÚ Ä×ÏÉÞÎÏÇÏ ÖÕÒÎÁÌÁ",
 "Slave SQL thread ignored the query because of replicate-*-table rules"
+"Variable '%-.64s' is a %s variable"
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index b9970465871..31bdd40dd62 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -247,3 +247,4 @@
 "This version of MySQL doesn't yet support '%s'",
 "Got fatal error %d: '%-.128s' from master when reading data from binary log",
 "Slave SQL thread ignored the query because of replicate-*-table rules"
+"Variable '%-.64s' is a %s variable"
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index acb0b9fd2ab..0068b3a6e12 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -240,3 +240,4 @@
 "Esta versión de MySQL no soporta todavia '%s'",
 "Recibió fatal error %d: '%-.128s' del master cuando leyendo datos del binary log",
 "Slave SQL thread ignorado el query debido a las reglas de replicación-*-tabla"
+"Variable '%-.64s' is a %s variable"
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 32eec834ed1..5ecb7962aed 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -239,3 +239,4 @@
 "Denna version av MySQL kan ännu inte utföra '%s'",
 "Fick fatalt fel %d: '%-.128s' från master vid läsning av binärloggen"
 "Slave SQL thread ignored the query because of replicate-*-table rules"
+"Variable '%-.64s' is a %s variable"
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index c0931ab9f02..a5f94e90d6a 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -244,3 +244,4 @@
 "This version of MySQL doesn't yet support '%s'",
 "Got fatal error %d: '%-.128s' from master when reading data from binary log",
 "Slave SQL thread ignored the query because of replicate-*-table rules"
+"Variable '%-.64s' is a %s variable"

From cb12a8b827672c92a9ed7eb1589996856fcea1b4 Mon Sep 17 00:00:00 2001
From: unknown <serg@serg.mylan>
Date: Fri, 19 Dec 2003 23:08:20 +0100
Subject: [PATCH 2/7] do not put --user into command line if the value comes
 from [mysqld] or [server] sections Bug #2163

---
 scripts/mysqld_safe.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index ece4ba098f4..5d77863c9b4 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -46,8 +46,9 @@ parse_arguments() {
       --user=*)
         if test $SET_USER -eq 0
         then
-          user=`echo "$arg" | sed -e "s;--[^=]*=;;"` ; SET_USER=1
+          user=`echo "$arg" | sed -e "s;--[^=]*=;;"`
         fi
+        SET_USER=1
         ;;
 
       # these two might have been set in a [mysqld_safe] section of my.cnf
@@ -129,7 +130,6 @@ fi
 # these rely on $DATADIR by default, so we'll set them later on
 pid_file=
 err_log=
-SET_USER=0
 
 # Get first arguments from the my.cnf file, groups [mysqld] and [mysqld_safe]
 # and then merge with the command line arguments
@@ -147,7 +147,13 @@ else
 fi
 
 args=
-parse_arguments `$print_defaults --loose-verbose $defaults mysqld server mysqld_safe safe_mysqld`
+SET_USER=2
+parse_arguments `$print_defaults --loose-verbose $defaults mysqld server`
+if test $SET_USER -eq 2
+then
+  SET_USER=0
+fi
+parse_arguments `$print_defaults --loose-verbose $defaults mysqld_safe safe_mysqld`
 parse_arguments PICK-ARGS-FROM-ARGV "$@"
 
 if test ! -x $ledir/$MYSQLD

From 76a36815dff4e094131db5caebe6bf1eb97b396e Mon Sep 17 00:00:00 2001
From: unknown <serg@serg.mylan>
Date: Mon, 22 Dec 2003 13:03:23 +0100
Subject: [PATCH 3/7] typos fixed

---
 sql/mysqld.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index a4e59c399e5..103917249c9 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4955,7 +4955,8 @@ static void fix_paths(void)
   if (!lower_case_table_names &&
       test_if_case_insensitive(mysql_real_data_home) == 1)
   {
-    sql_print_error("Warning: Setting lower_case_table_names=1 becasue file system %s is case insensitve", mysql_real_data_home);
+    sql_print_error("Warning: Setting lower_case_table_names=1 because file system %s is case insensitive", mysql_real_data_home);
+    lower_case_table_names=1;
   }
 }
 
@@ -4964,7 +4965,7 @@ static void fix_paths(void)
   set how many open files we want to be able to handle
 
   SYNOPSIS
-    set_maximum_open_files()  
+    set_maximum_open_files()
     max_file_limit		Files to open
 
   NOTES

From 9cd4e65081dadd69fd5cc7e12a6a9786d657c681 Mon Sep 17 00:00:00 2001
From: unknown <lenz@mysql.com>
Date: Mon, 22 Dec 2003 14:56:06 +0100
Subject: [PATCH 4/7]  - marked /etc/logrotate.d/mysql as a config file in the
 RPM spec file    (BUG#2156)

support-files/mysql.spec.sh:
   - marked /etc/logrotate.d/mysql as a config file (BUG#2156)
---
 support-files/mysql.spec.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index e1c3476f738..e25a8a40c71 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -493,7 +493,7 @@ fi
 %attr(755, root, root) %{_sbindir}/rcmysql
 %attr(644, root, root) %{_libdir}/mysql/mysqld.sym
 
-%attr(644, root, root) %{_sysconfdir}/logrotate.d/mysql
+%attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
 %attr(755, root, root) %{_sysconfdir}/init.d/mysql
 
 %attr(755, root, root) %{_datadir}/mysql/
@@ -572,6 +572,10 @@ fi
 # The spec file changelog only includes changes made to the spec file
 # itself
 %changelog 
+* Mon Dec 22 2003 Lenz Grimmer <lenz@mysql.com>
+
+- marked /etc/logrotate.d/mysql as a config file (BUG 2156)
+
 * Fri Dec 13 2003 Lenz Grimmer <lenz@mysql.com>
 
 - fixed file permissions (BUG 1672)

From 8e139ddc336c75d155dd3e505d1ff7262822d7ac Mon Sep 17 00:00:00 2001
From: unknown <lenz@mysql.com>
Date: Tue, 23 Dec 2003 16:51:14 +0100
Subject: [PATCH 5/7]  - Fixed another missing space

---
 Build-tools/Do-rpm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Build-tools/Do-rpm b/Build-tools/Do-rpm
index a216a3ba5dc..3473bcb1f5f 100755
--- a/Build-tools/Do-rpm
+++ b/Build-tools/Do-rpm
@@ -188,7 +188,7 @@ $command.= basename($SPECFILE);
 #
 $command= "mv";
 $command.= " -v " if ($opt_verbose);
-$command.= "$SRCRPMDIR/MySQL*$VERSION*.src.rpm $PWD";
+$command.= " $SRCRPMDIR/MySQL*$VERSION*.src.rpm $PWD";
 &logger("Moving source RPM to current dir.");
 &run_command($command, "Error moving source RPM!");
 

From 06f7d70ba6d457139cf0587f6dc90e874391cf92 Mon Sep 17 00:00:00 2001
From: unknown <heikki@hundin.mysql.fi>
Date: Tue, 23 Dec 2003 22:55:38 +0200
Subject: [PATCH 6/7] log0log.c:   Do not assert in log0log.c, line 856 if
 ib_logfiles are too small for innodb_thread_concurrency. Instead, print
 instructions how to adjust my.cnf and call exit(1).

innobase/log/log0log.c:
  Do not assert in log0log.c, line 856 if ib_logfiles are too small for innodb_thread_concurrency. Instead, print instructions how to adjust my.cnf and call exit(1).
---
 innobase/log/log0log.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/innobase/log/log0log.c b/innobase/log/log0log.c
index 1c7a79525e3..5df63e39296 100644
--- a/innobase/log/log0log.c
+++ b/innobase/log/log0log.c
@@ -661,7 +661,18 @@ failure:
 
 	if (!success) {
 		fprintf(stderr,
-"InnoDB: Error: log file group too small for innodb_thread_concurrency\n");
+"InnoDB: Error: ib_logfiles are too small for innodb_thread_concurrency %lu.\n"
+"InnoDB: The combined size of ib_logfiles should be bigger than\n"
+"InnoDB: 200 kB * innodb_thread_concurrency.\n"
+"InnoDB: To get mysqld to start up, set innodb_thread_concurrency in my.cnf\n"
+"InnoDB: to a lower value, for example, to 8. After an ERROR-FREE shutdown\n"
+"InnoDB: of mysqld you can adjust the size of ib_logfiles, as explained in\n"
+"InnoDB: section 5 of http://www.innodb.com/ibman.php",
+			(ulong)srv_thread_concurrency);
+		fprintf(stderr,
+"InnoDB: Cannot continue operation. Calling exit(1).\n");
+
+		exit(1);
 	}
 
 	return(success);

From 02b5c69a9f6fb20068d0ed7df62140b2f9d5097d Mon Sep 17 00:00:00 2001
From: unknown <bar@bar.intranet.mysql.r18.ru>
Date: Wed, 24 Dec 2003 17:01:48 +0400
Subject: [PATCH 7/7] ctype-big5.c:   Like did not work in some cases   ,

strings/ctype-big5.c:
  Like did not work in some cases
  ,
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
---
 BitKeeper/etc/logging_ok | 1 +
 strings/ctype-big5.c     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 386ab8a0e49..5cf95b9fc2a 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -9,6 +9,7 @@ akishkin@work.mysql.com
 arjen@co3064164-a.bitbike.com
 arjen@fred.bitbike.com
 arjen@george.bitbike.com
+bar@bar.intranet.mysql.r18.ru
 bar@bar.mysql.r18.ru
 bar@bar.udmsearch.izhnet.ru
 bell@laptop.sanja.is.com.ua
diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c
index 44f8a100897..1f82c844a50 100644
--- a/strings/ctype-big5.c
+++ b/strings/ctype-big5.c
@@ -356,7 +356,7 @@ my_bool my_like_range_big5(const char *ptr,uint ptr_length,pchar escape,
       *min_length= (uint) (min_str-min_org);
       *max_length= res_length;
       do {
-	*min_str++ = '\0';		/* Because if key compression */
+	*min_str++ = ' ';		/* Because if key compression */
 	*max_str++ = max_sort_char;
       } while (min_str != min_end);
       return 0;