Merge

sql/set_var.cc: Auto merged sql/mysqld.cc: SCCS merged
2025-07-30 16:24:05 +03:00 · 2003-12-30 13:16:49 +02:00
parent 376fb08072 d9ada7c257
commit b703338d76
33 changed files with 65 additions and 16 deletions
--- 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
--- 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!");

--- 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
--- 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);
--- 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
--- 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;
--- 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
--- 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 */
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@ -239,3 +239,4 @@
 "Esta vers<72>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 <20>s normas de replica<63><61>o-*-tabela"
+"Variable '%-.64s' is a %s variable"
--- 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"
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@ -241,3 +241,4 @@
 "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> MySQL <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s'",
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d: '%-.128s' <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
 "Slave SQL thread ignored the query because of replicate-*-table rules"
+"Variable '%-.64s' is a %s variable"
--- 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"
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@ -240,3 +240,4 @@
 "Esta versi<73>n de MySQL no soporta todavia '%s'",
 "Recibi<62> fatal error %d: '%-.128s' del master cuando leyendo datos del binary log",
 "Slave SQL thread ignorado el query debido a las reglas de replicaci<63>n-*-tabla"
+"Variable '%-.64s' is a %s variable"
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@ -239,3 +239,4 @@
 "Denna version av MySQL kan <20>nnu inte utf<74>ra '%s'",
 "Fick fatalt fel %d: '%-.128s' fr<66>n master vid l<>sning av bin<69>rloggen"
 "Slave SQL thread ignored the query because of replicate-*-table rules"
+"Variable '%-.64s' is a %s variable"
--- 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"
--- 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;
--- 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)