From 77bba943cb0f51d96acd92e90f38281e9b3f52d5 Mon Sep 17 00:00:00 2001
From: unknown <jimw@mysql.com>
Date: Thu, 13 Jan 2005 09:05:23 -0800
Subject: [PATCH 01/13] Put flags for -max building in BUILD/SETUP.sh so they
 are consistent across all architectures, and in sync with the flags used to
 build the MySQL Max packages. Also back-port AMD64 build scripts from 5.0.

BUILD/SETUP.sh:
  Add $max_configs (and variants) and amd64_*
BUILD/compile-pentium-debug-max:
  Use $max_configs
BUILD/compile-pentium-debug-max-no-embedded:
  Use $max_no_es_configs
BUILD/compile-pentium-max:
  Use $max_configs
BUILD/compile-pentium-valgrind-max:
  Use $max_leave_isam_configs
BUILD/compile-ppc-debug-max:
  Use $max_configs
BUILD/compile-ppc-max:
  Use $max_configs
---
 BUILD/SETUP.sh                              |  8 ++++++++
 BUILD/compile-amd64-debug-max               | 12 ++++++++++++
 BUILD/compile-amd64-max                     | 12 ++++++++++++
 BUILD/compile-pentium-debug-max             |  2 +-
 BUILD/compile-pentium-debug-max-no-embedded |  2 +-
 BUILD/compile-pentium-max                   |  4 +---
 BUILD/compile-pentium-valgrind-max          |  2 +-
 BUILD/compile-ppc-debug-max                 |  2 +-
 BUILD/compile-ppc-max                       |  4 +---
 9 files changed, 38 insertions(+), 10 deletions(-)
 create mode 100755 BUILD/compile-amd64-debug-max
 create mode 100755 BUILD/compile-amd64-max

diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index 5f4233b8371..9e2095cecfa 100644
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -41,7 +41,13 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch
 c_warnings="$global_warnings -Wunused"
 cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
 
+base_max_configs="--with-innodb --with-bdb --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio"
+max_leave_isam_configs="--with-innodb --with-bdb --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio --with-embedded-server"
+max_no_es_configs="$max_leave_isam_configs --without-isam"
+max_configs="$max_no_es_configs --with-embedded-server"
+
 alpha_cflags="-mcpu=ev6 -Wa,-mev6"	# Not used yet
+amd64_cflags="-DBIG_TABLES"
 pentium_cflags="-mcpu=pentiumpro"
 ppc_cflags="-mpowerpc -mcpu=powerpc"
 sparc_cflags=""
@@ -55,9 +61,11 @@ reckless_cflags="-O3 -fomit-frame-pointer "
 debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DPEDANTIC_SAFEMALLOC -DSAFE_MUTEX"
 
 base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"
+amd64_cxxflags="-DBIG_TABLES"
 
 base_configs="--prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-readline"
 static_link="--with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static"
+amd64_configs=""
 alpha_configs=""	# Not used yet
 pentium_configs=""
 sparc_configs=""
diff --git a/BUILD/compile-amd64-debug-max b/BUILD/compile-amd64-debug-max
new file mode 100755
index 00000000000..466bea73179
--- /dev/null
+++ b/BUILD/compile-amd64-debug-max
@@ -0,0 +1,12 @@
+#! /bin/sh
+path=`dirname $0`
+. "$path/SETUP.sh"
+base_cxxflags="$amd64_cxxflags $base_cxxflags"
+extra_flags="$amd64_cflags $debug_cflags"
+c_warnings="$c_warnings $debug_extra_warnings"
+cxx_warnings="$cxx_warnings $debug_extra_warnings"
+extra_configs="$amd64_configs $debug_configs"
+
+extra_configs="$extra_configs $max_configs"
+
+. "$path/FINISH.sh"
diff --git a/BUILD/compile-amd64-max b/BUILD/compile-amd64-max
new file mode 100755
index 00000000000..4a260859474
--- /dev/null
+++ b/BUILD/compile-amd64-max
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+path=`dirname $0`
+. "$path/SETUP.sh"
+base_cxxflags="$amd64_cxxflags $base_cxxflags"
+extra_flags="$amd64_cflags $fast_cflags -g"
+extra_configs="$amd64_configs"
+#strip=yes
+
+extra_configs="$extra_configs $max_configs"
+
+. "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-debug-max b/BUILD/compile-pentium-debug-max
index 8894782050c..6487c094cec 100755
--- a/BUILD/compile-pentium-debug-max
+++ b/BUILD/compile-pentium-debug-max
@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
 extra_configs="$pentium_configs $debug_configs"
 
-extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-embedded-server --with-openssl --with-raid --with-vio --with-ndbcluster"
+extra_configs="$extra_configs $max_configs"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-debug-max-no-embedded b/BUILD/compile-pentium-debug-max-no-embedded
index 4554e38fdc1..f7a9d966d6d 100755
--- a/BUILD/compile-pentium-debug-max-no-embedded
+++ b/BUILD/compile-pentium-debug-max-no-embedded
@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
 extra_configs="$pentium_configs $debug_configs"
 
-extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-openssl --with-raid"
+extra_configs="$extra_configs $max_no_es_configs"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-max b/BUILD/compile-pentium-max
index caf657a2049..de37f28582b 100755
--- a/BUILD/compile-pentium-max
+++ b/BUILD/compile-pentium-max
@@ -7,8 +7,6 @@ extra_flags="$pentium_cflags $fast_cflags -g"
 extra_configs="$pentium_configs"
 #strip=yes
 
-extra_configs="$extra_configs --with-innodb --with-berkeley-db \
-	--with-embedded-server --enable-thread-safe-client \
-	--with-openssl --with-vio --with-raid --with-ndbcluster"
+extra_configs="$extra_configs $max_configs"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-valgrind-max b/BUILD/compile-pentium-valgrind-max
index fd9543163d6..322b0735488 100755
--- a/BUILD/compile-pentium-valgrind-max
+++ b/BUILD/compile-pentium-valgrind-max
@@ -9,7 +9,7 @@ cxx_warnings="$cxx_warnings $debug_extra_warnings"
 extra_configs="$pentium_configs $debug_configs"
 
 # We want to test isam when building with valgrind
-extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-isam --with-embedded-server --with-openssl --with-vio --with-raid --with-ndbcluster"
+extra_configs="$extra_configs $max_leave_isam_configs --with-isam"
 
 . "$path/FINISH.sh"
 
diff --git a/BUILD/compile-ppc-debug-max b/BUILD/compile-ppc-debug-max
index 9d67b46601a..004e821d722 100755
--- a/BUILD/compile-ppc-debug-max
+++ b/BUILD/compile-ppc-debug-max
@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
 extra_configs="$debug_configs"
 
-extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-embedded-server --with-openssl --with-raid --with-vio --with-ndbcluster"
+extra_configs="$extra_configs $max_configs"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-ppc-max b/BUILD/compile-ppc-max
index f7193eb8aca..632db7216e4 100755
--- a/BUILD/compile-ppc-max
+++ b/BUILD/compile-ppc-max
@@ -6,8 +6,6 @@ path=`dirname $0`
 extra_flags="$ppc_cflags $fast_cflags -g"
 #strip=yes
 
-extra_configs="$extra_configs --with-innodb --with-berkeley-db \
-	--with-embedded-server --enable-thread-safe-client \
-	--with-openssl --with-vio --with-raid --with-ndbcluster"
+extra_configs="$extra_configs $max_configs"
 
 . "$path/FINISH.sh"

From 2e50981af908bff71c330d4caff40338ee2356d8 Mon Sep 17 00:00:00 2001
From: unknown <sergefp@mysql.com>
Date: Tue, 18 Jan 2005 17:26:05 +0300
Subject: [PATCH 02/13] Fix for BUG#7885

mysql-test/r/subselect.result:
  Testcase for BUG#7885
mysql-test/t/subselect.test:
  Testcase for BUG#7885
sql/item_subselect.cc:
  Fix for BUG#7885: In Item_subselect::fix_fields, return error if engine->prepare fails.
  Also removed redundant code line.
---
 mysql-test/r/subselect.result |  8 ++++++++
 mysql-test/t/subselect.test   | 11 +++++++++++
 sql/item_subselect.cc         |  3 ++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index 9c442d8e3cb..02662f9900a 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -2152,3 +2152,11 @@ WHERE f1 <> ALL ( SELECT SUM(f1) AS sf1 FROM t2 HAVING sf1 > 10000);
 f1
 NULL
 1
+drop table t1,t2;
+create table t1 (a1 int);
+create table t2 (b1 int);
+select * from t1 where a2 > any(select b1 from t2);
+ERROR 42S22: Unknown column 'a2' in 'scalar IN/ALL/ANY subquery'
+select * from t1 where a1 > any(select b1 from t2);
+a1
+drop table t1,t2;
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index 6e4c3a5d604..3ee498ee380 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -1412,3 +1412,14 @@ SELECT f1 FROM t1
 
 SELECT f1 FROM t1
    WHERE f1 <> ALL ( SELECT SUM(f1) AS sf1 FROM t2 HAVING sf1 > 10000);
+
+drop table t1,t2;
+# Test for BUG#7885: Server crash when 'any' subselect compared to
+# non-existant field.
+create table t1 (a1 int);
+create table t2 (b1 int);
+--error 1054
+select * from t1 where a2 > any(select b1 from t2);
+select * from t1 where a1 > any(select b1 from t2);
+drop table t1,t2;
+
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index e1a80941a52..8516ea76a7e 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -177,6 +177,8 @@ bool Item_subselect::fix_fields(THD *thd_param, TABLE_LIST *tables, Item **ref)
     }
     fix_length_and_dec();
   }
+  else
+    return 1;
   uint8 uncacheable= engine->uncacheable();
   if (uncacheable)
   {
@@ -264,7 +266,6 @@ Item_singlerow_subselect::Item_singlerow_subselect(st_select_lex *select_lex)
 {
   DBUG_ENTER("Item_singlerow_subselect::Item_singlerow_subselect");
   init(select_lex, new select_singlerow_subselect(this));
-  max_columns= 1;
   maybe_null= 1;
   max_columns= UINT_MAX;
   DBUG_VOID_RETURN;

From 54b281a37a1af1d2edc1522029a61894491b96f4 Mon Sep 17 00:00:00 2001
From: unknown <jimw@mysql.com>
Date: Tue, 18 Jan 2005 16:50:09 -0800
Subject: [PATCH 03/13] Add ha_federated.cc to libmysqld/Makefile.am so that
 configuring with both embedded server and federated storage engine compiles.
 (Bug #7920)

libmysqld/Makefile.am:
  Add ha_federated.cc to sources
---
 libmysqld/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 17410f02fe2..4cd53216434 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -42,7 +42,7 @@ sqlexamplessources =	ha_example.cc ha_archive.cc ha_tina.cc
 noinst_HEADERS =	embedded_priv.h emb_qcache.h
 
 sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
-	ha_innodb.cc ha_berkeley.cc ha_heap.cc \
+	ha_innodb.cc ha_berkeley.cc ha_heap.cc ha_federated.cc \
 	ha_myisam.cc ha_myisammrg.cc handler.cc sql_handler.cc \
 	hostname.cc init.cc password.c \
 	item.cc item_buff.cc item_cmpfunc.cc item_create.cc \

From 97b29023eccc1155b0b657e0a3f471aa80d5b8ae Mon Sep 17 00:00:00 2001
From: unknown <jimw@mysql.com>
Date: Tue, 18 Jan 2005 17:01:06 -0800
Subject: [PATCH 04/13] Update list of files copied for binary distribution.
 (Bug #7632)

scripts/make_binary_distribution.sh:
  Update list of std_data files copied
---
 scripts/make_binary_distribution.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 0851edd56ce..69f9092f1fd 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -210,8 +210,10 @@ do
 done
 
 $CP mysql-test/include/*.inc $BASE/mysql-test/include
-$CP mysql-test/std_data/*.dat mysql-test/std_data/*.*001 $BASE/mysql-test/std_data
-$CP mysql-test/std_data/des_key_file $BASE/mysql-test/std_data
+$CP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \
+    mysql-test/std_data/*.pem mysql-test/std_data/Moscow_leap \
+    mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \
+    $BASE/mysql-test/std_data
 $CP mysql-test/t/*test mysql-test/t/*.opt mysql-test/t/*.slave-mi mysql-test/t/*.sh $BASE/mysql-test/t
 $CP mysql-test/r/*result mysql-test/r/*.require $BASE/mysql-test/r
 

From 6130a3ad7c4984956eb385f50a1d0125a11dce84 Mon Sep 17 00:00:00 2001
From: unknown <gluh@gluh.mysql.r18.ru>
Date: Wed, 19 Jan 2005 16:19:10 +0300
Subject: [PATCH 05/13] View field names should be case insensitive

---
 mysql-test/r/view.result | 6 ++++++
 mysql-test/t/view.test   | 7 +++++++
 sql/sql_base.cc          | 2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index c4391781e9c..239849ed8d1 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -1724,3 +1724,9 @@ a	b
 301	0
 drop view v3;
 drop tables t1,t2;
+create table t1(f1 int);
+create view v1 as select f1 from t1;
+select * from v1 where F1 = 1;
+f1
+drop view v1;
+drop table t1;
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index 77f0f65323e..ed7401adaab 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -1654,3 +1654,10 @@ select * from v3;
 
 drop view v3;
 drop tables t1,t2;
+
+# View field names should be case insensitive 
+create table t1(f1 int);
+create view v1 as select f1 from t1;
+select * from v1 where F1 = 1;
+drop view v1;
+drop table t1;
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index d854956325e..fc41643e8d4 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2120,7 +2120,7 @@ find_field_in_table(THD *thd, TABLE_LIST *table_list,
     Field_translator *trans= table_list->field_translation;
     for (uint i= 0; i < num; i ++)
     {
-      if (strcmp(trans[i].name, name) == 0)
+      if (!my_strcasecmp(system_charset_info, trans[i].name, name))
       {
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
 	if (check_grants_view &&

From 3234eb5687a811bc8ddc6d00ba98db7fdb07236e Mon Sep 17 00:00:00 2001
From: unknown <tulin@build.mysql.com>
Date: Wed, 19 Jan 2005 14:20:26 +0100
Subject: [PATCH 06/13] added configure option to set extra ndb cc-flags

---
 config/ac-macros/ha_ndbcluster.m4 | 7 ++++++-
 configure.in                      | 1 -
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4
index 433bba95e91..751a11d1895 100644
--- a/config/ac-macros/ha_ndbcluster.m4
+++ b/config/ac-macros/ha_ndbcluster.m4
@@ -61,7 +61,12 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
   --without-ndb-debug   Disable special ndb debug features],
               [ndb_debug="$withval"],
               [ndb_debug="default"])
-                                                                                
+  AC_ARG_WITH([ndb-ccflags],
+              [
+  --with-ndb-ccflags    Extra CC options for ndb compile],
+              [ndb_cxxflags_fix=$withval],
+              [ndb_cxxflags_fix=])
+
   AC_MSG_CHECKING([for NDB Cluster options])
   AC_MSG_RESULT([])
                                                                                 
diff --git a/configure.in b/configure.in
index ec1a4615fa8..e20edf97a72 100644
--- a/configure.in
+++ b/configure.in
@@ -361,7 +361,6 @@ AC_SUBST(INSTALL_SCRIPT)
 
 export CC CXX CFLAGS LD LDFLAGS AR
 
-ndb_cxxflags_fix=
 if test "$GXX" = "yes"
 then
   # mysqld requires -fno-implicit-templates.

From 58d79686650495b05abd6a5b6ae9b5be256ac73d Mon Sep 17 00:00:00 2001
From: unknown <tulin@build.mysql.com>
Date: Wed, 19 Jan 2005 14:56:40 +0100
Subject: [PATCH 07/13] removed compiler warnings

---
 ndb/src/common/util/Bitmask.cpp           | 2 +-
 ndb/src/kernel/blocks/dbdict/Dbdict.cpp   | 2 +-
 ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp  | 2 +-
 ndb/src/mgmapi/mgmapi.cpp                 | 4 ++--
 ndb/src/ndbapi/Ndb.cpp                    | 4 ++--
 ndb/src/ndbapi/NdbDictionaryImpl.cpp      | 4 +---
 ndb/src/ndbapi/TransporterFacade.cpp      | 4 ++--
 ndb/src/ndbapi/ndb_cluster_connection.cpp | 4 +++-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ndb/src/common/util/Bitmask.cpp b/ndb/src/common/util/Bitmask.cpp
index 4169434483f..0aa39a37204 100644
--- a/ndb/src/common/util/Bitmask.cpp
+++ b/ndb/src/common/util/Bitmask.cpp
@@ -5,7 +5,7 @@ static
 void print(const Uint32 src[], Uint32 len, Uint32 pos = 0)
 {
   printf("b'");
-  for(int i = 0; i<len; i++)
+  for(unsigned i = 0; i<len; i++)
   {
     if(BitmaskImpl::get((pos + len + 31) >> 5, src, i+pos))
       printf("1");
diff --git a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
index f4db8c8de7c..30b3e88bd82 100644
--- a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+++ b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
@@ -4350,7 +4350,7 @@ Dbdict::execTAB_COMMITCONF(Signal* signal){
       }
       tAttr = aRec->nextAttrInTable;
     }
-    ndbrequire(sz == 2 * tabPtr.p->noOfPrimkey);
+    ndbrequire((int)sz == 2 * tabPtr.p->noOfPrimkey);
 
     LinearSectionPtr lsPtr[3];
     lsPtr[0].p = buf;
diff --git a/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp b/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
index e9c3027dfc0..f50d3a49df6 100644
--- a/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
+++ b/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
@@ -262,7 +262,7 @@ Dbtux::readKeyAttrs(const Frag& frag, TreeEnt ent, unsigned start, Data keyData)
       debugOut << endl;
       totalSize += 1 + dataSize;
     }
-    ndbassert(totalSize == ret);
+    ndbassert((int)totalSize == ret);
   }
 #endif
 }
diff --git a/ndb/src/mgmapi/mgmapi.cpp b/ndb/src/mgmapi/mgmapi.cpp
index 9825185f88b..2730ca0665b 100644
--- a/ndb/src/mgmapi/mgmapi.cpp
+++ b/ndb/src/mgmapi/mgmapi.cpp
@@ -314,8 +314,8 @@ ndb_mgm_call(NdbMgmHandle handle, const ParserRow<ParserDummy> *command_reply,
      */
     ndbout << "Error in mgm protocol parser. "
 	   << "cmd: '" << cmd
-	   << "' status=" << ctx.m_status
-	   << ", curr=" << ctx.m_currentToken
+	   << "' status=" << (Uint32)ctx.m_status
+	   << ", curr=" << (Uint32)ctx.m_currentToken
 	   << endl;
     DBUG_PRINT("info",("parser.parse returned NULL"));
   } 
diff --git a/ndb/src/ndbapi/Ndb.cpp b/ndb/src/ndbapi/Ndb.cpp
index ba878ac4336..e7b36d6ee02 100644
--- a/ndb/src/ndbapi/Ndb.cpp
+++ b/ndb/src/ndbapi/Ndb.cpp
@@ -47,7 +47,7 @@ NdbTransaction* Ndb::doConnect(Uint32 tConNode)
 {
   Uint32        tNode;
   Uint32        tAnyAlive = 0;
-  int TretCode;
+  int TretCode= 0;
 
   if (tConNode != 0) {
     TretCode = NDB_connect(tConNode);
@@ -892,7 +892,7 @@ Ndb::opTupleIdOnNdb(Uint32 aTableId, Uint64 opValue, Uint32 op)
   DBUG_PRINT("enter", ("table=%u value=%llu op=%u", aTableId, opValue, op));
 
   NdbTransaction*     tConnection;
-  NdbOperation*      tOperation;
+  NdbOperation*      tOperation= 0; // Compiler warning if not initialized
   Uint64             tValue;
   NdbRecAttr*        tRecAttrResult;
   int                result;
diff --git a/ndb/src/ndbapi/NdbDictionaryImpl.cpp b/ndb/src/ndbapi/NdbDictionaryImpl.cpp
index 4c53ac89461..583a153fc51 100644
--- a/ndb/src/ndbapi/NdbDictionaryImpl.cpp
+++ b/ndb/src/ndbapi/NdbDictionaryImpl.cpp
@@ -1361,9 +1361,7 @@ NdbDictInterface::parseTableInfo(NdbTableImpl ** ret,
     }
 
     Uint32 topBit = (1 << 31);
-    for(i = 31; i>=0; i--){
-      if((fragCount & topBit) != 0)
-	  break;
+    for(; topBit && !(fragCount & topBit); ){
       topBit >>= 1;
     }
     impl->m_hashValueMask = topBit - 1;
diff --git a/ndb/src/ndbapi/TransporterFacade.cpp b/ndb/src/ndbapi/TransporterFacade.cpp
index b179c1fe6b9..20d98c63a67 100644
--- a/ndb/src/ndbapi/TransporterFacade.cpp
+++ b/ndb/src/ndbapi/TransporterFacade.cpp
@@ -473,12 +473,12 @@ void TransporterFacade::threadMainReceive(void)
 }
 
 TransporterFacade::TransporterFacade(NdbMgmHandle mgm_handle) :
+  m_mgm_handle(mgm_handle),
   theTransporterRegistry(0),
   theStopReceive(0),
   theSendThread(NULL),
   theReceiveThread(NULL),
-  m_fragmented_signal_id(0),
-  m_mgm_handle(mgm_handle)
+  m_fragmented_signal_id(0)
 {
   theOwnId = 0;
 
diff --git a/ndb/src/ndbapi/ndb_cluster_connection.cpp b/ndb/src/ndbapi/ndb_cluster_connection.cpp
index 2b3743e013a..0b41171e554 100644
--- a/ndb/src/ndbapi/ndb_cluster_connection.cpp
+++ b/ndb/src/ndbapi/ndb_cluster_connection.cpp
@@ -491,7 +491,9 @@ int Ndb_cluster_connection::connect(int no_retries, int retry_delay_in_seconds,
     m_impl.m_transporter_facade->start_instance(nodeId, props);
     m_impl.init_nodes_vector(nodeId, *props);
 
-    for(int i=0;i<m_impl.m_transporter_facade->get_registry()->m_transporter_interface.size();i++)
+    for(unsigned i=0;
+	i<m_impl.m_transporter_facade->get_registry()->m_transporter_interface.size();
+	i++)
       ndb_mgm_set_connection_int_parameter(m_impl.m_config_retriever->get_mgmHandle(),
 					   nodeId,
 					   m_impl.m_transporter_facade->get_registry()

From 6ed3ff49fc52f16f1996d93fe7d98318ad5b9730 Mon Sep 17 00:00:00 2001
From: unknown <tulin@build.mysql.com>
Date: Wed, 19 Jan 2005 15:03:34 +0100
Subject: [PATCH 08/13] MgmtSrvr.cpp:   corrected erroneous comparison boolean
 < 0

ndb/src/mgmsrv/MgmtSrvr.cpp:
  corrected erroneous comparison boolean < 0
---
 ndb/src/mgmsrv/MgmtSrvr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/ndb/src/mgmsrv/MgmtSrvr.cpp
index 25d7a7ad07e..6c52747e222 100644
--- a/ndb/src/mgmsrv/MgmtSrvr.cpp
+++ b/ndb/src/mgmsrv/MgmtSrvr.cpp
@@ -2809,7 +2809,7 @@ MgmtSrvr::setConnectionDbParameter(int node1,
   ConfigValues::Iterator i2(_config->m_configValues->m_config, 
 			    iter.m_config);
 
-  if(i2.set(param, (unsigned)value) < 0) {
+  if(i2.set(param, (unsigned)value) == false) {
     msg.assign("Unable to set new value of parameter");
     return -1;
   }

From 98713d6482bdd53169611ed374d1f8efcd810d95 Mon Sep 17 00:00:00 2001
From: unknown <jimw@mysql.com>
Date: Wed, 19 Jan 2005 10:24:51 -0800
Subject: [PATCH 09/13] Fix all BUILD/*max* scripts to use -DBIG_TABLES, like
 our real Max builds do. (Simpler fix than last commit -- no need to mess with
 base_cxxflags.)

BUILD/compile-amd64-max:
  use $max_cflags
BUILD/compile-pentium-debug-max:
  use $max_cflags
BUILD/compile-pentium-debug-max-no-embedded:
  use $max_cflags
BUILD/compile-pentium-max:
  use $max_cflags
BUILD/compile-pentium-valgrind-max:
  use $max_cflags
BUILD/compile-ppc-debug-max:
  use $max_cflags
BUILD/compile-ppc-max:
  use $max_cflags
BUILD/compile-amd64-debug-max:
  use $max_cflags, remove unnecessary base_cxxflags stuff
---
 BUILD/compile-amd64-debug-max               | 7 ++-----
 BUILD/compile-amd64-max                     | 8 ++------
 BUILD/compile-pentium-debug-max             | 6 ++----
 BUILD/compile-pentium-debug-max-no-embedded | 6 ++----
 BUILD/compile-pentium-max                   | 7 ++-----
 BUILD/compile-pentium-valgrind-max          | 2 +-
 BUILD/compile-ppc-debug-max                 | 6 ++----
 BUILD/compile-ppc-max                       | 4 +---
 8 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/BUILD/compile-amd64-debug-max b/BUILD/compile-amd64-debug-max
index 466bea73179..530bdba009b 100755
--- a/BUILD/compile-amd64-debug-max
+++ b/BUILD/compile-amd64-debug-max
@@ -1,12 +1,9 @@
 #! /bin/sh
 path=`dirname $0`
 . "$path/SETUP.sh"
-base_cxxflags="$amd64_cxxflags $base_cxxflags"
-extra_flags="$amd64_cflags $debug_cflags"
+extra_flags="$amd64_cflags $debug_cflags $max_cflags"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$amd64_configs $debug_configs"
-
-extra_configs="$extra_configs $max_configs"
+extra_configs="$amd64_configs $debug_configs $max_configs"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-amd64-max b/BUILD/compile-amd64-max
index 4a260859474..228448f6392 100755
--- a/BUILD/compile-amd64-max
+++ b/BUILD/compile-amd64-max
@@ -2,11 +2,7 @@
 
 path=`dirname $0`
 . "$path/SETUP.sh"
-base_cxxflags="$amd64_cxxflags $base_cxxflags"
-extra_flags="$amd64_cflags $fast_cflags -g"
-extra_configs="$amd64_configs"
-#strip=yes
-
-extra_configs="$extra_configs $max_configs"
+extra_flags="$amd64_cflags $fast_cflags $max_cflags -g"
+extra_configs="$amd64_configs $max_configs"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-debug-max b/BUILD/compile-pentium-debug-max
index 6487c094cec..420657e0b73 100755
--- a/BUILD/compile-pentium-debug-max
+++ b/BUILD/compile-pentium-debug-max
@@ -3,11 +3,9 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags $debug_cflags"
+extra_flags="$pentium_cflags $debug_cflags $max_cflags"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$pentium_configs $debug_configs"
-
-extra_configs="$extra_configs $max_configs"
+extra_configs="$pentium_configs $debug_configs $max_configs"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-debug-max-no-embedded b/BUILD/compile-pentium-debug-max-no-embedded
index f7a9d966d6d..803a6a9d6d3 100755
--- a/BUILD/compile-pentium-debug-max-no-embedded
+++ b/BUILD/compile-pentium-debug-max-no-embedded
@@ -3,11 +3,9 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags $debug_cflags"
+extra_flags="$pentium_cflags $debug_cflags $max_cflags"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$pentium_configs $debug_configs"
-
-extra_configs="$extra_configs $max_no_es_configs"
+extra_configs="$pentium_configs $debug_configs $max_no_es_configs"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-max b/BUILD/compile-pentium-max
index de37f28582b..595581f604e 100755
--- a/BUILD/compile-pentium-max
+++ b/BUILD/compile-pentium-max
@@ -3,10 +3,7 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags $fast_cflags -g"
-extra_configs="$pentium_configs"
-#strip=yes
-
-extra_configs="$extra_configs $max_configs"
+extra_flags="$pentium_cflags $fast_cflags $max_cflags -g"
+extra_configs="$pentium_configs $max_configs"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-valgrind-max b/BUILD/compile-pentium-valgrind-max
index 322b0735488..f0dc92c2ffd 100755
--- a/BUILD/compile-pentium-valgrind-max
+++ b/BUILD/compile-pentium-valgrind-max
@@ -3,7 +3,7 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags $debug_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"
+extra_flags="$pentium_cflags $debug_cflags $max_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
 extra_configs="$pentium_configs $debug_configs"
diff --git a/BUILD/compile-ppc-debug-max b/BUILD/compile-ppc-debug-max
index 004e821d722..49d1442fd45 100755
--- a/BUILD/compile-ppc-debug-max
+++ b/BUILD/compile-ppc-debug-max
@@ -3,11 +3,9 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$ppc_cflags $debug_cflags"
+extra_flags="$ppc_cflags $debug_cflags $max_cflags"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$debug_configs"
-
-extra_configs="$extra_configs $max_configs"
+extra_configs="$debug_configs $max_configs"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-ppc-max b/BUILD/compile-ppc-max
index 632db7216e4..1d89be81c9c 100755
--- a/BUILD/compile-ppc-max
+++ b/BUILD/compile-ppc-max
@@ -3,9 +3,7 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$ppc_cflags $fast_cflags -g"
-#strip=yes
-
+extra_flags="$ppc_cflags $fast_cflags $max_cflags -g"
 extra_configs="$extra_configs $max_configs"
 
 . "$path/FINISH.sh"

From 8db5237bba1a16e3333260b11267988f2bf545fd Mon Sep 17 00:00:00 2001
From: unknown <jimw@mysql.com>
Date: Wed, 19 Jan 2005 10:40:39 -0800
Subject: [PATCH 10/13] Build federated storage engine as part of max builds.

BUILD/SETUP.sh:
  Add --with-federated-storage-engine to max_configs
---
 BUILD/SETUP.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index 5fe898878b9..fa20fd14571 100644
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -44,7 +44,7 @@ c_warnings="$global_warnings -Wunused"
 cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
 
 base_max_configs="--with-innodb --with-bdb --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio"
-max_leave_isam_configs="--with-innodb --with-bdb --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio --with-embedded-server"
+max_leave_isam_configs="--with-innodb --with-bdb --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-raid --with-openssl --with-raid --with-vio --with-embedded-server"
 max_no_es_configs="$max_leave_isam_configs --without-isam"
 max_configs="$max_no_es_configs --with-embedded-server"
 

From 41e6f84d8a3b8a524e765fca9d387e149a9a4d72 Mon Sep 17 00:00:00 2001
From: unknown <bar@mysql.com>
Date: Thu, 20 Jan 2005 12:37:02 +0400
Subject: [PATCH 11/13] errmsg.txt:   new file

---
 sql/share/japanese-sjis/errmsg.txt | 325 +++++++++++++++++++++++++++++
 1 file changed, 325 insertions(+)
 create mode 100644 sql/share/japanese-sjis/errmsg.txt

diff --git a/sql/share/japanese-sjis/errmsg.txt b/sql/share/japanese-sjis/errmsg.txt
new file mode 100644
index 00000000000..66284b22367
--- /dev/null
+++ b/sql/share/japanese-sjis/errmsg.txt
@@ -0,0 +1,325 @@
+/* Copyright (C) 2003 MySQL AB
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+/*
+   3.22.10-beta   euc-japanese (ujis) text
+*/
+
+character-set=ujis
+
+"hashchk",
+"isamchk",
+"NO",
+"YES",
+"'%-.64s' ファイルが作れません (errno: %d)",
+"'%-.64s' テーブルが作れません.(errno: %d)",
+"'%-.64s' データベースが作れません (errno: %d)",
+"'%-.64s' データベースが作れません.既にそのデータベースが存在します",
+"'%-.64s' データベースを破棄できません. そのデータベースがないのです.",
+"データベース破棄エラー ('%-.64s' を削除できません, errno: %d)",
+"データベース破棄エラー ('%-.64s' を rmdir できません, errno: %d)",
+"'%-.64s' の削除がエラー (errno: %d)",
+"system table のレコードを読む事ができませんでした",
+"'%-.64s' のステイタスが得られません. (errno: %d)",
+"working directory を得る事ができませんでした (errno: %d)",
+"ファイルをロックできません (errno: %d)",
+"'%-.64s' ファイルを開く事ができません (errno: %d)",
+"'%-.64s' ファイルを見付ける事ができません.(errno: %d)",
+"'%-.64s' ディレクトリが読めません.(errno: %d)",
+"'%-.64s' ディレクトリに chdir できません.(errno: %d)",
+"Record has changed since last read in table '%-.64s'",
+"Disk full (%s). 誰かが何かを減らすまでまってください...",
+"table '%-.64s' に key が重複していて書きこめません",
+"Error on close of '%-.64s' (errno: %d)",
+"'%-.64s' ファイルの読み込みエラー (errno: %d)",
+"'%-.64s' を '%-.64s' に rename できません (errno: %d)",
+"'%-.64s' ファイルを書く事ができません (errno: %d)",
+"'%-.64s' はロックされています",
+"Sort 中断",
+"View '%-.64s' が '%-.64s' に定義されていません",
+"Got error %d from table handler",
+"Table handler for '%-.64s' doesn't have this option",
+"'%-.64s'のなかにレコードが見付かりません",
+"ファイル '%-.64s' の info が間違っているようです",
+"'%-.64s' テーブルの key file が間違っているようです. 修復をしてください",
+"'%-.64s' テーブルは古い形式の key file のようです; 修復をしてください",
+"'%-.64s' は読み込み専用です",
+"Out of memory. デーモンをリスタートしてみてください (%d bytes 必要)",
+"Out of sort memory. sort buffer size が足りないようです.",
+"'%-.64s' ファイルを読み込み中に EOF が予期せぬ所で現れました. (errno: %d)",
+"接続が多すぎます",
+"Out of memory;  mysqld かその他のプロセスがメモリーを全て使っているか確認してください. メモリーを使い切っていない場合、'ulimit' を設定して mysqld のメモリー使用限界量を多くするか、swap space を増やしてみてください",
+"その address の hostname が引けません.",
+"Bad handshake",
+"ユーザー '%-.32s'@'%-.64s' の '%-.64s' データベースへのアクセスを拒否します",
+"ユーザー '%-.32s'@'%-.64s' を拒否します.uUsing password: %s)",
+"データベースが選択されていません.",
+"そのコマンドは何？",
+"Column '%-.64s' は null にはできないのです",
+"'%-.64s' なんてデータベースは知りません.",
+"Table '%-.64s' は既にあります",
+"table '%-.64s' はありません.",
+"Column: '%-.64s' in %-.64s is ambiguous",
+"Server を shutdown 中...",
+"'%-.64s' column は '%-.64s' にはありません.",
+"'%-.64s' isn't in GROUP BY",
+"Can't group on '%-.64s'",
+"Statement has sum functions and columns in same statement",
+"Column count doesn't match value count",
+"Identifier name '%-.100s' は長すぎます",
+"'%-.64s' という column 名は重複してます",
+"'%-.64s' という key の名前は重複しています",
+"'%-.64s' は key %d において重複しています",
+"Incorrect column specifier for column '%-.64s'",
+"%s  : '%-.80s' 付近  : %d 行目",
+"Query が空です.",
+"'%-.64s' は一意の table/alias 名ではありません",
+"Invalid default value for '%-.64s'",
+"複数の primary key が定義されました",
+"key の指定が多すぎます.  key は最大 %d までです",
+"Too many key parts specified; max %d parts allowed",
+"key が長すぎます. key の長さは最大 %d です",
+"Key column '%-.64s' がテーブルにありません.",
+"BLOB column '%-.64s' can't be used in key specification with the used table type",
+"column '%-.64s' は,確保する column の大きさが多すぎます. (最大 %d まで). BLOB をかわりに使用してください.",
+"テーブルの定義が違います; there can be only one auto column and it must be defined as a key",
+"%s: 準備完了",
+"%s: Normal shutdown\n",
+"%s: Got signal %d. 中断!\n",
+"%s: Shutdown 完了\n",
+"%s: スレッド %ld 強制終了  user: '%-.64s'\n",
+"IP socket が作れません",
+"Table '%-.64s' はそのような index を持っていません(CREATE INDEX 実行時に指定されていません). テーブルを作り直してください",
+"Field separator argument is not what is expected; check the manual",
+"You can't use fixed rowlength with BLOBs; please use 'fields terminated by'.",
+"ファイル '%-.64s' は databse の directory にあるか全てのユーザーが読めるように許可されていなければなりません.",
+"File '%-.64s' は既に存在します",
+"レコード数: %ld  削除: %ld  Skipped: %ld  Warnings: %ld",
+"レコード数: %ld  重複: %ld",
+"Incorrect sub part key; the used key part isn't a string or the used length is longer than the key part",
+"ALTER TABLE で全ての column は削除できません. DROP TABLE を使用してください",
+"'%-.64s' を破棄できませんでした; check that column/key exists",
+"レコード数: %ld  重複数: %ld  Warnings: %ld",
+"You can't specify target table '%-.64s' for update in FROM clause",
+"thread id: %lu はありません",
+"thread %lu のオーナーではありません",
+"No tables used",
+"Too many strings for column %-.64s and SET",
+"Can't generate a unique log-filename %-.64s.(1-999)\n",
+"Table '%-.64s' は READ lock になっていて、更新はできません",
+"Table '%-.64s' は LOCK TABLES によってロックされていません",
+"BLOB column '%-.64s' can't have a default value",
+"指定した database 名 '%-.100s' が間違っています",
+"指定した table 名 '%-.100s' はまちがっています",
+"The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is okay",
+"Unknown error",
+"Unknown procedure '%-.64s'",
+"Incorrect parameter count to procedure '%-.64s'",
+"Incorrect parameters to procedure '%-.64s'",
+"Unknown table '%-.64s' in %s",
+"Column '%-.64s' specified twice",
+"Invalid use of group function",
+"Table '%-.64s' uses an extension that doesn't exist in this MySQL version",
+"テーブルは最低 1 個の column が必要です",
+"table '%-.64s' はいっぱいです",
+"character set '%-.64s' はサポートしていません",
+"テーブルが多すぎます; MySQL can only use %d tables in a join",
+"column が多すぎます",
+"row size が大きすぎます. BLOB を含まない場合の row size の最大は %d です. いくつかの field を BLOB に変えてください.",
+"Thread stack overrun:  Used: %ld of a %ld stack.  スタック領域を多くとりたい場合、'mysqld -O thread_stack=#' と指定してください",
+"Cross dependency found in OUTER JOIN; examine your ON conditions",
+"Column '%-.64s' が UNIQUE か INDEX で使用されました. このカラムは NOT NULL と定義されていません.",
+"function '%-.64s' を ロードできません",
+"function '%-.64s' を初期化できません; %-.80s",
+"shared library へのパスが通っていません",
+"Function '%-.64s' は既に定義されています",
+"shared library '%-.64s' を開く事ができません (errno: %d %s)",
+"function '%-.64s' をライブラリー中に見付ける事ができません",
+"Function '%-.64s' は定義されていません",
+"Host '%-.64s' は many connection error のため、拒否されました.  'mysqladmin flush-hosts' で解除してください",
+"Host '%-.64s' は MySQL server に接続を許可されていません",
+"MySQL を anonymous users で使用している状態では、パスワードの変更はできません",
+"他のユーザーのパスワードを変更するためには, mysql データベースに対して update の許可がなければなりません.",
+"Can't find any matching row in the user table",
+"一致数(Rows matched): %ld  変更: %ld  Warnings: %ld",
+"新規にスレッドが作れませんでした (errno %d). もし最大使用許可メモリー数を越えていないのにエラーが発生しているなら, マニュアルの中から 'possible OS-dependent bug' という文字を探してくみてださい.",
+"Column count doesn't match value count at row %ld",
+"Can't reopen table: '%-.64s'",
+"NULL 値の使用方法が不適切です",
+"Got error '%-.64s' from regexp",
+"Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause",
+"ユーザー '%-.32s' (ホスト '%-.64s' のユーザー) は許可されていません",
+"コマンド %-.16s は ユーザー '%-.32s'@'%-.64s' ,テーブル '%-.64s' に対して許可されていません",
+"コマンド %-.16s は ユーザー '%-.32s'@'%-.64s'\n カラム '%-.64s' テーブル '%-.64s' に対して許可されていません",
+"Illegal GRANT/REVOKE command; please consult the manual to see which privleges can be used.",
+"The host or user argument to GRANT is too long",
+"Table '%-.64s.%s' doesn't exist",
+"There is no such grant defined for user '%-.32s' on host '%-.64s' on table '%-.64s'",
+"The used command is not allowed with this MySQL version",
+"Something is wrong in your syntax",
+"Delayed insert thread couldn't get requested lock for table %-.64s",
+"Too many delayed threads in use",
+"Aborted connection %ld to db: '%-.64s' user: '%-.64s' (%s)",
+"Got a packet bigger than 'max_allowed_packet' bytes",
+"Got a read error from the connection pipe",
+"Got an error from fcntl()",
+"Got packets out of order",
+"Couldn't uncompress communication packet",
+"Got an error reading communication packets",
+"Got timeout reading communication packets",
+"Got an error writing communication packets",
+"Got timeout writing communication packets",
+"Result string is longer than 'max_allowed_packet' bytes",
+"The used table type doesn't support BLOB/TEXT columns",
+"The used table type doesn't support AUTO_INCREMENT columns",
+"INSERT DELAYED can't be used with table '%-.64s', because it is locked with LOCK TABLES",
+"Incorrect column name '%-.100s'",
+"The used table handler can't index column '%-.64s'",
+"All tables in the MERGE table are not defined identically",
+"Can't write, because of unique constraint, to table '%-.64s'",
+"BLOB column '%-.64s' used in key specification without a key length",
+"All parts of a PRIMARY KEY must be NOT NULL; if you need NULL in a key, use UNIQUE instead",
+"Result consisted of more than one row",
+"This table type requires a primary key",
+"This version of MySQL is not compiled with RAID support",
+"You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column",
+"Key '%-.64s' doesn't exist in table '%-.64s'",
+"Can't open table",
+"The handler for the table doesn't support %s",
+"You are not allowed to execute this command in a transaction",
+"Got error %d during COMMIT",
+"Got error %d during ROLLBACK",
+"Got error %d during FLUSH_LOGS",
+"Got error %d during CHECKPOINT",
+"Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s)",
+"The handler for the table does not support binary table dump",
+"Binlog closed while trying to FLUSH MASTER",
+"Failed rebuilding the index of dumped table '%-.64s'",
+"Error from master: '%-.64s'",
+"Net error reading from master",
+"Net error writing to master",
+"Can't find FULLTEXT index matching the column list",
+"Can't execute the given command because you have active locked tables or an active transaction",
+"Unknown system variable '%-.64s'",
+"Table '%-.64s' is marked as crashed and should be repaired",
+"Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
+"Some non-transactional changed tables couldn't be rolled back",
+"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage; increase this mysqld variable and try again",
+"This operation cannot be performed with a running slave; run STOP SLAVE first",
+"This operation requires a running slave; configure slave and do START SLAVE",
+"The server is not configured as slave; fix in config file or with CHANGE MASTER TO",
+"Could not initialize master info structure; more error messages can be found in the MySQL error log",
+"Could not create slave thread; check system resources",
+"User %-.64s has already more than 'max_user_connections' active connections",
+"You may only use constant expressions with SET",
+"Lock wait timeout exceeded; try restarting transaction",
+"The total number of locks exceeds the lock table size",
+"Update locks cannot be acquired during a READ UNCOMMITTED transaction",
+"DROP DATABASE not allowed while thread is holding global read lock",
+"CREATE DATABASE not allowed while thread is holding global read lock",
+"Incorrect arguments to %s",
+"'%-.32s'@'%-.64s' is not allowed to create new users",
+"Incorrect table definition; all MERGE tables must be in the same database",
+"Deadlock found when trying to get lock; try restarting transaction",
+"The used table type doesn't support FULLTEXT indexes",
+"Cannot add foreign key constraint",
+"Cannot add a child row: a foreign key constraint fails",
+"Cannot delete a parent row: a foreign key constraint fails",
+"Error connecting to master: %-.128s",
+"Error running query on master: %-.128s",
+"Error when executing command %s: %-.128s",
+"Incorrect usage of %s and %s",
+"The used SELECT statements have a different number of columns",
+"Can't execute the query because you have a conflicting read lock",
+"Mixing of transactional and non-transactional tables is disabled",
+"Option '%s' used twice in statement",
+"User '%-.64s' has exceeded the '%s' resource (current value: %ld)",
+"Access denied; you need the %-.128s privilege for this operation",
+"Variable '%-.64s' is a SESSION variable and can't be used with SET GLOBAL",
+"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL",
+"Variable '%-.64s' doesn't have a default value",
+"Variable '%-.64s' can't be set to the value of '%-.64s'",
+"Incorrect argument type to variable '%-.64s'",
+"Variable '%-.64s' can only be set, not read",
+"Incorrect usage/placement of '%s'",
+"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",
+"Incorrect foreign key definition for '%-.64s': %s",
+"Key reference and table reference don't match",
+"Operand should contain %d column(s)",
+"Subquery returns more than 1 row",
+"Unknown prepared statement handler (%.*s) given to %s",
+"Help database is corrupt or does not exist",
+"Cyclic reference on subqueries",
+"Converting column '%s' from %s to %s",
+"Reference '%-.64s' not supported (%s)",
+"Every derived table must have its own alias",
+"Select %u was reduced during optimization",
+"Table '%-.64s' from one of the SELECTs cannot be used in %-.32s",
+"Client does not support authentication protocol requested by server; consider upgrading MySQL client",
+"All parts of a SPATIAL index must be NOT NULL",
+"COLLATION '%s' is not valid for CHARACTER SET '%s'",
+"Slave is already running",
+"Slave has already been stopped",
+"Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)",
+"ZLIB: Not enough memory",
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
+"ZLIB: Input data corrupted",
+"%d line(s) were cut by GROUP_CONCAT()",
+"Row %ld doesn't contain data for all columns",
+"Row %ld was truncated; it contained more data than there were input columns",
+"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated; out of range for column '%s' at row %ld",
+"Data truncated for column '%s' at row %ld",
+"Using storage engine %s for table '%s'",
+"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
+"Can't drop one or more of the requested users",
+"Can't revoke all privileges, grant for one or more of the requested users",
+"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
+"Illegal mix of collations for operation '%s'",
+"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
+"Unknown collation: '%-.64s'",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
+"Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
+"Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",
+"Incorrect parameter or combination of parameters for START SLAVE UNTIL",
+"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL; otherwise, you are not safe in case of unexpected slave's mysqld restart",
+"SQL thread is not to be started so UNTIL options are ignored",
+"Incorrect index name '%-.100s'",
+"Incorrect catalog name '%-.100s'",
+"Query cache failed to set size %lu, new query cache size is %lu",
+"Column '%-.64s' cannot be part of FULLTEXT index",
+"Unknown key cache '%-.100s'",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
+"Unknown table engine '%s'",
+"'%s' is deprecated, use '%s' instead",
+"The target table %-.100s of the %s is not updateable",
+"The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
+"The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"
+"Truncated wrong %-.32s value: '%-.128s'"
+"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+"Invalid ON UPDATE clause for '%-.64s' column",
+"This command is not supported in the prepared statement protocol yet",
+"Got NDB error %d '%-.100s'",
+"Got temporary NDB error %d '%-.100s'",
+"Unknown or incorrect time zone: '%-.64s'",
+"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
+"Conflicting declarations: '%s%s' and '%s%s'"

From 026bf61e9912d3165fe0592c44ae0128126b1b92 Mon Sep 17 00:00:00 2001
From: unknown <bar@mysql.com>
Date: Thu, 20 Jan 2005 12:39:46 +0400
Subject: [PATCH 12/13] configure.in:   Add SJIS version of Japanese error
 messages.   Windows version should include this new file,   instead of the
 EUC-JP version.

configure.in:
  Add SJIS version of Japanese error messages.
  Windows version should include this new file,
  instead of the EUC-JP version.
---
 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 2d20a71f838..cc845a7bb8d 100644
--- a/configure.in
+++ b/configure.in
@@ -32,7 +32,7 @@ MYSQL_UNIX_ADDR_DEFAULT="/tmp/mysql.sock"
 # Remember to add a directory sql/share/LANGUAGE
 AVAILABLE_LANGUAGES="\
 czech danish dutch english estonian french german greek hungarian \
-italian japanese korean norwegian norwegian-ny polish portuguese \
+italian japanese japanese-sjis korean norwegian norwegian-ny polish portuguese \
 romanian russian serbian slovak spanish swedish ukrainian"
 
 # Generate make rules for all error messages

From 0df88dd6da15bd82d0ca1234e32dddba13dde15b Mon Sep 17 00:00:00 2001
From: unknown <bar@mysql.com>
Date: Thu, 20 Jan 2005 12:44:33 +0400
Subject: [PATCH 13/13] configure.in:   Auto-merge fix:   removing this file:
 error messages are done   in a different way in 5.0.
 .del-errmsg.txt~31abf77f9e7b9211:   Delete:
 sql/share/japanese-sjis/errmsg.txt

BitKeeper/deleted/.del-errmsg.txt~31abf77f9e7b9211:
  Delete: sql/share/japanese-sjis/errmsg.txt
configure.in:
  Auto-merge fix:
  removing this file: error messages are done
  in a different way in 5.0.
---
 configure.in                       |   2 +-
 sql/share/japanese-sjis/errmsg.txt | 325 -----------------------------
 2 files changed, 1 insertion(+), 326 deletions(-)
 delete mode 100644 sql/share/japanese-sjis/errmsg.txt

diff --git a/configure.in b/configure.in
index ba274d79b91..e20edf97a72 100644
--- a/configure.in
+++ b/configure.in
@@ -53,7 +53,7 @@ sinclude(config/ac-macros/zlib.m4)
 # Remember to add a directory sql/share/LANGUAGE
 AVAILABLE_LANGUAGES="\
 czech danish dutch english estonian french german greek hungarian \
-italian japanese japanese-sjis korean norwegian norwegian-ny polish portuguese \
+italian japanese korean norwegian norwegian-ny polish portuguese \
 romanian russian serbian slovak spanish swedish ukrainian"
 
 
diff --git a/sql/share/japanese-sjis/errmsg.txt b/sql/share/japanese-sjis/errmsg.txt
deleted file mode 100644
index 66284b22367..00000000000
--- a/sql/share/japanese-sjis/errmsg.txt
+++ /dev/null
@@ -1,325 +0,0 @@
-/* Copyright (C) 2003 MySQL AB
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/*
-   3.22.10-beta   euc-japanese (ujis) text
-*/
-
-character-set=ujis
-
-"hashchk",
-"isamchk",
-"NO",
-"YES",
-"'%-.64s' ファイルが作れません (errno: %d)",
-"'%-.64s' テーブルが作れません.(errno: %d)",
-"'%-.64s' データベースが作れません (errno: %d)",
-"'%-.64s' データベースが作れません.既にそのデータベースが存在します",
-"'%-.64s' データベースを破棄できません. そのデータベースがないのです.",
-"データベース破棄エラー ('%-.64s' を削除できません, errno: %d)",
-"データベース破棄エラー ('%-.64s' を rmdir できません, errno: %d)",
-"'%-.64s' の削除がエラー (errno: %d)",
-"system table のレコードを読む事ができませんでした",
-"'%-.64s' のステイタスが得られません. (errno: %d)",
-"working directory を得る事ができませんでした (errno: %d)",
-"ファイルをロックできません (errno: %d)",
-"'%-.64s' ファイルを開く事ができません (errno: %d)",
-"'%-.64s' ファイルを見付ける事ができません.(errno: %d)",
-"'%-.64s' ディレクトリが読めません.(errno: %d)",
-"'%-.64s' ディレクトリに chdir できません.(errno: %d)",
-"Record has changed since last read in table '%-.64s'",
-"Disk full (%s). 誰かが何かを減らすまでまってください...",
-"table '%-.64s' に key が重複していて書きこめません",
-"Error on close of '%-.64s' (errno: %d)",
-"'%-.64s' ファイルの読み込みエラー (errno: %d)",
-"'%-.64s' を '%-.64s' に rename できません (errno: %d)",
-"'%-.64s' ファイルを書く事ができません (errno: %d)",
-"'%-.64s' はロックされています",
-"Sort 中断",
-"View '%-.64s' が '%-.64s' に定義されていません",
-"Got error %d from table handler",
-"Table handler for '%-.64s' doesn't have this option",
-"'%-.64s'のなかにレコードが見付かりません",
-"ファイル '%-.64s' の info が間違っているようです",
-"'%-.64s' テーブルの key file が間違っているようです. 修復をしてください",
-"'%-.64s' テーブルは古い形式の key file のようです; 修復をしてください",
-"'%-.64s' は読み込み専用です",
-"Out of memory. デーモンをリスタートしてみてください (%d bytes 必要)",
-"Out of sort memory. sort buffer size が足りないようです.",
-"'%-.64s' ファイルを読み込み中に EOF が予期せぬ所で現れました. (errno: %d)",
-"接続が多すぎます",
-"Out of memory;  mysqld かその他のプロセスがメモリーを全て使っているか確認してください. メモリーを使い切っていない場合、'ulimit' を設定して mysqld のメモリー使用限界量を多くするか、swap space を増やしてみてください",
-"その address の hostname が引けません.",
-"Bad handshake",
-"ユーザー '%-.32s'@'%-.64s' の '%-.64s' データベースへのアクセスを拒否します",
-"ユーザー '%-.32s'@'%-.64s' を拒否します.uUsing password: %s)",
-"データベースが選択されていません.",
-"そのコマンドは何？",
-"Column '%-.64s' は null にはできないのです",
-"'%-.64s' なんてデータベースは知りません.",
-"Table '%-.64s' は既にあります",
-"table '%-.64s' はありません.",
-"Column: '%-.64s' in %-.64s is ambiguous",
-"Server を shutdown 中...",
-"'%-.64s' column は '%-.64s' にはありません.",
-"'%-.64s' isn't in GROUP BY",
-"Can't group on '%-.64s'",
-"Statement has sum functions and columns in same statement",
-"Column count doesn't match value count",
-"Identifier name '%-.100s' は長すぎます",
-"'%-.64s' という column 名は重複してます",
-"'%-.64s' という key の名前は重複しています",
-"'%-.64s' は key %d において重複しています",
-"Incorrect column specifier for column '%-.64s'",
-"%s  : '%-.80s' 付近  : %d 行目",
-"Query が空です.",
-"'%-.64s' は一意の table/alias 名ではありません",
-"Invalid default value for '%-.64s'",
-"複数の primary key が定義されました",
-"key の指定が多すぎます.  key は最大 %d までです",
-"Too many key parts specified; max %d parts allowed",
-"key が長すぎます. key の長さは最大 %d です",
-"Key column '%-.64s' がテーブルにありません.",
-"BLOB column '%-.64s' can't be used in key specification with the used table type",
-"column '%-.64s' は,確保する column の大きさが多すぎます. (最大 %d まで). BLOB をかわりに使用してください.",
-"テーブルの定義が違います; there can be only one auto column and it must be defined as a key",
-"%s: 準備完了",
-"%s: Normal shutdown\n",
-"%s: Got signal %d. 中断!\n",
-"%s: Shutdown 完了\n",
-"%s: スレッド %ld 強制終了  user: '%-.64s'\n",
-"IP socket が作れません",
-"Table '%-.64s' はそのような index を持っていません(CREATE INDEX 実行時に指定されていません). テーブルを作り直してください",
-"Field separator argument is not what is expected; check the manual",
-"You can't use fixed rowlength with BLOBs; please use 'fields terminated by'.",
-"ファイル '%-.64s' は databse の directory にあるか全てのユーザーが読めるように許可されていなければなりません.",
-"File '%-.64s' は既に存在します",
-"レコード数: %ld  削除: %ld  Skipped: %ld  Warnings: %ld",
-"レコード数: %ld  重複: %ld",
-"Incorrect sub part key; the used key part isn't a string or the used length is longer than the key part",
-"ALTER TABLE で全ての column は削除できません. DROP TABLE を使用してください",
-"'%-.64s' を破棄できませんでした; check that column/key exists",
-"レコード数: %ld  重複数: %ld  Warnings: %ld",
-"You can't specify target table '%-.64s' for update in FROM clause",
-"thread id: %lu はありません",
-"thread %lu のオーナーではありません",
-"No tables used",
-"Too many strings for column %-.64s and SET",
-"Can't generate a unique log-filename %-.64s.(1-999)\n",
-"Table '%-.64s' は READ lock になっていて、更新はできません",
-"Table '%-.64s' は LOCK TABLES によってロックされていません",
-"BLOB column '%-.64s' can't have a default value",
-"指定した database 名 '%-.100s' が間違っています",
-"指定した table 名 '%-.100s' はまちがっています",
-"The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is okay",
-"Unknown error",
-"Unknown procedure '%-.64s'",
-"Incorrect parameter count to procedure '%-.64s'",
-"Incorrect parameters to procedure '%-.64s'",
-"Unknown table '%-.64s' in %s",
-"Column '%-.64s' specified twice",
-"Invalid use of group function",
-"Table '%-.64s' uses an extension that doesn't exist in this MySQL version",
-"テーブルは最低 1 個の column が必要です",
-"table '%-.64s' はいっぱいです",
-"character set '%-.64s' はサポートしていません",
-"テーブルが多すぎます; MySQL can only use %d tables in a join",
-"column が多すぎます",
-"row size が大きすぎます. BLOB を含まない場合の row size の最大は %d です. いくつかの field を BLOB に変えてください.",
-"Thread stack overrun:  Used: %ld of a %ld stack.  スタック領域を多くとりたい場合、'mysqld -O thread_stack=#' と指定してください",
-"Cross dependency found in OUTER JOIN; examine your ON conditions",
-"Column '%-.64s' が UNIQUE か INDEX で使用されました. このカラムは NOT NULL と定義されていません.",
-"function '%-.64s' を ロードできません",
-"function '%-.64s' を初期化できません; %-.80s",
-"shared library へのパスが通っていません",
-"Function '%-.64s' は既に定義されています",
-"shared library '%-.64s' を開く事ができません (errno: %d %s)",
-"function '%-.64s' をライブラリー中に見付ける事ができません",
-"Function '%-.64s' は定義されていません",
-"Host '%-.64s' は many connection error のため、拒否されました.  'mysqladmin flush-hosts' で解除してください",
-"Host '%-.64s' は MySQL server に接続を許可されていません",
-"MySQL を anonymous users で使用している状態では、パスワードの変更はできません",
-"他のユーザーのパスワードを変更するためには, mysql データベースに対して update の許可がなければなりません.",
-"Can't find any matching row in the user table",
-"一致数(Rows matched): %ld  変更: %ld  Warnings: %ld",
-"新規にスレッドが作れませんでした (errno %d). もし最大使用許可メモリー数を越えていないのにエラーが発生しているなら, マニュアルの中から 'possible OS-dependent bug' という文字を探してくみてださい.",
-"Column count doesn't match value count at row %ld",
-"Can't reopen table: '%-.64s'",
-"NULL 値の使用方法が不適切です",
-"Got error '%-.64s' from regexp",
-"Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause",
-"ユーザー '%-.32s' (ホスト '%-.64s' のユーザー) は許可されていません",
-"コマンド %-.16s は ユーザー '%-.32s'@'%-.64s' ,テーブル '%-.64s' に対して許可されていません",
-"コマンド %-.16s は ユーザー '%-.32s'@'%-.64s'\n カラム '%-.64s' テーブル '%-.64s' に対して許可されていません",
-"Illegal GRANT/REVOKE command; please consult the manual to see which privleges can be used.",
-"The host or user argument to GRANT is too long",
-"Table '%-.64s.%s' doesn't exist",
-"There is no such grant defined for user '%-.32s' on host '%-.64s' on table '%-.64s'",
-"The used command is not allowed with this MySQL version",
-"Something is wrong in your syntax",
-"Delayed insert thread couldn't get requested lock for table %-.64s",
-"Too many delayed threads in use",
-"Aborted connection %ld to db: '%-.64s' user: '%-.64s' (%s)",
-"Got a packet bigger than 'max_allowed_packet' bytes",
-"Got a read error from the connection pipe",
-"Got an error from fcntl()",
-"Got packets out of order",
-"Couldn't uncompress communication packet",
-"Got an error reading communication packets",
-"Got timeout reading communication packets",
-"Got an error writing communication packets",
-"Got timeout writing communication packets",
-"Result string is longer than 'max_allowed_packet' bytes",
-"The used table type doesn't support BLOB/TEXT columns",
-"The used table type doesn't support AUTO_INCREMENT columns",
-"INSERT DELAYED can't be used with table '%-.64s', because it is locked with LOCK TABLES",
-"Incorrect column name '%-.100s'",
-"The used table handler can't index column '%-.64s'",
-"All tables in the MERGE table are not defined identically",
-"Can't write, because of unique constraint, to table '%-.64s'",
-"BLOB column '%-.64s' used in key specification without a key length",
-"All parts of a PRIMARY KEY must be NOT NULL; if you need NULL in a key, use UNIQUE instead",
-"Result consisted of more than one row",
-"This table type requires a primary key",
-"This version of MySQL is not compiled with RAID support",
-"You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column",
-"Key '%-.64s' doesn't exist in table '%-.64s'",
-"Can't open table",
-"The handler for the table doesn't support %s",
-"You are not allowed to execute this command in a transaction",
-"Got error %d during COMMIT",
-"Got error %d during ROLLBACK",
-"Got error %d during FLUSH_LOGS",
-"Got error %d during CHECKPOINT",
-"Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s)",
-"The handler for the table does not support binary table dump",
-"Binlog closed while trying to FLUSH MASTER",
-"Failed rebuilding the index of dumped table '%-.64s'",
-"Error from master: '%-.64s'",
-"Net error reading from master",
-"Net error writing to master",
-"Can't find FULLTEXT index matching the column list",
-"Can't execute the given command because you have active locked tables or an active transaction",
-"Unknown system variable '%-.64s'",
-"Table '%-.64s' is marked as crashed and should be repaired",
-"Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
-"Some non-transactional changed tables couldn't be rolled back",
-"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage; increase this mysqld variable and try again",
-"This operation cannot be performed with a running slave; run STOP SLAVE first",
-"This operation requires a running slave; configure slave and do START SLAVE",
-"The server is not configured as slave; fix in config file or with CHANGE MASTER TO",
-"Could not initialize master info structure; more error messages can be found in the MySQL error log",
-"Could not create slave thread; check system resources",
-"User %-.64s has already more than 'max_user_connections' active connections",
-"You may only use constant expressions with SET",
-"Lock wait timeout exceeded; try restarting transaction",
-"The total number of locks exceeds the lock table size",
-"Update locks cannot be acquired during a READ UNCOMMITTED transaction",
-"DROP DATABASE not allowed while thread is holding global read lock",
-"CREATE DATABASE not allowed while thread is holding global read lock",
-"Incorrect arguments to %s",
-"'%-.32s'@'%-.64s' is not allowed to create new users",
-"Incorrect table definition; all MERGE tables must be in the same database",
-"Deadlock found when trying to get lock; try restarting transaction",
-"The used table type doesn't support FULLTEXT indexes",
-"Cannot add foreign key constraint",
-"Cannot add a child row: a foreign key constraint fails",
-"Cannot delete a parent row: a foreign key constraint fails",
-"Error connecting to master: %-.128s",
-"Error running query on master: %-.128s",
-"Error when executing command %s: %-.128s",
-"Incorrect usage of %s and %s",
-"The used SELECT statements have a different number of columns",
-"Can't execute the query because you have a conflicting read lock",
-"Mixing of transactional and non-transactional tables is disabled",
-"Option '%s' used twice in statement",
-"User '%-.64s' has exceeded the '%s' resource (current value: %ld)",
-"Access denied; you need the %-.128s privilege for this operation",
-"Variable '%-.64s' is a SESSION variable and can't be used with SET GLOBAL",
-"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL",
-"Variable '%-.64s' doesn't have a default value",
-"Variable '%-.64s' can't be set to the value of '%-.64s'",
-"Incorrect argument type to variable '%-.64s'",
-"Variable '%-.64s' can only be set, not read",
-"Incorrect usage/placement of '%s'",
-"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",
-"Incorrect foreign key definition for '%-.64s': %s",
-"Key reference and table reference don't match",
-"Operand should contain %d column(s)",
-"Subquery returns more than 1 row",
-"Unknown prepared statement handler (%.*s) given to %s",
-"Help database is corrupt or does not exist",
-"Cyclic reference on subqueries",
-"Converting column '%s' from %s to %s",
-"Reference '%-.64s' not supported (%s)",
-"Every derived table must have its own alias",
-"Select %u was reduced during optimization",
-"Table '%-.64s' from one of the SELECTs cannot be used in %-.32s",
-"Client does not support authentication protocol requested by server; consider upgrading MySQL client",
-"All parts of a SPATIAL index must be NOT NULL",
-"COLLATION '%s' is not valid for CHARACTER SET '%s'",
-"Slave is already running",
-"Slave has already been stopped",
-"Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)",
-"ZLIB: Not enough memory",
-"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
-"ZLIB: Input data corrupted",
-"%d line(s) were cut by GROUP_CONCAT()",
-"Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; it contained more data than there were input columns",
-"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
-"Data truncated; out of range for column '%s' at row %ld",
-"Data truncated for column '%s' at row %ld",
-"Using storage engine %s for table '%s'",
-"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
-"Can't drop one or more of the requested users",
-"Can't revoke all privileges, grant for one or more of the requested users",
-"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
-"Illegal mix of collations for operation '%s'",
-"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
-"Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
-"Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
-"Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",
-"Incorrect parameter or combination of parameters for START SLAVE UNTIL",
-"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL; otherwise, you are not safe in case of unexpected slave's mysqld restart",
-"SQL thread is not to be started so UNTIL options are ignored",
-"Incorrect index name '%-.100s'",
-"Incorrect catalog name '%-.100s'",
-"Query cache failed to set size %lu, new query cache size is %lu",
-"Column '%-.64s' cannot be part of FULLTEXT index",
-"Unknown key cache '%-.100s'",
-"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
-"Unknown table engine '%s'",
-"'%s' is deprecated, use '%s' instead",
-"The target table %-.100s of the %s is not updateable",
-"The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
-"The MySQL server is running with the %s option so it cannot execute this statement",
-"Column '%-.100s' has duplicated value '%-.64s' in %s"
-"Truncated wrong %-.32s value: '%-.128s'"
-"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' column",
-"This command is not supported in the prepared statement protocol yet",
-"Got NDB error %d '%-.100s'",
-"Got temporary NDB error %d '%-.100s'",
-"Unknown or incorrect time zone: '%-.64s'",
-"Invalid TIMESTAMP value in column '%s' at row %ld",
-"Invalid %s character string: '%.64s'",
-"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s%s' and '%s%s'"