diff --git a/Build-tools/Do-rpm b/Build-tools/Do-rpm
index da06e1f58e4..23602debfb1 100755
--- a/Build-tools/Do-rpm
+++ b/Build-tools/Do-rpm
@@ -22,7 +22,6 @@ use Getopt::Long;
 Getopt::Long::Configure ("bundling");
 use Sys::Hostname;
 
-$opt_nobuild = undef;
 $opt_cc= undef;
 $opt_cflags= undef;
 $opt_clean= undef;
@@ -33,6 +32,9 @@ $opt_help= undef;
 $opt_log= undef;
 $opt_mail= "";
 $opt_verbose= undef;
+$opt_susebuild= undef;
+$opt_susebuildroot= undef;
+$opt_suserpms= undef;
 
 # Set a dummy version until we know the correct one
 $VERSION= "x.y.z";
@@ -49,7 +51,9 @@ GetOptions(
 	"help|h",
 	"log|l:s",
 	"mail|m=s",
-        "nobuild",
+	"susebuild|s",
+	"susebuildroot|r=s",
+	"suserpms=s",
 	"verbose|v",
 ) || &print_help;
 
@@ -57,6 +61,20 @@ GetOptions(
 
 defined($SPECFILE=$ARGV[0]) || print_help("Please provide the spec file name!");
 
+&print_help("Please define the location of the RPM repository!") if $opt_susebuild && !($opt_suserpms || $ENV{BUILD_RPMS});
+
+unless ($opt_susebuildroot)
+{
+	if ($ENV{BUILD_ROOT})
+	{
+		$opt_susebuildroot= $ENV{BUILD_ROOT};
+	}
+	else
+	{
+		$opt_susebuildroot="/var/tmp/build-root";
+	}
+}
+
 # Include helper functions
 $PWD= cwd();
 $LOGGER= "$PWD/logger.pm";
@@ -72,7 +90,7 @@ else
 $subject= "RPM build for $SPECFILE failed" if $opt_mail;
 
 # Open the spec file and extract the version number
-open(SPEC, $SPECFILE) or &abort("Unable to open \"$ARGV[0]\": $!");
+open(SPEC, $SPECFILE) or die "Unable to open \"$ARGV[0]\": $!";
 @spec= <SPEC>;
 close SPEC;
 
@@ -94,7 +112,7 @@ $HOST= hostname();
 $HOST=~ /^([^.-]*)/;
 $HOST= $1;
 $LOGFILE= "$PWD/Logs/Do-rpm-$HOST-$MAJOR.$MINOR.log";
-&logger("Using spec file for version: $VERSION");
+&logger("Logging to $LOGFILE");
 
 #
 # Override predefined Log file name
@@ -114,111 +132,157 @@ if (defined $opt_log)
 	}
 }
 
-#
-# Newer RPM versions ship with a separate tool "rpmbuild" to build RPMs
-#
-if (-x "/usr/bin/rpmbuild")
+&logger("Using spec file for version: $VERSION");
+
+if ($opt_susebuild)
 {
-	$RPM= "/usr/bin/rpmbuild";
-	$RMSOURCE= "--rmsource --rmspec";
+	&susebuild;
 }
 else
-{
-	$RPM= "/bin/rpm";
-	$RMSOURCE= "--rmspec";
+{	
+	&rpmbuild;
 }
 
-if ($RPM)
-{
-	&logger("Found rpm binary: $RPM");
-}
-else
-{
-	&abort("Unable to find RPM binary!");
-}
-
-#
-# determine some RPM settings for this host
-#
-chomp($RPMARCH= `$RPM --eval "%{_arch}" 2> /dev/null`);
-chomp($RPMDIR= `$RPM --eval "%{_rpmdir}" 2> /dev/null`);
-chomp($SOURCEDIR= `$RPM --eval "%{_sourcedir}" 2> /dev/null`);
-chomp($SPECDIR= `$RPM --eval "%{_specdir}" 2> /dev/null`);
-chomp($SRCRPMDIR= `$RPM --eval "%{_srcrpmdir}" 2> /dev/null`);
-
-$SOURCEFILE= glob "mysql*-$VERSION.tar.gz";
-
-unless($opt_nobuild) {
-
-  &logger("Starting RPM build of MySQL-$VERSION on $HOST");
-
-  foreach $file ($SOURCEFILE, $SPECFILE)
-  {
-    &abort("Unable to find $file!") unless (-f "$file");
-  }
-
-#
-# Install source and spec file
-#
-  &logger("Copying SOURCE and SPEC file to build directories.");
-  unless ($opt_dry_run)
-  {
-    copy($SOURCEFILE, $SOURCEDIR)
-      or &abort("Unable to copy $SOURCEFILE to $SOURCEDIR!");
-    copy($SPECFILE, $SPECDIR)
-      or &abort("Unable to copy $SPECFILE to $SPECDIR!");
-  }
-
-#
-# Set environment variables - these are being used in the
-# official MySQL RPM spec file
-#
-  &logger("Setting special build environment variables")
-    if ($opt_cc) or ($opt_cflags) or ($opt_cxxflags) or ($opt_cxx);
-  $ENV{MYSQL_BUILD_CC}=$opt_cc if ($opt_cc);
-  $ENV{MYSQL_BUILD_CFLAGS}=$opt_cflags if ($opt_cflags);
-  $ENV{MYSQL_BUILD_CXXFLAGS}=$opt_cxxflags if ($opt_cxxflags);
-  $ENV{MYSQL_BUILD_CXX}=$opt_cxx if ($opt_cxx);
-
-#
-# Build the RPMs
-#
-  $command= "$RPM";
-  $command.= " -v" if ($opt_verbose);
-  $command.= " -ba";
-  $command.= " --clean $RMSOURCE" if $opt_clean;
-  $command.= " $SPECDIR/";
-  $command.= basename($SPECFILE);
-  &logger("Building RPM.");
-  &run_command($command, "Error while building the RPMs!"); 
-}
-
-#
-# Move the resulting RPMs into the pwd
-#
-$command= "mv";
-$command.= " -v " if ($opt_verbose);
-$command.= " $SRCRPMDIR/MySQL*$VERSION_SRPM*.src.rpm $PWD";
-&logger("Moving source RPM to current dir.");
-&run_command($command, "Error moving source RPM!");
-
-$command= "mv";
-$command.= " -v " if ($opt_verbose);
-# $command.= " $RPMDIR/$RPMARCH/MySQL*$VERSION*.$RPMARCH.rpm $PWD";
-$command.= " $RPMDIR/$RPMARCH/MySQL*$VERSION_SRPM*.$RPMARCH.rpm $PWD";
-&logger("Moving binary RPMs to current dir.");
-&run_command($command, "Error moving binary RPMs!");
-
 &logger("SUCCESS: RPM files successfully created.") unless ($opt_dry_run);
 exit 0;
 
+#
+# Build using SUSE's "build" script
+#
+sub susebuild
+{
+	$BUILD= "/usr/bin/build";
+	( -x $BUILD) ? &logger("$BUILD found, proceeding.") : &abort("$BUILD could not be found!");
+	$command= "sudo $BUILD --clean";
+	$command.= " --root=$opt_susebuildroot";
+	$command.= " --rpms=$opt_suserpms" if $opt_suserpms;
+	$command.= " $SPECFILE";
+	&logger("Building RPMs using SUSE build.");
+	&run_command($command, "Error while running the SUSE RPM build!"); 
+
+	#
+	# Move the resulting RPMs into the pwd - we can use broad globs here
+	# as the build root has been cleaned up before so there should not be
+	# any residuals from previous build runs
+	#
+	$command= "cp";
+	$command.= " -v " if ($opt_verbose);
+	$command.= " $opt_susebuildroot/usr/src/packages/SRPMS/MySQL*.src.rpm $PWD";
+	&logger("Copying source RPM to current dir.");
+	&run_command($command, "Error moving source RPM!");
+
+	$command= "cp";
+	$command.= " -v " if ($opt_verbose);
+	$command.= " $opt_susebuildroot/usr/src/packages/RPMS/*/MySQL*.rpm $PWD";
+	&logger("Copying binary RPMs to current dir.");
+	&run_command($command, "Error moving binary RPMs!");
+}
+
+#
+# Build using "plain" RPM
+#
+sub rpmbuild
+{
+
+	#
+	# Newer RPM versions ship with a separate tool "rpmbuild" to build RPMs
+	#
+	if (-x "/usr/bin/rpmbuild")
+	{
+		$RPM= "/usr/bin/rpmbuild";
+		$RMSOURCE= "--rmsource --rmspec";
+	}
+	else
+	{
+		$RPM= "/bin/rpm";
+		$RMSOURCE= "--rmspec";
+	}
+
+	if ($RPM)
+	{
+		&logger("Found rpm binary: $RPM");
+	}
+	else
+	{
+		&abort("Unable to find RPM binary!");
+	}
+
+	#
+	# determine some RPM settings for this host
+	#
+	chomp($RPMARCH= `$RPM --eval "%{_arch}" 2> /dev/null`);
+	chomp($RPMDIR= `$RPM --eval "%{_rpmdir}" 2> /dev/null`);
+	chomp($SOURCEDIR= `$RPM --eval "%{_sourcedir}" 2> /dev/null`);
+	chomp($SPECDIR= `$RPM --eval "%{_specdir}" 2> /dev/null`);
+	chomp($SRCRPMDIR= `$RPM --eval "%{_srcrpmdir}" 2> /dev/null`);
+
+	$SOURCEFILE= glob "mysql*-$VERSION.tar.gz";
+
+	&logger("Starting RPM build of MySQL-$VERSION on $HOST");
+
+	foreach $file ($SOURCEFILE, $SPECFILE)
+	{
+		&abort("Unable to find $file!") unless (-f "$file");
+	}
+
+	#
+	# Install source and spec file
+	#
+	&logger("Copying SOURCE and SPEC file to build directories.");
+	unless ($opt_dry_run)
+	{
+		copy($SOURCEFILE, $SOURCEDIR)
+			or &abort("Unable to copy $SOURCEFILE to $SOURCEDIR!");
+		copy($SPECFILE, $SPECDIR)
+			or &abort("Unable to copy $SPECFILE to $SPECDIR!");
+	}
+
+	#
+	# Set environment variables - these are being used in the
+	# official MySQL RPM spec file
+	#
+	&logger("Setting special build environment variables")
+		if ($opt_cc) or ($opt_cflags) or ($opt_cxxflags) or ($opt_cxx);
+	$ENV{MYSQL_BUILD_CC}=$opt_cc if ($opt_cc);
+	$ENV{MYSQL_BUILD_CFLAGS}=$opt_cflags if ($opt_cflags);
+	$ENV{MYSQL_BUILD_CXXFLAGS}=$opt_cxxflags if ($opt_cxxflags);
+	$ENV{MYSQL_BUILD_CXX}=$opt_cxx if ($opt_cxx);
+
+	#
+	# Build the RPMs
+	#
+	$command= "$RPM";
+	$command.= " -v" if ($opt_verbose);
+	$command.= " -ba";
+	$command.= " --clean $RMSOURCE" if $opt_clean;
+	$command.= " $SPECDIR/";
+	$command.= basename($SPECFILE);
+	&logger("Building RPM.");
+	&run_command($command, "Error while building the RPMs!"); 
+
+	#
+	# Move the resulting RPMs into the pwd
+	#
+	$command= "mv";
+	$command.= " -v " if ($opt_verbose);
+	$command.= " $SRCRPMDIR/MySQL*$VERSION_SRPM*.src.rpm $PWD";
+	&logger("Moving source RPM to current dir.");
+	&run_command($command, "Error moving source RPM!");
+
+	$command= "mv";
+	$command.= " -v " if ($opt_verbose);
+	$command.= " $RPMDIR/$RPMARCH/MySQL*$VERSION_SRPM*.$RPMARCH.rpm $PWD";
+	&logger("Moving binary RPMs to current dir.");
+	&run_command($command, "Error moving binary RPMs!");
+}
+
 sub print_help
 {
 	my $message= $_[0];
 	if ($message ne "")
 	{
 		print "\n";
-		print "ERROR: $message\n\n}";
+		print "ERROR: $message\n\n";
 	}
 	print <<EOF;
 
@@ -241,12 +305,22 @@ Options:
 -t, --dry-run                 Dry run without executing
 -h, --help                    Print this help
 -l, --log[=<filename>]        Write a log file [to <filename>]
-                              (default is "$LOGFILE")
 -m, --mail=<address>          Mail a failure report to the given address
                               (and include a log file snippet, if logging
                               is enabled)
                               Note that the \@-Sign needs to be quoted!
                               Example: --mail=user\\\@domain.com
+-s, --susebuild               Use the SUSE "build" script instead of RPM
+                              directly (requires sudo privileges to run the
+                              /usr/bin/build command)
+-r, --susebuildroot=<root>    Use <root> as the build root directory for the
+                              SUSE "build" (default is /var/tmp/build-root
+                              or defined by the BUILD_ROOT environment
+                              variable)
+--suserpms=<path>             Path to the SUSE RPM repository to build up
+                              the build root (mandatory option when using
+                              --susebuild and the BUILD_RPMS environment
+                              variable is not set.)
 -v, --verbose                 Verbose execution
 
 Example:
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 83a13707cdc..e13daa1a5c2 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -540,6 +540,7 @@ if [ x$SOURCE_DIST = x1 ] ; then
  INSTALL_DB="./install_test_db"
  MYSQL_FIX_SYSTEM_TABLES="$BASEDIR/scripts/mysql_fix_privilege_tables"
  NDB_TOOLS_DIR="$BASEDIR/ndb/tools"
+ NDB_MGM="$BASEDIR/ndb/src/mgmclient/ndb_mgm"
 else
  if test -x "$BASEDIR/libexec/mysqld"
  then
@@ -566,6 +567,7 @@ else
  INSTALL_DB="./install_test_db --bin"
  MYSQL_FIX_SYSTEM_TABLES="$CLIENT_BINDIR/mysql_fix_privilege_tables"
  NDB_TOOLS_DIR="$CLIENT_BINDIR"
+ NDB_MGM="$CLIENT_BINDIR/ndb_mgm"
  if test -d "$BASEDIR/share/mysql/english"
  then
    LANGUAGE="$BASEDIR/share/mysql/english/"
@@ -615,6 +617,7 @@ MYSQL="$MYSQL --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --u
 export MYSQL MYSQL_DUMP MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES
 export CLIENT_BINDIR TESTS_BINDIR CHARSETSDIR
 export NDB_TOOLS_DIR
+export NDB_MGM
 
 MYSQL_TEST_ARGS="--no-defaults --socket=$MASTER_MYSOCK --database=$DB \
  --user=$DBUSER --password=$DBPASSWD --silent -v --skip-safemalloc \
diff --git a/mysql-test/r/func_in.result b/mysql-test/r/func_in.result
index fa603fd16d5..f75fe0d1627 100644
--- a/mysql-test/r/func_in.result
+++ b/mysql-test/r/func_in.result
@@ -157,6 +157,14 @@ a
 bbbb
 цццц
 drop table t1;
+create table t1 (a char(10) character set latin1 not null);
+insert into t1 values ('a'),('b'),('c');
+select a from t1 where a IN ('a','b','c') order by a;
+a
+a
+b
+c
+drop table t1;
 set names latin1;
 select '1.0' in (1,2);
 '1.0' in (1,2)
diff --git a/mysql-test/r/ndb_autodiscover.result b/mysql-test/r/ndb_autodiscover.result
index 35820512d39..b9e70b9c1cf 100644
--- a/mysql-test/r/ndb_autodiscover.result
+++ b/mysql-test/r/ndb_autodiscover.result
@@ -359,6 +359,16 @@ information_schema
 mysql
 test
 use test;
+drop database if exists test_only_ndb_tables;
+create database test_only_ndb_tables;
+use test_only_ndb_tables;
+create table t1 (a int primary key) engine=ndb;
+select * from t1;
+a
+select * from t1;
+ERROR HY000: Can't lock file (errno: 4009)
+use test;
+drop database test_only_ndb_tables;
 CREATE TABLE t9 (
 a int NOT NULL PRIMARY KEY,
 b int
diff --git a/mysql-test/t/func_in.test b/mysql-test/t/func_in.test
index 3cd8c064817..6e0883b821f 100644
--- a/mysql-test/t/func_in.test
+++ b/mysql-test/t/func_in.test
@@ -80,6 +80,11 @@ create table t1 (a char(10) character set utf8 not null);
 insert into t1 values ('bbbb'),(_koi8r'����'),(_latin1'����');
 select a from t1 where a in ('bbbb',_koi8r'����',_latin1'����') order by a;
 drop table t1;
+# Bug#7834 Illegal mix of collations in IN operator
+create table t1 (a char(10) character set latin1 not null);
+insert into t1 values ('a'),('b'),('c');
+select a from t1 where a IN ('a','b','c') order by a;
+drop table t1;
 set names latin1;
 
 select '1.0' in (1,2);
diff --git a/mysql-test/t/ndb_autodiscover.test b/mysql-test/t/ndb_autodiscover.test
index 6551732adba..e6bfedc89ed 100644
--- a/mysql-test/t/ndb_autodiscover.test
+++ b/mysql-test/t/ndb_autodiscover.test
@@ -452,6 +452,26 @@ drop database test2;
 show databases;
 use test;
 
+#########################################################
+# Bug#8035
+# mysqld would segfault on second select * before bug was fixed
+#
+--disable_warnings
+drop database if exists test_only_ndb_tables;
+--enable_warnings
+create database test_only_ndb_tables;
+use test_only_ndb_tables;
+create table t1 (a int primary key) engine=ndb;
+select * from t1;
+--exec $NDB_MGM --no-defaults -e "all restart -n" > /dev/null
+--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults --not-started > /dev/null
+--error 1015
+select * from t1;
+--exec $NDB_MGM --no-defaults -e "all start" > /dev/null
+--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults > /dev/null
+use test;
+drop database test_only_ndb_tables;
+
 ######################################################
 # Note! This should always be the last step in this 
 # file, the table t9 will be used and dropped 
diff --git a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
index ce38c355c91..51fd50c8c46 100644
--- a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
+++ b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
@@ -1312,7 +1312,10 @@ void Dbtc::execTCRELEASEREQ(Signal* signal)
     if (tapiBlockref == apiConnectptr.p->ndbapiBlockref) {
       if (apiConnectptr.p->apiConnectstate == CS_CONNECTED ||
 	  (apiConnectptr.p->apiConnectstate == CS_ABORTING &&
-	   apiConnectptr.p->abortState == AS_IDLE)){
+	   apiConnectptr.p->abortState == AS_IDLE) ||
+	  (apiConnectptr.p->apiConnectstate == CS_STARTED &&
+	   apiConnectptr.p->firstTcConnect == RNIL))
+      {
         jam();                                   /* JUST REPLY OK */
         releaseApiCon(signal, apiConnectptr.i);
         signal->theData[0] = tuserpointer;
diff --git a/ndb/tools/waiter.cpp b/ndb/tools/waiter.cpp
index 4b86de36514..dfdb11524e3 100644
--- a/ndb/tools/waiter.cpp
+++ b/ndb/tools/waiter.cpp
@@ -31,11 +31,13 @@ waitClusterStatus(const char* _addr, ndb_mgm_node_status _status,
 		  unsigned int _timeout);
 
 enum ndb_waiter_options {
-  NDB_STD_OPTS_OPTIONS
+  NDB_STD_OPTS_OPTIONS,
+  OPT_WAIT_STATUS_NOT_STARTED
 };
 NDB_STD_OPTS_VARS;
 
 static int _no_contact = 0;
+static int _not_started = 0;
 static int _timeout = 120;
 static struct my_option my_long_options[] =
 {
@@ -43,6 +45,9 @@ static struct my_option my_long_options[] =
   { "no-contact", 'n', "Wait for cluster no contact",
     (gptr*) &_no_contact, (gptr*) &_no_contact, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 }, 
+  { "not-started", OPT_WAIT_STATUS_NOT_STARTED, "Wait for cluster not started",
+    (gptr*) &_not_started, (gptr*) &_not_started, 0,
+    GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 }, 
   { "timeout", 't', "Timeout to wait",
     (gptr*) &_timeout, (gptr*) &_timeout, 0,
     GET_INT, REQUIRED_ARG, 120, 0, 0, 0, 0, 0 }, 
@@ -91,12 +96,22 @@ int main(int argc, char** argv){
   if (_hostName == 0)
     _hostName= opt_connect_str;
 
-  if (_no_contact) {
-    if (waitClusterStatus(_hostName, NDB_MGM_NODE_STATUS_NO_CONTACT, _timeout) != 0)
-      return NDBT_ProgramExit(NDBT_FAILED);
-  } else if (waitClusterStatus(_hostName, NDB_MGM_NODE_STATUS_STARTED, _timeout) != 0)
-    return NDBT_ProgramExit(NDBT_FAILED);
+  enum ndb_mgm_node_status wait_status;
+  if (_no_contact)
+  {
+    wait_status= NDB_MGM_NODE_STATUS_NO_CONTACT;
+  }
+  else if (_not_started)
+  {
+    wait_status= NDB_MGM_NODE_STATUS_NOT_STARTED;
+  }
+  else 
+  {
+    wait_status= NDB_MGM_NODE_STATUS_STARTED;
+  }
 
+  if (waitClusterStatus(_hostName, wait_status, _timeout) != 0)
+    return NDBT_ProgramExit(NDBT_FAILED);
   return NDBT_ProgramExit(NDBT_OK);
 }
 
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 4fbe7c241d1..96689bd0ac2 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -1776,64 +1776,13 @@ void Item_func_in::fix_length_and_dec()
   
   agg_cmp_type(&cmp_type, args, arg_count);
 
+  if (cmp_type == STRING_RESULT &&
+      agg_arg_charsets(cmp_collation, args, arg_count, MY_COLL_CMP_CONV))
+    return;
+
   for (arg=args+1, arg_end=args+arg_count; arg != arg_end ; arg++)
     const_itm&= arg[0]->const_item();
 
-
-  if (cmp_type == STRING_RESULT)
-  {
-    /*
-      We allow consts character set conversion for
-
-        item IN (const1, const2, const3, ...)
-
-      if item is in a superset for all arguments,
-      and if it is a stong side according to coercibility rules.
-   
-      TODO: add covnersion for non-constant IN values
-      via creating Item_func_conv_charset().
-    */
-
-    if (agg_arg_collations_for_comparison(cmp_collation, args, arg_count,
-                                          MY_COLL_ALLOW_SUPERSET_CONV))
-      return;
-    if ((!my_charset_same(args[0]->collation.collation, 
-                          cmp_collation.collation) || !const_itm))
-    {
-      if (agg_arg_collations_for_comparison(cmp_collation, args, arg_count))
-        return;
-    }
-    else
-    {
-      /* 
-         Conversion is possible:
-         All IN arguments are constants.
-      */
-      Item_arena *arena, backup;
-      arena= thd->change_arena_if_needed(&backup);
-
-      for (arg= args+1, arg_end= args+arg_count; arg < arg_end; arg++)
-      {
-        if (!arg[0]->null_value &&
-            !my_charset_same(cmp_collation.collation,
-                             arg[0]->collation.collation))
-        {
-          Item_string *conv;
-          String tmp, cstr, *ostr= arg[0]->val_str(&tmp);
-          uint dummy_errors;
-          cstr.copy(ostr->ptr(), ostr->length(), ostr->charset(),
-                    cmp_collation.collation, &dummy_errors);
-          conv= new Item_string(cstr.ptr(),cstr.length(), cstr.charset(),
-                                arg[0]->collation.derivation);
-          conv->str_value.copy();
-          arg[0]= conv;
-        }
-      }
-      if (arena)
-        thd->restore_backup_item_arena(arena, &backup);
-    }
-  }
-  
   /*
     Row item with NULLs inside can return NULL or FALSE => 
     they can't be processed as static
diff --git a/sql/lock.cc b/sql/lock.cc
index fffd48d5305..2dd12fce802 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -182,12 +182,12 @@ static int lock_external(THD *thd, TABLE **tables, uint count)
 
     if ((error=(*tables)->file->external_lock(thd,lock_type)))
     {
+      print_lock_error(error, (*tables)->file->table_type());
       for (; i-- ; tables--)
       {
 	(*tables)->file->external_lock(thd, F_UNLCK);
 	(*tables)->current_lock=F_UNLCK;
       }
-      print_lock_error(error, (*tables)->file->table_type());
       DBUG_RETURN(error);
     }
     else
@@ -375,12 +375,13 @@ static int unlock_external(THD *thd, TABLE **table,uint count)
     {
       (*table)->current_lock = F_UNLCK;
       if ((error=(*table)->file->external_lock(thd, F_UNLCK)))
+      {
 	error_code=error;
+	print_lock_error(error_code, (*table)->file->table_type());
+      }
     }
     table++;
   } while (--count);
-  if (error_code)
-    print_lock_error(error_code, (*table)->file->table_type());
   DBUG_RETURN(error_code);
 }
 
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 951bffd698d..3cdcef7c8ee 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -1,4 +1,4 @@
-languages czech=cze latin2, danish=dan latin1, dutch=nla latin1, english=eng latin1, estonian=est latin7, french=fre latin1, german=ger latin1, greek=greek greek, hungarian=hun latin2, italian=ita latin1, japanese=jpn ujis, korean=kor euckr, norwegian-ny=norwegian-ny latin1, norwegian=nor latin1, polish=pol latin2, portuguese=por latin1, romanian=rum latin2, russian=rus koi8r, serbian=serbian cp1250, slovak=slo latin2, spanish=spa latin1, swedish=swe latin1, ukrainian=ukr koi8u;
+languages czech=cze latin2, danish=dan latin1, dutch=nla latin1, english=eng latin1, estonian=est latin7, french=fre latin1, german=ger latin1, greek=greek greek, hungarian=hun latin2, italian=ita latin1, japanese=jpn ujis, japanese-sjis=jps sjis, korean=kor euckr, norwegian-ny=norwegian-ny latin1, norwegian=nor latin1, polish=pol latin2, portuguese=por latin1, romanian=rum latin2, russian=rus koi8r, serbian=serbian cp1250, slovak=slo latin2, spanish=spa latin1, swedish=swe latin1, ukrainian=ukr koi8u;
 
 default-language eng
 
@@ -79,6 +79,7 @@ ER_CANT_CREATE_TABLE
 	dan "Kan ikke oprette tabellen '%-.64s' (Fejlkode: %d)"
 	nla "Kan tabel '%-.64s' niet aanmaken (Errcode: %d)"
 	eng "Can't create table '%-.64s' (errno: %d)"
+	jps "'%-.64s' �e�[�u�������܂���.(errno: %d)",
 	est "Ei suuda luua tabelit '%-.64s' (veakood: %d)"
 	fre "Ne peut cr�er la table '%-.64s' (Errcode: %d)"
 	ger "Kann Tabelle '%-.64s' nicht erzeugen (Fehler: %d)"
@@ -103,6 +104,7 @@ ER_CANT_CREATE_DB
 	dan "Kan ikke oprette databasen '%-.64s' (Fejlkode: %d)"
 	nla "Kan database '%-.64s' niet aanmaken (Errcode: %d)"
 	eng "Can't create database '%-.64s' (errno: %d)"
+	jps "'%-.64s' �f�[�^�x�[�X�����܂��� (errno: %d)",
 	est "Ei suuda luua andmebaasi '%-.64s' (veakood: %d)"
 	fre "Ne peut cr�er la base '%-.64s' (Erreur %d)"
 	ger "Kann Datenbank '%-.64s' nicht erzeugen (Fehler: %d)"
@@ -127,6 +129,7 @@ ER_DB_CREATE_EXISTS
 	dan "Kan ikke oprette databasen '%-.64s'; databasen eksisterer"
 	nla "Kan database '%-.64s' niet aanmaken; database bestaat reeds"
 	eng "Can't create database '%-.64s'; database exists"
+	jps "'%-.64s' �f�[�^�x�[�X�����܂���.���ɂ��̃f�[�^�x�[�X�����݂��܂�",
 	est "Ei suuda luua andmebaasi '%-.64s': andmebaas juba eksisteerib"
 	fre "Ne peut cr�er la base '%-.64s'; elle existe d�j�"
 	ger "Kann Datenbank '%-.64s' nicht erzeugen. Datenbank '%-.64s' existiert bereits"
@@ -151,6 +154,7 @@ ER_DB_DROP_EXISTS
 	dan "Kan ikke slette (droppe) '%-.64s'; databasen eksisterer ikke"
 	nla "Kan database '%-.64s' niet verwijderen; database bestaat niet"
 	eng "Can't drop database '%-.64s'; database doesn't exist"
+	jps "'%-.64s' �f�[�^�x�[�X��j���ł��܂���. ���̃f�[�^�x�[�X���Ȃ��̂ł�.",
 	est "Ei suuda kustutada andmebaasi '%-.64s': andmebaasi ei eksisteeri"
 	fre "Ne peut effacer la base '%-.64s'; elle n'existe pas"
 	ger "Kann Datenbank '%-.64s' nicht l�schen. Keine Datenbank '%-.64s' vorhanden"
@@ -175,6 +179,7 @@ ER_DB_DROP_DELETE
 	dan "Fejl ved sletning (drop) af databasen (kan ikke slette '%-.64s', Fejlkode %d)"
 	nla "Fout bij verwijderen database (kan '%-.64s' niet verwijderen, Errcode: %d)"
 	eng "Error dropping database (can't delete '%-.64s', errno: %d)"
+	jps "�f�[�^�x�[�X�j���G���[ ('%-.64s' ���폜�ł��܂���, errno: %d)",
 	est "Viga andmebaasi kustutamisel (ei suuda kustutada faili '%-.64s', veakood: %d)"
 	fre "Ne peut effacer la base '%-.64s' (erreur %d)"
 	ger "Fehler beim L�schen der Datenbank ('%-.64s' kann nicht gel�scht werden, Fehlernuumer: %d)"
@@ -199,6 +204,7 @@ ER_DB_DROP_RMDIR
 	dan "Fejl ved sletting af database (kan ikke slette folderen '%-.64s', Fejlkode %d)"
 	nla "Fout bij verwijderen database (kan rmdir '%-.64s' niet uitvoeren, Errcode: %d)"
 	eng "Error dropping database (can't rmdir '%-.64s', errno: %d)"
+	jps "�f�[�^�x�[�X�j���G���[ ('%-.64s' �� rmdir �ł��܂���, errno: %d)",
 	est "Viga andmebaasi kustutamisel (ei suuda kustutada kataloogi '%-.64s', veakood: %d)"
 	fre "Erreur en effa�ant la base (rmdir '%-.64s', erreur %d)"
 	ger "Fehler beim L�schen der Datenbank (Verzeichnis '%-.64s' kann nicht gel�scht werden, Fehlernummer: %d)"
@@ -223,6 +229,7 @@ ER_CANT_DELETE_FILE
 	dan "Fejl ved sletning af '%-.64s' (Fejlkode: %d)"
 	nla "Fout bij het verwijderen van '%-.64s' (Errcode: %d)"
 	eng "Error on delete of '%-.64s' (errno: %d)"
+	jps "'%-.64s' �̍폜���G���[ (errno: %d)",
 	est "Viga '%-.64s' kustutamisel (veakood: %d)"
 	fre "Erreur en effa�ant '%-.64s' (Errcode: %d)"
 	ger "Fehler beim L�schen von '%-.64s' (Fehler: %d)"
@@ -247,6 +254,7 @@ ER_CANT_FIND_SYSTEM_REC
 	dan "Kan ikke l�se posten i systemfolderen"
 	nla "Kan record niet lezen in de systeem tabel"
 	eng "Can't read record in system table"
+	jps "system table �̃��R�[�h��ǂގ����ł��܂���ł���",
 	est "Ei suuda lugeda kirjet s�steemsest tabelist"
 	fre "Ne peut lire un enregistrement de la table 'system'"
 	ger "Datensatz in der Systemtabelle nicht lesbar"
@@ -271,6 +279,7 @@ ER_CANT_GET_STAT
 	dan "Kan ikke l�se status af '%-.64s' (Fejlkode: %d)"
 	nla "Kan de status niet krijgen van '%-.64s' (Errcode: %d)"
 	eng "Can't get status of '%-.64s' (errno: %d)"
+	jps "'%-.64s' �̃X�e�C�^�X�������܂���. (errno: %d)",
 	est "Ei suuda lugeda '%-.64s' olekut (veakood: %d)"
 	fre "Ne peut obtenir le status de '%-.64s' (Errcode: %d)"
 	ger "Kann Status von '%-.64s' nicht ermitteln (Fehler: %d)"
@@ -295,6 +304,7 @@ ER_CANT_GET_WD
 	dan "Kan ikke l�se aktive folder (Fejlkode: %d)"
 	nla "Kan de werkdirectory niet krijgen (Errcode: %d)"
 	eng "Can't get working directory (errno: %d)"
+	jps "working directory �𓾂鎖���ł��܂���ł��� (errno: %d)",
 	est "Ei suuda identifitseerida jooksvat kataloogi (veakood: %d)"
 	fre "Ne peut obtenir le r�pertoire de travail (Errcode: %d)"
 	ger "Kann Arbeitsverzeichnis nicht ermitteln (Fehler: %d)"
@@ -319,6 +329,7 @@ ER_CANT_LOCK
 	dan "Kan ikke l�se fil (Fejlkode: %d)"
 	nla "Kan de file niet blokeren (Errcode: %d)"
 	eng "Can't lock file (errno: %d)"
+	jps "�t�@�C�������b�N�ł��܂��� (errno: %d)",
 	est "Ei suuda lukustada faili (veakood: %d)"
 	fre "Ne peut verrouiller le fichier (Errcode: %d)"
 	ger "Datei kann nicht gesperrt werden (Fehler: %d)"
@@ -343,6 +354,7 @@ ER_CANT_OPEN_FILE
 	dan "Kan ikke �bne fil: '%-.64s' (Fejlkode: %d)"
 	nla "Kan de file '%-.64s' niet openen (Errcode: %d)"
 	eng "Can't open file: '%-.64s' (errno: %d)"
+	jps "'%-.64s' �t�@�C�����J�������ł��܂��� (errno: %d)",
 	est "Ei suuda avada faili '%-.64s' (veakood: %d)"
 	fre "Ne peut ouvrir le fichier: '%-.64s' (Errcode: %d)"
 	ger "Datei '%-.64s' nicht �ffnen (Fehler: %d)"
@@ -367,6 +379,7 @@ ER_FILE_NOT_FOUND
 	dan "Kan ikke finde fila: '%-.64s' (Fejlkode: %d)"
 	nla "Kan de file: '%-.64s' niet vinden (Errcode: %d)"
 	eng "Can't find file: '%-.64s' (errno: %d)"
+	jps "'%-.64s' �t�@�C�������t���鎖���ł��܂���.(errno: %d)",
 	est "Ei suuda leida faili '%-.64s' (veakood: %d)"
 	fre "Ne peut trouver le fichier: '%-.64s' (Errcode: %d)"
 	ger "Kann Datei '%-.64s' nicht finden (Fehler: %d)"
@@ -391,6 +404,7 @@ ER_CANT_READ_DIR
 	dan "Kan ikke l�se folder '%-.64s' (Fejlkode: %d)"
 	nla "Kan de directory niet lezen van '%-.64s' (Errcode: %d)"
 	eng "Can't read dir of '%-.64s' (errno: %d)"
+	jps "'%-.64s' �f�B���N�g�����ǂ߂܂���.(errno: %d)",
 	est "Ei suuda lugeda kataloogi '%-.64s' (veakood: %d)"
 	fre "Ne peut lire le r�pertoire de '%-.64s' (Errcode: %d)"
 	ger "Verzeichnis von '%-.64s' nicht lesbar (Fehler: %d)"
@@ -415,6 +429,7 @@ ER_CANT_SET_WD
 	dan "Kan ikke skifte folder til '%-.64s' (Fejlkode: %d)"
 	nla "Kan de directory niet veranderen naar '%-.64s' (Errcode: %d)"
 	eng "Can't change dir to '%-.64s' (errno: %d)"
+	jps "'%-.64s' �f�B���N�g���� chdir �ł��܂���.(errno: %d)",
 	est "Ei suuda siseneda kataloogi '%-.64s' (veakood: %d)"
 	fre "Ne peut changer le r�pertoire pour '%-.64s' (Errcode: %d)"
 	ger "Kann nicht in das Verzeichnis '%-.64s' wechseln (Fehler: %d)"
@@ -462,6 +477,7 @@ ER_DISK_FULL
 	dan "Ikke mere diskplads (%s). Venter p� at f� frigjort plads..."
 	nla "Schijf vol (%s). Aan het wachten totdat er ruimte vrij wordt gemaakt..."
 	eng "Disk full (%s); waiting for someone to free some space..."
+	jps "Disk full (%s). �N�������������炷�܂ł܂��Ă�������...",
 	est "Ketas t�is (%s). Ootame kuni tekib vaba ruumi..."
 	fre "Disque plein (%s). J'attend que quelqu'un lib�re de l'espace..."
 	ger "Festplatte voll (%-.64s). Warte, bis jemand Platz schafft ..."
@@ -486,6 +502,7 @@ ER_DUP_KEY 23000
 	dan "Kan ikke skrive, flere ens n�gler i tabellen '%-.64s'"
 	nla "Kan niet schrijven, dubbele zoeksleutel in tabel '%-.64s'"
 	eng "Can't write; duplicate key in table '%-.64s'"
+	jps "table '%-.64s' �� key ���d�����Ă��ď������߂܂���",
 	est "Ei saa kirjutada, korduv v�ti tabelis '%-.64s'"
 	fre "Ecriture impossible, doublon dans une cl� de la table '%-.64s'"
 	ger "Kann nicht speichern, Grund: doppelter Schl�ssel in Tabelle '%-.64s'"
@@ -533,6 +550,7 @@ ER_ERROR_ON_READ
 	dan "Fejl ved l�sning af '%-.64s' (Fejlkode: %d)"
 	nla "Fout bij het lezen van file '%-.64s' (Errcode: %d)"
 	eng "Error reading file '%-.64s' (errno: %d)"
+	jps "'%-.64s' �t�@�C���̓ǂݍ��݃G���[ (errno: %d)",
 	est "Viga faili '%-.64s' lugemisel (veakood: %d)"
 	fre "Erreur en lecture du fichier '%-.64s' (Errcode: %d)"
 	ger "Fehler beim Lesen der Datei '%-.64s' (Fehler: %d)"
@@ -557,6 +575,7 @@ ER_ERROR_ON_RENAME
 	dan "Fejl ved omd�bning af '%-.64s' til '%-.64s' (Fejlkode: %d)"
 	nla "Fout bij het hernoemen van '%-.64s' naar '%-.64s' (Errcode: %d)"
 	eng "Error on rename of '%-.64s' to '%-.64s' (errno: %d)"
+	jps "'%-.64s' �� '%-.64s' �� rename �ł��܂��� (errno: %d)",
 	est "Viga faili '%-.64s' �mbernimetamisel '%-.64s'-ks (veakood: %d)"
 	fre "Erreur en renommant '%-.64s' en '%-.64s' (Errcode: %d)"
 	ger "Fehler beim Umbenennen von '%-.64s' in '%-.64s' (Fehler: %d)"
@@ -581,6 +600,7 @@ ER_ERROR_ON_WRITE
 	dan "Fejl ved skriving av filen '%-.64s' (Fejlkode: %d)"
 	nla "Fout bij het wegschrijven van file '%-.64s' (Errcode: %d)"
 	eng "Error writing file '%-.64s' (errno: %d)"
+	jps "'%-.64s' �t�@�C�������������ł��܂��� (errno: %d)",
 	est "Viga faili '%-.64s' kirjutamisel (veakood: %d)"
 	fre "Erreur d'�criture du fichier '%-.64s' (Errcode: %d)"
 	ger "Fehler beim Speichern der Datei '%-.64s' (Fehler: %d)"
@@ -605,6 +625,7 @@ ER_FILE_USED
 	dan "'%-.64s' er l�st mod opdateringer"
 	nla "'%-.64s' is geblokeerd tegen veranderingen"
 	eng "'%-.64s' is locked against change"
+	jps "'%-.64s' �̓��b�N����Ă��܂�",
 	est "'%-.64s' on lukustatud muudatuste vastu"
 	fre "'%-.64s' est verrouill� contre les modifications"
 	ger "'%-.64s' ist f�r �nderungen gesperrt"
@@ -629,6 +650,7 @@ ER_FILSORT_ABORT
 	dan "Sortering afbrudt"
 	nla "Sorteren afgebroken"
 	eng "Sort aborted"
+	jps "Sort ���f",
 	est "Sorteerimine katkestatud"
 	fre "Tri alphab�tique abandonn�"
 	ger "Sortiervorgang abgebrochen"
@@ -653,6 +675,7 @@ ER_FORM_NOT_FOUND
 	dan "View '%-.64s' eksisterer ikke for '%-.64s'"
 	nla "View '%-.64s' bestaat niet voor '%-.64s'"
 	eng "View '%-.64s' doesn't exist for '%-.64s'"
+	jps "View '%-.64s' �� '%-.64s' �ɒ�`����Ă��܂���",
 	est "Vaade '%-.64s' ei eksisteeri '%-.64s' jaoks"
 	fre "La vue (View) '%-.64s' n'existe pas pour '%-.64s'"
 	ger "View '%-.64s' existiert f�r '%-.64s' nicht"
@@ -725,6 +748,7 @@ ER_KEY_NOT_FOUND
 	dan "Kan ikke finde posten i '%-.64s'"
 	nla "Kan record niet vinden in '%-.64s'"
 	eng "Can't find record in '%-.64s'"
+	jps "'%-.64s'�̂Ȃ��Ƀ��R�[�h�����t����܂���",
 	est "Ei suuda leida kirjet '%-.64s'-s"
 	fre "Ne peut trouver l'enregistrement dans '%-.64s'"
 	ger "Kann Datensatz nicht finden"
@@ -749,6 +773,7 @@ ER_NOT_FORM_FILE
 	dan "Forkert indhold i: '%-.64s'"
 	nla "Verkeerde info in file: '%-.64s'"
 	eng "Incorrect information in file: '%-.64s'"
+	jps "�t�@�C�� '%-.64s' �� info ���Ԉ���Ă���悤�ł�",
 	est "Vigane informatsioon failis '%-.64s'"
 	fre "Information erronn�e dans le fichier: '%-.64s'"
 	ger "Falsche Information in Datei '%-.64s'"
@@ -773,6 +798,7 @@ ER_NOT_KEYFILE
 	dan "Fejl i indeksfilen til tabellen '%-.64s'; pr�v at reparere den"
 	nla "Verkeerde zoeksleutel file voor tabel: '%-.64s'; probeer het te repareren"
 	eng "Incorrect key file for table '%-.64s'; try to repair it"
+	jps "'%-.64s' �e�[�u���� key file ���Ԉ���Ă���悤�ł�. �C�������Ă�������",
 	est "Tabeli '%-.64s' v�tmefail on vigane; proovi seda parandada"
 	fre "Index corrompu dans la table: '%-.64s'; essayez de le r�parer"
 	ger "Falsche Schl�ssel-Datei f�r Tabelle '%-.64s'. versuche zu reparieren"
@@ -797,6 +823,7 @@ ER_OLD_KEYFILE
 	dan "Gammel indeksfil for tabellen '%-.64s'; reparer den"
 	nla "Oude zoeksleutel file voor tabel '%-.64s'; repareer het!"
 	eng "Old key file for table '%-.64s'; repair it!"
+	jps "'%-.64s' �e�[�u���͌Â��`���� key file �̂悤�ł�; �C�������Ă�������",
 	est "Tabeli '%-.64s' v�tmefail on aegunud; paranda see!"
 	fre "Vieux fichier d'index pour la table '%-.64s'; r�parez le!"
 	ger "Alte Schl�ssel-Datei f�r Tabelle '%-.64s'. Bitte reparieren"
@@ -821,6 +848,7 @@ ER_OPEN_AS_READONLY
 	dan "'%-.64s' er skrivebeskyttet"
 	nla "'%-.64s' is alleen leesbaar"
 	eng "Table '%-.64s' is read only"
+	jps "'%-.64s' �͓ǂݍ��ݐ�p�ł�",
 	est "Tabel '%-.64s' on ainult lugemiseks"
 	fre "'%-.64s' est en lecture seulement"
 	ger "'%-.64s' ist nur lesbar"
@@ -845,6 +873,7 @@ ER_OUTOFMEMORY HY001 S1001
 	dan "Ikke mere hukommelse. Genstart serveren og pr�v igen (mangler %d bytes)"
 	nla "Geen geheugen meer. Herstart server en probeer opnieuw (%d bytes nodig)"
 	eng "Out of memory; restart server and try again (needed %d bytes)"
+	jps "Out of memory. �f�[���������X�^�[�g���Ă݂Ă������� (%d bytes �K�v)",
 	est "M�lu  sai otsa. Proovi MySQL uuesti k�ivitada (puudu j�i %d baiti)"
 	fre "Manque de m�moire. Red�marrez le d�mon et r�-essayez (%d octets n�cessaires)"
 	ger "Kein Speicher vorhanden (%d Bytes ben�tigt). Bitte Server neu starten"
@@ -869,6 +898,7 @@ ER_OUT_OF_SORTMEMORY HY001 S1001
 	dan "Ikke mere sorteringshukommelse. �g sorteringshukommelse (sort buffer size) for serveren"
 	nla "Geen geheugen om te sorteren. Verhoog de server sort buffer size"
 	eng "Out of sort memory; increase server sort buffer size"
+	jps "Out of sort memory. sort buffer size ������Ȃ��悤�ł�.",
 	est "M�lu sai sorteerimisel otsa. Suurenda MySQL-i sorteerimispuhvrit"
 	fre "Manque de m�moire pour le tri. Augmentez-la."
 	ger "Kein Speicher zum Sortieren vorhanden. sort_buffer_size sollte erh�ht werden"
@@ -893,6 +923,7 @@ ER_UNEXPECTED_EOF
 	dan "Uventet afslutning p� fil (eof) ved l�sning af filen '%-.64s' (Fejlkode: %d)"
 	nla "Onverwachte eof gevonden tijdens het lezen van file '%-.64s' (Errcode: %d)"
 	eng "Unexpected EOF found when reading file '%-.64s' (errno: %d)"
+	jps "'%-.64s' �t�@�C����ǂݍ��ݒ��� EOF ���\�����ʏ��Ō���܂���. (errno: %d)",
 	est "Ootamatu failil�pum�rgend faili '%-.64s' lugemisel (veakood: %d)"
 	fre "Fin de fichier inattendue en lisant '%-.64s' (Errcode: %d)"
 	ger "Unerwartetes Ende beim Lesen der Datei '%-.64s' (Fehler: %d)"
@@ -917,6 +948,7 @@ ER_CON_COUNT_ERROR 08004
 	dan "For mange forbindelser (connections)"
 	nla "Te veel verbindingen"
 	eng "Too many connections"
+	jps "�ڑ����������܂�",
 	est "Liiga palju samaaegseid �hendusi"
 	fre "Trop de connections"
 	ger "Zu viele Verbindungen"
@@ -941,6 +973,7 @@ ER_OUT_OF_RESOURCES
 	dan "Udg�et for tr�de/hukommelse"
 	nla "Geen thread geheugen meer; controleer of mysqld of andere processen al het beschikbare geheugen gebruikt. Zo niet, dan moet u wellicht 'ulimit' gebruiken om mysqld toe te laten meer geheugen te benutten, of u kunt extra swap ruimte toevoegen"
 	eng "Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space"
+	jps "Out of memory;  mysqld �����̑��̃v���Z�X���������[��S�Ďg���Ă��邩�m�F���Ă�������. �������[���g���؂��Ă��Ȃ��ꍇ�A'ulimit' ��ݒ肵�� mysqld �̃������[�g�p���E�ʂ𑽂����邩�Aswap space �𑝂₵�Ă݂Ă�������",
 	est "M�lu sai otsa. V�imalik, et aitab swap-i lisamine v�i k�su 'ulimit' abil MySQL-le rohkema m�lu kasutamise lubamine"
 	fre "Manque de 'threads'/m�moire"
 	ger "Kein Speicher mehr vorhanden. Pr�fen Sie, ob mysqld oder ein anderer Prozess allen Speicher verbraucht. Wenn nicht, sollten Sie mit 'ulimit' daf�r sorgen, dass mysqld mehr Speicher benutzen darf, oder mehr Swap-Speicher einrichten"
@@ -965,6 +998,7 @@ ER_BAD_HOST_ERROR 08S01
 	dan "Kan ikke f� v�rtsnavn for din adresse"
 	nla "Kan de hostname niet krijgen van uw adres"
 	eng "Can't get hostname for your address"
+	jps "���� address �� hostname �������܂���.",
 	est "Ei suuda lahendada IP aadressi masina nimeks"
 	fre "Ne peut obtenir de hostname pour votre adresse"
 	ger "Kann Hostnamen f�r diese Adresse nicht erhalten"
@@ -1011,6 +1045,7 @@ ER_DBACCESS_DENIED_ERROR 42000
 	dan "Adgang n�gtet bruger: '%-.32s'@'%-.64s' til databasen '%-.64s'"
 	nla "Toegang geweigerd voor gebruiker: '%-.32s'@'%-.64s' naar database '%-.64s'"
 	eng "Access denied for user '%-.32s'@'%-.64s' to database '%-.64s'"
+	jps "���[�U�[ '%-.32s'@'%-.64s' �� '%-.64s' �f�[�^�x�[�X�ւ̃A�N�Z�X�����ۂ��܂�",
 	est "Ligip��s keelatud kasutajale '%-.32s'@'%-.64s' andmebaasile '%-.64s'"
 	fre "Acc�s refus� pour l'utilisateur: '%-.32s'@'@%-.64s'. Base '%-.64s'"
 	ger "Benutzer '%-.32s'@'%-.64s' hat keine Zugriffsberechtigung f�r Datenbank '%-.64s'"
@@ -1034,6 +1069,7 @@ ER_ACCESS_DENIED_ERROR 28000
 	dan "Adgang n�gtet bruger: '%-.32s'@'%-.64s' (Bruger adgangskode: %s)"
 	nla "Toegang geweigerd voor gebruiker: '%-.32s'@'%-.64s' (Wachtwoord gebruikt: %s)"
 	eng "Access denied for user '%-.32s'@'%-.64s' (using password: %s)"
+	jps "���[�U�[ '%-.32s'@'%-.64s' �����ۂ��܂�.uUsing password: %s)",
 	est "Ligip��s keelatud kasutajale '%-.32s'@'%-.64s' (kasutab parooli: %s)"
 	fre "Acc�s refus� pour l'utilisateur: '%-.32s'@'@%-.64s' (mot de passe: %s)"
 	ger "Benutzer '%-.32s'@'%-.64s' hat keine Zugriffsberechtigung (verwendetes Passwort: %-.64s)"
@@ -1057,6 +1093,7 @@ ER_NO_DB_ERROR 3D000
 	dan "Ingen database valgt"
 	nla "Geen database geselecteerd"
 	eng "No database selected"
+	jps "�f�[�^�x�[�X���I������Ă��܂���.",
 	est "Andmebaasi ei ole valitud"
 	fre "Aucune base n'a �t� s�lectionn�e"
 	ger "Keine Datenbank ausgew�hlt"
@@ -1081,6 +1118,7 @@ ER_UNKNOWN_COM_ERROR 08S01
 	dan "Ukendt kommando"
 	nla "Onbekend commando"
 	eng "Unknown command"
+	jps "���̃R�}���h�͉��H",
 	est "Tundmatu k�sk"
 	fre "Commande inconnue"
 	ger "Unbekannter Befehl"
@@ -1105,6 +1143,7 @@ ER_BAD_NULL_ERROR 23000
 	dan "Kolonne '%-.64s' kan ikke v�re NULL"
 	nla "Kolom '%-.64s' kan niet null zijn"
 	eng "Column '%-.64s' cannot be null"
+	jps "Column '%-.64s' �� null �ɂ͂ł��Ȃ��̂ł�",
 	est "Tulp '%-.64s' ei saa omada nullv��rtust"
 	fre "Le champ '%-.64s' ne peut �tre vide (null)"
 	ger "Feld '%-.64s' darf nicht NULL sein"
@@ -1129,6 +1168,7 @@ ER_BAD_DB_ERROR 42000
 	dan "Ukendt database '%-.64s'"
 	nla "Onbekende database '%-.64s'"
 	eng "Unknown database '%-.64s'"
+	jps "'%-.64s' �Ȃ�ăf�[�^�x�[�X�͒m��܂���.",
 	est "Tundmatu andmebaas '%-.64s'"
 	fre "Base '%-.64s' inconnue"
 	ger "Unbekannte Datenbank '%-.64s'"
@@ -1153,6 +1193,7 @@ ER_TABLE_EXISTS_ERROR 42S01
 	dan "Tabellen '%-.64s' findes allerede"
 	nla "Tabel '%-.64s' bestaat al"
 	eng "Table '%-.64s' already exists"
+	jps "Table '%-.64s' �͊��ɂ���܂�",
 	est "Tabel '%-.64s' juba eksisteerib"
 	fre "La table '%-.64s' existe d�j�"
 	ger "Tabelle '%-.64s' bereits vorhanden"
@@ -1177,6 +1218,7 @@ ER_BAD_TABLE_ERROR 42S02
 	dan "Ukendt tabel '%-.64s'"
 	nla "Onbekende tabel '%-.64s'"
 	eng "Unknown table '%-.64s'"
+	jps "table '%-.64s' �͂���܂���.",
 	est "Tundmatu tabel '%-.64s'"
 	fre "Table '%-.64s' inconnue"
 	ger "Unbekannte Tabelle '%-.64s'"
@@ -1225,6 +1267,7 @@ ER_SERVER_SHUTDOWN 08S01
 	dan "Database nedlukning er i gang"
 	nla "Bezig met het stoppen van de server"
 	eng "Server shutdown in progress"
+	jps "Server �� shutdown ��...",
 	est "Serveri seiskamine k�ib"
 	fre "Arr�t du serveur en cours"
 	ger "Der Server wird heruntergefahren"
@@ -1249,6 +1292,7 @@ ER_BAD_FIELD_ERROR 42S22 S0022
 	dan "Ukendt kolonne '%-.64s' i tabel %s"
 	nla "Onbekende kolom '%-.64s' in %s"
 	eng "Unknown column '%-.64s' in '%-.64s'"
+	jps "'%-.64s' column �� '%-.64s' �ɂ͂���܂���.",
 	est "Tundmatu tulp '%-.64s' '%-.64s'-s"
 	fre "Champ '%-.64s' inconnu dans %s"
 	ger "Unbekanntes Tabellenfeld '%-.64s' in %-.64s"
@@ -1273,6 +1317,7 @@ ER_WRONG_FIELD_WITH_GROUP 42000 S1009
 	dan "Brugte '%-.64s' som ikke var i group by"
 	nla "Opdracht gebruikt '%-.64s' dat niet in de GROUP BY voorkomt"
 	eng "'%-.64s' isn't in GROUP BY"
+	jps "'%-.64s' isn't in GROUP BY",
 	est "'%-.64s' puudub GROUP BY klauslis"
 	fre "'%-.64s' n'est pas dans 'group by'"
 	ger "'%-.64s' ist nicht in GROUP BY vorhanden"
@@ -1363,6 +1408,7 @@ ER_TOO_LONG_IDENT 42000 S1009
 	dan "Navnet '%-.64s' er for langt"
 	nla "Naam voor herkenning '%-.64s' is te lang"
 	eng "Identifier name '%-.100s' is too long"
+	jps "Identifier name '%-.100s' �͒������܂�",
 	est "Identifikaatori '%-.100s' nimi on liiga pikk"
 	fre "Le nom de l'identificateur '%-.64s' est trop long"
 	ger "Name des Bezeichners '%-.64s' ist zu lang"
@@ -1387,6 +1433,7 @@ ER_DUP_FIELDNAME 42S21 S1009
 	dan "Feltnavnet '%-.64s' findes allerede"
 	nla "Dubbele kolom naam '%-.64s'"
 	eng "Duplicate column name '%-.64s'"
+	jps "'%-.64s' �Ƃ��� column ���͏d�����Ă܂�",
 	est "Kattuv tulba nimi '%-.64s'"
 	fre "Nom du champ '%-.64s' d�j� utilis�"
 	ger "Doppelter Spaltenname vorhanden: '%-.64s'"
@@ -1411,6 +1458,7 @@ ER_DUP_KEYNAME 42000 S1009
 	dan "Indeksnavnet '%-.64s' findes allerede"
 	nla "Dubbele zoeksleutel naam '%-.64s'"
 	eng "Duplicate key name '%-.64s'"
+	jps "'%-.64s' �Ƃ��� key �̖��O�͏d�����Ă��܂�",
 	est "Kattuv v�tme nimi '%-.64s'"
 	fre "Nom de clef '%-.64s' d�j� utilis�"
 	ger "Doppelter Name f�r Schl�ssel (Key) vorhanden: '%-.64s'"
@@ -1435,6 +1483,7 @@ ER_DUP_ENTRY 23000 S1009
 	dan "Ens v�rdier '%-.64s' for indeks %d"
 	nla "Dubbele ingang '%-.64s' voor zoeksleutel %d"
 	eng "Duplicate entry '%-.64s' for key %d"
+	jps "'%-.64s' �� key %d �ɂ����ďd�����Ă��܂�",
 	est "Kattuv v��rtus '%-.64s' v�tmele %d"
 	fre "Duplicata du champ '%-.64s' pour la clef %d"
 	ger "Doppelter Eintrag '%-.64s' f�r Schl�ssel %d"
@@ -1482,6 +1531,7 @@ ER_PARSE_ERROR 42000
 	dan "%s n�r '%-.64s' p� linje %d"
 	nla "%s bij '%-.64s' in regel %d"
 	eng "%s near '%-.80s' at line %d"
+	jps "%s  : '%-.80s' �t��  : %d �s��",
 	est "%s '%-.80s' ligidal real %d"
 	fre "%s pr�s de '%-.64s' � la ligne %d"
 	ger "%s bei '%-.80s' in Zeile %d"
@@ -1506,6 +1556,7 @@ ER_EMPTY_QUERY 42000
 	dan "Foresp�rgsel var tom"
 	nla "Query was leeg"
 	eng "Query was empty"
+	jps "Query ����ł�.",
 	est "T�hi p�ring"
 	fre "Query est vide"
 	ger "Leere Abfrage"
@@ -1530,6 +1581,7 @@ ER_NONUNIQ_TABLE 42000 S1009
 	dan "Tabellen/aliaset: '%-.64s' er ikke unikt"
 	nla "Niet unieke waarde tabel/alias: '%-.64s'"
 	eng "Not unique table/alias: '%-.64s'"
+	jps "'%-.64s' �͈�ӂ� table/alias ���ł͂���܂���",
 	est "Ei ole unikaalne tabel/alias '%-.64s'"
 	fre "Table/alias: '%-.64s' non unique"
 	ger "Tabellenname/Alias '%-.64s' nicht eindeutig"
@@ -1577,6 +1629,7 @@ ER_MULTIPLE_PRI_KEY 42000 S1009
 	dan "Flere prim�rn�gler specificeret"
 	nla "Meerdere primaire zoeksleutels gedefinieerd"
 	eng "Multiple primary key defined"
+	jps "������ primary key ����`����܂���",
 	est "Mitut primaarset v�tit ei saa olla"
 	fre "Plusieurs clefs primaires d�finies"
 	ger "Mehrfacher Prim�rschl�ssel (PRIMARY KEY) definiert"
@@ -1601,6 +1654,7 @@ ER_TOO_MANY_KEYS 42000 S1009
 	dan "For mange n�gler specificeret. Kun %d n�gler m� bruges"
 	nla "Teveel zoeksleutels gedefinieerd. Maximaal zijn %d zoeksleutels toegestaan"
 	eng "Too many keys specified; max %d keys allowed"
+	jps "key �̎w�肪�������܂�.  key �͍ő� %d �܂łł�",
 	est "Liiga palju v�tmeid. Maksimaalselt v�ib olla %d v�tit"
 	fre "Trop de clefs sont d�finies. Maximum de %d clefs allou�"
 	ger "Zu viele Schl�ssel definiert. Maximal %d Schl�ssel erlaubt"
@@ -1648,6 +1702,7 @@ ER_TOO_LONG_KEY 42000 S1009
 	dan "Specificeret n�gle var for lang. Maksimal n�glel�ngde er %d"
 	nla "Gespecificeerde zoeksleutel was te lang. De maximale lengte is %d"
 	eng "Specified key was too long; max key length is %d bytes"
+	jps "key ���������܂�. key �̒����͍ő� %d �ł�",
 	est "V�ti on liiga pikk. Maksimaalne v�tmepikkus on %d"
 	fre "La cl� est trop longue. Longueur maximale: %d"
 	ger "Schl�ssel ist zu lang. Die maximale Schl�ssell�nge betr�gt %d"
@@ -1672,6 +1727,7 @@ ER_KEY_COLUMN_DOES_NOT_EXITS 42000 S1009
 	dan "N�glefeltet '%-.64s' eksisterer ikke i tabellen"
 	nla "Zoeksleutel kolom '%-.64s' bestaat niet in tabel"
 	eng "Key column '%-.64s' doesn't exist in table"
+	jps "Key column '%-.64s' ���e�[�u���ɂ���܂���.",
 	est "V�tme tulp '%-.64s' puudub tabelis"
 	fre "La cl� '%-.64s' n'existe pas dans la table"
 	ger "In der Tabelle gibt es keine Schl�sselspalte '%-.64s'"
@@ -1719,6 +1775,7 @@ ER_TOO_BIG_FIELDLENGTH 42000 S1009
 	dan "For stor feltl�ngde for kolonne '%-.64s' (maks = %d). Brug BLOB i stedet"
 	nla "Te grote kolomlengte voor '%-.64s' (max = %d). Maak hiervoor gebruik van het type BLOB"
 	eng "Column length too big for column '%-.64s' (max = %d); use BLOB instead"
+	jps "column '%-.64s' ��,�m�ۂ��� column �̑傫�����������܂�. (�ő� %d �܂�). BLOB �������Ɏg�p���Ă�������.",
 	est "Tulba '%-.64s' pikkus on liiga pikk (maksimaalne pikkus: %d). Kasuta BLOB v�ljat��pi"
 	fre "Champ '%-.64s' trop long (max = %d). Utilisez un BLOB"
 	ger "Feldl�nge f�r Feld '%-.64s' zu gro� (maximal %d). BLOB-Feld verwenden!"
@@ -1743,6 +1800,7 @@ ER_WRONG_AUTO_KEY 42000 S1009
 	dan "Der kan kun specificeres eet AUTO_INCREMENT-felt, og det skal v�re indekseret"
 	nla "Er kan slechts 1 autofield zijn en deze moet als zoeksleutel worden gedefinieerd."
 	eng "Incorrect table definition; there can be only one auto column and it must be defined as a key"
+	jps "�e�[�u���̒�`���Ⴂ�܂�; there can be only one auto column and it must be defined as a key",
 	est "Vigane tabelikirjeldus; Tabelis tohib olla �ks auto_increment t��pi tulp ning see peab olema defineeritud v�tmena"
 	fre "Un seul champ automatique est permis et il doit �tre index�"
 	ger "Falsche Tabellendefinition. Es darf nur ein Auto-Feld geben und dieses muss als Schl�ssel definiert werden"
@@ -1767,6 +1825,7 @@ ER_READY
 	dan "%s: klar til tilslutninger"
 	nla "%s: klaar voor verbindingen"
 	eng "%s: ready for connections.\nVersion: '%s'  socket: '%s'  port: %d"
+	jps "%s: ��������",
 	est "%s: ootab �hendusi"
 	fre "%s: Pr�t pour des connections"
 	ger "%-.64s: Bereit f�r Verbindungen"
@@ -1814,6 +1873,7 @@ ER_GOT_SIGNAL
 	dan "%s: Fangede signal %d. Afslutter!!\n"
 	nla "%s: Signaal %d. Systeem breekt af!\n"
 	eng "%s: Got signal %d. Aborting!\n"
+	jps "%s: Got signal %d. ���f!\n",
 	est "%s: sain signaali %d. L�petan!\n"
 	fre "%s: Re�u le signal %d. Abandonne!\n"
 	ger "%-.64s: Signal %d erhalten. Abbruch!\n"
@@ -1838,6 +1898,7 @@ ER_SHUTDOWN_COMPLETE
 	dan "%s: Server lukket\n"
 	nla "%s: Afsluiten afgerond\n"
 	eng "%s: Shutdown complete\n"
+	jps "%s: Shutdown ����\n",
 	est "%s: L�pp\n"
 	fre "%s: Arr�t du serveur termin�\n"
 	ger "%-.64s: Heruntergefahren (shutdown)\n"
@@ -1862,6 +1923,7 @@ ER_FORCING_CLOSE 08S01
 	dan "%s: Forceret nedlukning af tr�d: %ld  bruger: '%-.64s'\n"
 	nla "%s: Afsluiten afgedwongen van thread %ld  gebruiker: '%-.64s'\n"
 	eng "%s: Forcing close of thread %ld  user: '%-.32s'\n"
+	jps "%s: �X���b�h %ld �����I��  user: '%-.64s'\n",
 	est "%s: Sulgen j�uga l�ime %ld  kasutaja: '%-.32s'\n"
 	fre "%s: Arr�t forc� de la t�che (thread) %ld  utilisateur: '%-.64s'\n"
 	ger "%s: Thread %ld zwangsweise beendet. Benutzer: '%-.32s'\n"
@@ -1886,6 +1948,7 @@ ER_IPSOCK_ERROR 08S01
 	dan "Kan ikke oprette IP socket"
 	nla "Kan IP-socket niet openen"
 	eng "Can't create IP socket"
+	jps "IP socket �����܂���",
 	est "Ei suuda luua IP socketit"
 	fre "Ne peut cr�er la connection IP (socket)"
 	ger "Kann IP-Socket nicht erzeugen"
@@ -1910,6 +1973,7 @@ ER_NO_SUCH_INDEX 42S12 S1009
 	dan "Tabellen '%-.64s' har ikke den n�gle, som blev brugt i CREATE INDEX. Genopret tabellen"
 	nla "Tabel '%-.64s' heeft geen INDEX zoals deze gemaakt worden met CREATE INDEX. Maak de tabel opnieuw"
 	eng "Table '%-.64s' has no index like the one used in CREATE INDEX; recreate the table"
+	jps "Table '%-.64s' �͂��̂悤�� index �������Ă��܂���(CREATE INDEX ���s���Ɏw�肳��Ă��܂���). �e�[�u������蒼���Ă�������",
 	est "Tabelil '%-.64s' puuduvad v�tmed. Loo tabel uuesti"
 	fre "La table '%-.64s' n'a pas d'index comme celle utilis�e dans CREATE INDEX. Recr�ez la table"
 	ger "Tabelle '%-.64s' besitzt keinen wie den in CREATE INDEX verwendeten Index. Index neu anlegen"
@@ -1981,6 +2045,7 @@ ER_TEXTFILE_NOT_READABLE
 	dan "Filen '%-.64s' skal v�re i database-folderen og kunne l�ses af alle"
 	nla "Het bestand '%-.64s' dient in de database directory voor the komen of leesbaar voor iedereen te zijn."
 	eng "The file '%-.64s' must be in the database directory or be readable by all"
+	jps "�t�@�C�� '%-.64s' �� databse �� directory �ɂ��邩�S�Ẵ��[�U�[���ǂ߂�悤�ɋ��‚���Ă��Ȃ���΂Ȃ�܂���.",
 	est "Fail '%-.64s' peab asuma andmebaasi kataloogis v�i olema k�igile loetav"
 	fre "Le fichier '%-.64s' doit �tre dans le r�pertoire de la base et lisible par tous"
 	ger "Datei '%-.64s' muss im Datenbank-Verzeichnis vorhanden und lesbar f�r alle sein"
@@ -2005,6 +2070,7 @@ ER_FILE_EXISTS_ERROR
 	dan "Filen '%-.64s' eksisterer allerede"
 	nla "Het bestand '%-.64s' bestaat reeds"
 	eng "File '%-.80s' already exists"
+	jps "File '%-.64s' �͊��ɑ��݂��܂�",
 	est "Fail '%-.80s' juba eksisteerib"
 	fre "Le fichier '%-.64s' existe d�j�"
 	ger "Datei '%-.64s' bereits vorhanden"
@@ -2029,6 +2095,7 @@ ER_LOAD_INFO
 	dan "Poster: %ld  Fjernet: %ld  Sprunget over: %ld  Advarsler: %ld"
 	nla "Records: %ld  Verwijderd: %ld  Overgeslagen: %ld  Waarschuwingen: %ld"
 	eng "Records: %ld  Deleted: %ld  Skipped: %ld  Warnings: %ld"
+	jps "���R�[�h��: %ld  �폜: %ld  Skipped: %ld  Warnings: %ld",
 	est "Kirjeid: %ld  Kustutatud: %ld  Vahele j�etud: %ld  Hoiatusi: %ld"
 	fre "Enregistrements: %ld  Effac�s: %ld  Non trait�s: %ld  Avertissements: %ld"
 	ger "Datens�tze: %ld  Gel�scht: %ld  Ausgelassen: %ld  Warnungen: %ld"
@@ -2053,6 +2120,7 @@ ER_ALTER_INFO
 	dan "Poster: %ld  Ens: %ld"
 	nla "Records: %ld  Dubbel: %ld"
 	eng "Records: %ld  Duplicates: %ld"
+	jps "���R�[�h��: %ld  �d��: %ld",
 	est "Kirjeid: %ld  Kattuvaid: %ld"
 	fre "Enregistrements: %ld  Doublons: %ld"
 	ger "Datens�tze: %ld  Duplikate: %ld"
@@ -2101,6 +2169,7 @@ ER_CANT_REMOVE_ALL_FIELDS 42000
 	dan "Man kan ikke slette alle felter med ALTER TABLE. Brug DROP TABLE i stedet."
 	nla "Het is niet mogelijk alle velden te verwijderen met ALTER TABLE. Gebruik a.u.b. DROP TABLE hiervoor!"
 	eng "You can't delete all columns with ALTER TABLE; use DROP TABLE instead"
+	jps "ALTER TABLE �őS�Ă� column �͍폜�ł��܂���. DROP TABLE ���g�p���Ă�������",
 	est "ALTER TABLE kasutades ei saa kustutada k�iki tulpasid. Kustuta tabel DROP TABLE abil"
 	fre "Vous ne pouvez effacer tous les champs avec ALTER TABLE. Utilisez DROP TABLE"
 	ger "Mit ALTER TABLE k�nnen nicht alle Felder auf einmal gel�scht werden. Daf�r DROP TABLE verwenden"
@@ -2125,6 +2194,7 @@ ER_CANT_DROP_FIELD_OR_KEY 42000
 	dan "Kan ikke udf�re DROP '%-.64s'. Unders�g om feltet/n�glen eksisterer."
 	nla "Kan '%-.64s' niet weggooien. Controleer of het veld of de zoeksleutel daadwerkelijk bestaat."
 	eng "Can't DROP '%-.64s'; check that column/key exists"
+	jps "'%-.64s' ��j���ł��܂���ł���; check that column/key exists",
 	est "Ei suuda kustutada '%-.64s'. Kontrolli kas tulp/v�ti eksisteerib"
 	fre "Ne peut effacer (DROP) '%-.64s'. V�rifiez s'il existe"
 	ger "Kann '%-.64s' nicht l�schen. Existiert das Feld / der Schl�ssel?"
@@ -2149,6 +2219,7 @@ ER_INSERT_INFO
 	dan "Poster: %ld  Ens: %ld  Advarsler: %ld"
 	nla "Records: %ld  Dubbel: %ld  Waarschuwing: %ld"
 	eng "Records: %ld  Duplicates: %ld  Warnings: %ld"
+	jps "���R�[�h��: %ld  �d����: %ld  Warnings: %ld",
 	est "Kirjeid: %ld  Kattuvaid: %ld  Hoiatusi: %ld"
 	fre "Enregistrements: %ld  Doublons: %ld  Avertissements: %ld"
 	ger "Datens�tze: %ld  Duplikate: %ld  Warnungen: %ld"
@@ -2179,6 +2250,7 @@ ER_NO_SUCH_THREAD
 	dan "Ukendt tr�d id: %lu"
 	nla "Onbekend thread id: %lu"
 	eng "Unknown thread id: %lu"
+	jps "thread id: %lu �͂���܂���",
 	est "Tundmatu l�im: %lu"
 	fre "Num�ro de t�che inconnu: %lu"
 	ger "Unbekannte Thread-ID: %lu"
@@ -2203,6 +2275,7 @@ ER_KILL_DENIED_ERROR
 	dan "Du er ikke ejer af tr�den %lu"
 	nla "U bent geen bezitter van thread %lu"
 	eng "You are not owner of thread %lu"
+	jps "thread %lu �̃I�[�i�[�ł͂���܂���",
 	est "Ei ole l�ime %lu omanik"
 	fre "Vous n'�tes pas propri�taire de la t�che no: %lu"
 	ger "Sie sind nicht Eigent�mer von Thread %lu"
@@ -2296,6 +2369,7 @@ ER_TABLE_NOT_LOCKED_FOR_WRITE
 	dan "Tabellen '%-.64s' var l�st med READ l�s og kan ikke opdateres"
 	nla "Tabel '%-.64s' was gelocked met een lock om te lezen. Derhalve kunnen geen wijzigingen worden opgeslagen."
 	eng "Table '%-.64s' was locked with a READ lock and can't be updated"
+	jps "Table '%-.64s' �� READ lock �ɂȂ��Ă��āA�X�V�͂ł��܂���",
 	est "Tabel '%-.64s' on lukustatud READ lukuga ning ei ole muudetav"
 	fre "Table '%-.64s' verrouill�e lecture (READ): modification impossible"
 	ger "Tabelle '%-.64s' ist mit Lesesperre versehen und kann nicht aktualisiert werden"
@@ -2320,6 +2394,7 @@ ER_TABLE_NOT_LOCKED
 	dan "Tabellen '%-.64s' var ikke l�st med LOCK TABLES"
 	nla "Tabel '%-.64s' was niet gelocked met LOCK TABLES"
 	eng "Table '%-.64s' was not locked with LOCK TABLES"
+	jps "Table '%-.64s' �� LOCK TABLES �ɂ���ă��b�N����Ă��܂���",
 	est "Tabel '%-.64s' ei ole lukustatud k�suga LOCK TABLES"
 	fre "Table '%-.64s' non verrouill�e: utilisez LOCK TABLES"
 	ger "Tabelle '%-.64s' wurde nicht mit LOCK TABLES gesperrt"
@@ -2368,6 +2443,7 @@ ER_WRONG_DB_NAME 42000
 	dan "Ugyldigt database navn '%-.64s'"
 	nla "Databasenaam '%-.64s' is niet getoegestaan"
 	eng "Incorrect database name '%-.100s'"
+	jps "�w�肵�� database �� '%-.100s' ���Ԉ���Ă��܂�",
 	est "Vigane andmebaasi nimi '%-.100s'"
 	fre "Nom de base de donn�e ill�gal: '%-.64s'"
 	ger "Unerlaubter Datenbankname '%-.64s'"
@@ -2392,6 +2468,7 @@ ER_WRONG_TABLE_NAME 42000
 	dan "Ugyldigt tabel navn '%-.64s'"
 	nla "Niet toegestane tabelnaam '%-.64s'"
 	eng "Incorrect table name '%-.100s'"
+	jps "�w�肵�� table �� '%-.100s' �͂܂������Ă��܂�",
 	est "Vigane tabeli nimi '%-.100s'"
 	fre "Nom de table ill�gal: '%-.64s'"
 	ger "Unerlaubter Tabellenname '%-.64s'"
@@ -2620,6 +2697,7 @@ ER_TABLE_MUST_HAVE_COLUMNS 42000
 	dan "En tabel skal have mindst een kolonne"
 	nla "Een tabel moet minstens 1 kolom bevatten"
 	eng "A table must have at least 1 column"
+	jps "�e�[�u���͍Œ� 1 �‚� column ���K�v�ł�",
 	est "Tabelis peab olema v�hemalt �ks tulp"
 	fre "Une table doit comporter au moins une colonne"
 	ger "Eine Tabelle mu� mindestens 1 Spalte besitzen"
@@ -2641,6 +2719,7 @@ ER_RECORD_FILE_FULL
 	dan "Tabellen '%-.64s' er fuld"
 	nla "De tabel '%-.64s' is vol"
 	eng "The table '%-.64s' is full"
+	jps "table '%-.64s' �͂����ς��ł�",
 	est "Tabel '%-.64s' on t�is"
 	fre "La table '%-.64s' est pleine"
 	ger "Tabelle '%-.64s' ist voll"
@@ -2662,6 +2741,7 @@ ER_UNKNOWN_CHARACTER_SET 42000
 	dan "Ukendt tegns�t: '%-.64s'"
 	nla "Onbekende character set: '%-.64s'"
 	eng "Unknown character set: '%-.64s'"
+	jps "character set '%-.64s' �̓T�|�[�g���Ă��܂���",
 	est "Vigane kooditabel '%-.64s'"
 	fre "Jeu de caract�res inconnu: '%-.64s'"
 	ger "Unbekannter Zeichensatz: '%-.64s'"
@@ -2683,6 +2763,7 @@ ER_TOO_MANY_TABLES
 	dan "For mange tabeller. MySQL kan kun bruge %d tabeller i et join"
 	nla "Teveel tabellen. MySQL kan slechts %d tabellen in een join bevatten"
 	eng "Too many tables; MySQL can only use %d tables in a join"
+	jps "�e�[�u�����������܂�; MySQL can only use %d tables in a join",
 	est "Liiga palju tabeleid. MySQL suudab JOINiga �hendada kuni %d tabelit"
 	fre "Trop de tables. MySQL ne peut utiliser que %d tables dans un JOIN"
 	ger "Zu viele Tabellen. MySQL kann in einem Join maximal %d Tabellen verwenden"
@@ -2704,6 +2785,7 @@ ER_TOO_MANY_FIELDS
 	dan "For mange felter"
 	nla "Te veel velden"
 	eng "Too many columns"
+	jps "column ���������܂�",
 	est "Liiga palju tulpasid"
 	fre "Trop de champs"
 	ger "Zu viele Spalten"
@@ -2725,6 +2807,7 @@ ER_TOO_BIG_ROWSIZE 42000
 	dan "For store poster. Max post st�rrelse, uden BLOB's, er %d. Du m� lave nogle felter til BLOB's"
 	nla "Rij-grootte is groter dan toegestaan. Maximale rij grootte, blobs niet meegeteld, is %d. U dient sommige velden in blobs te veranderen."
 	eng "Row size too large. The maximum row size for the used table type, not counting BLOBs, is %ld. You have to change some columns to TEXT or BLOBs"
+	jps "row size ���傫�����܂�. BLOB ���܂܂Ȃ��ꍇ�� row size �̍ő�� %d �ł�. �����‚��� field �� BLOB �ɕς��Ă�������.",
 	est "Liiga pikk kirje. Kirje maksimumpikkus arvestamata BLOB-t��pi v�lju on %d. Muuda m�ned v�ljad BLOB-t��pi v�ljadeks"
 	fre "Ligne trop grande. Le taille maximale d'une ligne, sauf les BLOBs, est %d. Changez le type de quelques colonnes en BLOB"
 	ger "Zeilenl�nge zu gro�. Die maximale Spaltenl�nge f�r den verwendeten Tabellentyp (ohne BLOB-Felder) betr�gt %d. Einige Felder m�ssen in BLOB oder TEXT umgewandelt werden"
@@ -2746,6 +2829,7 @@ ER_STACK_OVERRUN
 	dan "Thread stack brugt:  Brugt: %ld af en %ld stak.  Brug 'mysqld -O thread_stack=#' for at allokere en st�rre stak om n�dvendigt"
 	nla "Thread stapel overrun:  Gebruikte: %ld van een %ld stack. Gebruik 'mysqld -O thread_stack=#' om een grotere stapel te definieren (indien noodzakelijk)."
 	eng "Thread stack overrun:  Used: %ld of a %ld stack.  Use 'mysqld -O thread_stack=#' to specify a bigger stack if needed"
+	jps "Thread stack overrun:  Used: %ld of a %ld stack.  �X�^�b�N�̈�𑽂��Ƃ肽���ꍇ�A'mysqld -O thread_stack=#' �Ǝw�肵�Ă�������",
 	fre "D�bordement de la pile des t�ches (Thread stack). Utilis�es: %ld pour une pile de %ld.  Essayez 'mysqld -O thread_stack=#' pour indiquer une plus grande valeur"
 	ger "Thread-Stack-�berlauf. Benutzt: %ld von %ld Stack. 'mysqld -O thread_stack=#' verwenen, um notfalls einen gr��eren Stack anzulegen"
 	greek "Stack overrun ��� thread:  Used: %ld of a %ld stack.  �������� ��������������� 'mysqld -O thread_stack=#' ��� �� ������� ��� ���������� stack �� ����������"
@@ -2785,6 +2869,7 @@ ER_NULL_COLUMN_IN_INDEX 42000
 	dan "Kolonne '%-.32s' bruges som UNIQUE eller INDEX men er ikke defineret som NOT NULL"
 	nla "Kolom '%-.64s' wordt gebruikt met UNIQUE of INDEX maar is niet gedefinieerd als NOT NULL"
 	eng "Column '%-.64s' is used with UNIQUE or INDEX but is not defined as NOT NULL"
+	jps "Column '%-.64s' �� UNIQUE �� INDEX �Ŏg�p����܂���. ���̃J������ NOT NULL �ƒ�`����Ă��܂���.",
 	est "Tulp '%-.64s' on kasutusel indeksina, kuid ei ole m��ratletud kui NOT NULL"
 	fre "La colonne '%-.32s' fait partie d'un index UNIQUE ou INDEX mais n'est pas d�finie comme NOT NULL"
 	ger "Spalte '%-.64s' wurde mit UNIQUE oder INDEX benutzt, ist aber nicht als NOT NULL definiert"
@@ -2809,6 +2894,7 @@ ER_CANT_FIND_UDF
 	dan "Kan ikke l�se funktionen '%-.64s'"
 	nla "Kan functie '%-.64s' niet laden"
 	eng "Can't load function '%-.64s'"
+	jps "function '%-.64s' �� ���[�h�ł��܂���",
 	est "Ei suuda avada funktsiooni '%-.64s'"
 	fre "Imposible de charger la fonction '%-.64s'"
 	ger "Kann Funktion '%-.64s' nicht laden"
@@ -2830,6 +2916,7 @@ ER_CANT_INITIALIZE_UDF
 	dan "Kan ikke starte funktionen '%-.64s'; %-.80s"
 	nla "Kan functie '%-.64s' niet initialiseren; %-.80s"
 	eng "Can't initialize function '%-.64s'; %-.80s"
+	jps "function '%-.64s' ���������ł��܂���; %-.80s",
 	est "Ei suuda algv��rtustada funktsiooni '%-.64s'; %-.80s"
 	fre "Impossible d'initialiser la fonction '%-.64s'; %-.80s"
 	ger "Kann Funktion '%-.64s' nicht initialisieren: %-.80s"
@@ -2851,6 +2938,7 @@ ER_UDF_NO_PATHS
 	dan "Angivelse af sti ikke tilladt for delt bibliotek"
 	nla "Geen pad toegestaan voor shared library"
 	eng "No paths allowed for shared library"
+	jps "shared library �ւ̃p�X���ʂ��Ă��܂���",
 	est "Teegi nimes ei tohi olla kataloogi"
 	fre "Chemin interdit pour les biblioth�ques partag�es"
 	ger "Keine Pfade gestattet f�r Shared Library"
@@ -2872,6 +2960,7 @@ ER_UDF_EXISTS
 	dan "Funktionen '%-.64s' findes allerede"
 	nla "Functie '%-.64s' bestaat reeds"
 	eng "Function '%-.64s' already exists"
+	jps "Function '%-.64s' �͊��ɒ�`����Ă��܂�",
 	est "Funktsioon '%-.64s' juba eksisteerib"
 	fre "La fonction '%-.64s' existe d�j�"
 	ger "Funktion '%-.64s' existiert schon"
@@ -2893,6 +2982,7 @@ ER_CANT_OPEN_LIBRARY
 	dan "Kan ikke �bne delt bibliotek '%-.64s' (errno: %d %s)"
 	nla "Kan shared library '%-.64s' niet openen (Errcode: %d %s)"
 	eng "Can't open shared library '%-.64s' (errno: %d %-.64s)"
+	jps "shared library '%-.64s' ���J�������ł��܂��� (errno: %d %s)",
 	est "Ei suuda avada jagatud teeki '%-.64s' (veakood: %d %-.64s)"
 	fre "Impossible d'ouvrir la biblioth�que partag�e '%-.64s' (errno: %d %s)"
 	ger "Kann Shared Library '%-.64s' nicht �ffnen (Fehler: %d %-.64s)"
@@ -2917,6 +3007,7 @@ ER_CANT_FIND_DL_ENTRY
 	dan "Kan ikke finde funktionen '%-.64s' i bibliotek'"
 	nla "Kan functie '%-.64s' niet in library vinden"
 	eng "Can't find function '%-.64s' in library'"
+	jps "function '%-.64s' �����C�u�����[���Ɍ��t���鎖���ł��܂���",
 	est "Ei leia funktsiooni '%-.64s' antud teegis"
 	fre "Impossible de trouver la fonction '%-.64s' dans la biblioth�que'"
 	ger "Kann Funktion '%-.64s' in der Library nicht finden"
@@ -2938,6 +3029,7 @@ ER_FUNCTION_NOT_DEFINED
 	dan "Funktionen '%-.64s' er ikke defineret"
 	nla "Functie '%-.64s' is niet gedefinieerd"
 	eng "Function '%-.64s' is not defined"
+	jps "Function '%-.64s' �͒�`����Ă��܂���",
 	est "Funktsioon '%-.64s' ei ole defineeritud"
 	fre "La fonction '%-.64s' n'est pas d�finie"
 	ger "Funktion '%-.64s' ist nicht definiert"
@@ -2959,6 +3051,7 @@ ER_HOST_IS_BLOCKED
 	dan "V�rten er blokeret p� grund af mange fejlforesp�rgsler. L�s op med 'mysqladmin flush-hosts'"
 	nla "Host '%-.64s' is geblokkeeerd vanwege te veel verbindings fouten. Deblokkeer met 'mysqladmin flush-hosts'"
 	eng "Host '%-.64s' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'"
+	jps "Host '%-.64s' �� many connection error �̂��߁A���ۂ���܂���.  'mysqladmin flush-hosts' �ʼn������Ă�������",
 	est "Masin '%-.64s' on blokeeritud hulgaliste �hendusvigade t�ttu. Blokeeringu saab t�histada 'mysqladmin flush-hosts' k�suga"
 	fre "L'h�te '%-.64s' est bloqu� � cause d'un trop grand nombre d'erreur de connection. D�bloquer le par 'mysqladmin flush-hosts'"
 	ger "Host '%-.64s' blockiert wegen zu vieler Verbindungsfehler. Aufheben der Blockierung mit 'mysqladmin flush-hosts'"
@@ -2979,6 +3072,7 @@ ER_HOST_NOT_PRIVILEGED
 	dan "V�rten '%-.64s' kan ikke tilkoble denne MySQL-server"
 	nla "Het is host '%-.64s' is niet toegestaan verbinding te maken met deze MySQL server"
 	eng "Host '%-.64s' is not allowed to connect to this MySQL server"
+	jps "Host '%-.64s' �� MySQL server �ɐڑ������‚���Ă��܂���",
 	est "Masinal '%-.64s' puudub ligip��s sellele MySQL serverile"
 	fre "Le h�te '%-.64s' n'est pas authoris� � se connecter � ce serveur MySQL"
 	ger "Host '%-.64s' hat keine Berechtigung, sich mit diesem MySQL-Server zu verbinden"
@@ -2999,6 +3093,7 @@ ER_PASSWORD_ANONYMOUS_USER 42000
 	dan "Du bruger MySQL som anonym bruger. Anonyme brugere m� ikke �ndre adgangskoder"
 	nla "U gebruikt MySQL als anonieme gebruiker en deze mogen geen wachtwoorden wijzigen"
 	eng "You are using MySQL as an anonymous user and anonymous users are not allowed to change passwords"
+	jps "MySQL �� anonymous users �Ŏg�p���Ă����Ԃł́A�p�X���[�h�̕ύX�͂ł��܂���",
 	est "Te kasutate MySQL-i anon��mse kasutajana, kelledel pole parooli muutmise �igust"
 	fre "Vous utilisez un utilisateur anonyme et les utilisateurs anonymes ne sont pas autoris�s � changer les mots de passe"
 	ger "Sie benutzen MySQL als anonymer Benutzer und d�rfen daher keine Passw�rter �ndern"
@@ -3019,6 +3114,7 @@ ER_PASSWORD_NOT_ALLOWED 42000
 	dan "Du skal have tilladelse til at opdatere tabeller i MySQL databasen for at �ndre andres adgangskoder"
 	nla "U moet tabel update priveleges hebben in de mysql database om wachtwoorden voor anderen te mogen wijzigen"
 	eng "You must have privileges to update tables in the mysql database to be able to change passwords for others"
+	jps "���̃��[�U�[�̃p�X���[�h��ύX���邽�߂ɂ�, mysql �f�[�^�x�[�X�ɑ΂��� update �̋��‚��Ȃ���΂Ȃ�܂���.",
 	est "Teiste paroolide muutmiseks on n�utav tabelite muutmis�igus 'mysql' andmebaasis"
 	fre "Vous devez avoir le privil�ge update sur les tables de la base de donn�e mysql pour pouvoir changer les mots de passe des autres"
 	ger "Sie ben�tigen die Berechtigung zum Aktualisieren von Tabellen in der Datenbank 'mysql', um die Passw�rter anderer Benutzer �ndern zu k�nnen"
@@ -3058,6 +3154,7 @@ ER_UPDATE_INFO
 	dan "Poster fundet: %ld  �ndret: %ld  Advarsler: %ld"
 	nla "Passende rijen: %ld  Gewijzigd: %ld  Waarschuwingen: %ld"
 	eng "Rows matched: %ld  Changed: %ld  Warnings: %ld"
+	jps "��v��(Rows matched): %ld  �ύX: %ld  Warnings: %ld",
 	est "Sobinud kirjeid: %ld  Muudetud: %ld  Hoiatusi: %ld"
 	fre "Enregistrements correspondants: %ld  Modifi�s: %ld  Warnings: %ld"
 	ger "Datens�tze gefunden: %ld  Ge�ndert: %ld  Warnungen: %ld"
@@ -3077,6 +3174,7 @@ ER_CANT_CREATE_THREAD
 	dan "Kan ikke danne en ny tr�d (fejl nr. %d). Hvis computeren ikke er l�bet t�r for hukommelse, kan du se i brugervejledningen for en mulig operativ-system - afh�ngig fejl"
 	nla "Kan geen nieuwe thread aanmaken (Errcode: %d). Indien er geen tekort aan geheugen is kunt u de handleiding consulteren over een mogelijke OS afhankelijke fout"
 	eng "Can't create a new thread (errno %d); if you are not out of available memory, you can consult the manual for a possible OS-dependent bug"
+	jps "�V�K�ɃX���b�h�����܂���ł��� (errno %d). �����ő�g�p���ƒ������[�����z���Ă��Ȃ��̂ɃG���[���������Ă���Ȃ�, �}�j���A���̒����� 'possible OS-dependent bug' �Ƃ���������T���Ă��݂Ă�����.",
 	est "Ei suuda luua uut l�ime (veakood %d). Kui m�lu ei ole otsas, on t�en�oliselt tegemist operatsioonis�steemispetsiifilise veaga"
 	fre "Impossible de cr�er une nouvelle t�che (errno %d). S'il reste de la m�moire libre, consultez le manual pour trouver un �ventuel bug d�pendant de l'OS"
 	ger "Kann keinen neuen Thread erzeugen (Fehler: %d). Sollte noch Speicher verf�gbar sein, bitte im Handbuch wegen m�glicher Fehler im Betriebssystem nachschlagen"
@@ -3138,6 +3236,7 @@ ER_INVALID_USE_OF_NULL 22004
 	dan "Forkert brug af nulv�rdi (NULL)"
 	nla "Foutief gebruik van de NULL waarde"
 	eng "Invalid use of NULL value"
+	jps "NULL �l�̎g�p���@���s�K�؂ł�",
 	est "NULL v��rtuse v��rkasutus"
 	fre "Utilisation incorrecte de la valeur NULL"
 	ger "Unerlaubte Verwendung eines NULL-Werts"
@@ -3193,6 +3292,7 @@ ER_NONEXISTING_GRANT 42000
 	dan "Denne tilladelse findes ikke for brugeren '%-.32s' p� v�rt '%-.64s'"
 	nla "Deze toegang (GRANT) is niet toegekend voor gebruiker '%-.32s' op host '%-.64s'"
 	eng "There is no such grant defined for user '%-.32s' on host '%-.64s'"
+	jps "���[�U�[ '%-.32s' (�z�X�g '%-.64s' �̃��[�U�[) �͋��‚���Ă��܂���",
 	est "Sellist �igust ei ole defineeritud kasutajale '%-.32s' masinast '%-.64s'"
 	fre "Un tel droit n'est pas d�fini pour l'utilisateur '%-.32s' sur l'h�te '%-.64s'"
 	ger "F�r Benutzer '%-.32s' auf Host '%-.64s' gibt es keine solche Berechtigung"
@@ -3212,6 +3312,7 @@ ER_TABLEACCESS_DENIED_ERROR 42000
 	dan "%-.16s-kommandoen er ikke tilladt for brugeren '%-.32s'@'%-.64s' for tabellen '%-.64s'"
 	nla "%-.16s commando geweigerd voor gebruiker: '%-.32s'@'%-.64s' voor tabel '%-.64s'"
 	eng "%-.16s command denied to user '%-.32s'@'%-.64s' for table '%-.64s'"
+	jps "�R�}���h %-.16s �� ���[�U�[ '%-.32s'@'%-.64s' ,�e�[�u�� '%-.64s' �ɑ΂��ċ��‚���Ă��܂���",
 	est "%-.16s k�sk ei ole lubatud kasutajale '%-.32s'@'%-.64s' tabelis '%-.64s'"
 	fre "La commande '%-.16s' est interdite � l'utilisateur: '%-.32s'@'@%-.64s' sur la table '%-.64s'"
 	ger "%-.16s Befehl nicht erlaubt f�r Benutzer '%-.32s'@'%-.64s' und f�r Tabelle '%-.64s'"
@@ -3231,6 +3332,7 @@ ER_COLUMNACCESS_DENIED_ERROR 42000
 	dan "%-.16s-kommandoen er ikke tilladt for brugeren '%-.32s'@'%-.64s' for kolonne '%-.64s' in tabellen '%-.64s'"
 	nla "%-.16s commando geweigerd voor gebruiker: '%-.32s'@'%-.64s' voor kolom '%-.64s' in tabel '%-.64s'"
 	eng "%-.16s command denied to user '%-.32s'@'%-.64s' for column '%-.64s' in table '%-.64s'"
+	jps "�R�}���h %-.16s �� ���[�U�[ '%-.32s'@'%-.64s'\n �J���� '%-.64s' �e�[�u�� '%-.64s' �ɑ΂��ċ��‚���Ă��܂���",
 	est "%-.16s k�sk ei ole lubatud kasutajale '%-.32s'@'%-.64s' tulbale '%-.64s' tabelis '%-.64s'"
 	fre "La commande '%-.16s' est interdite � l'utilisateur: '%-.32s'@'@%-.64s' sur la colonne '%-.64s' de la table '%-.64s'"
 	ger "%-.16s Befehl nicht erlaubt f�r Benutzer '%-.32s'@'%-.64s' und Spalte '%-.64s' in Tabelle '%-.64s'"
diff --git a/support-files/mysql-log-rotate.sh b/support-files/mysql-log-rotate.sh
index a1153c66f40..0ee78b0f7ca 100644
--- a/support-files/mysql-log-rotate.sh
+++ b/support-files/mysql-log-rotate.sh
@@ -1,4 +1,9 @@
-# This logname is set in mysql.server.sh that ends up in /etc/rc.d/init.d/mysql
+# This logname can be set in /etc/my.cnf
+# by setting the variable "err-log"
+# in the [safe_mysqld] section as follows:
+#
+# [safe_mysqld]
+# err-log=@localstatedir@/mysqld.log
 #
 # If the root user has a password you have to create a
 # /root/.my.cnf configuration file with the following
@@ -22,8 +27,10 @@
         compress
     postrotate
 	# just if mysqld is really running
-	if test -n "`ps acx|grep mysqld`"; then
-	        @bindir@/mysqladmin flush-logs
+	if test -x @bindir@/mysqladmin && \
+	   @bindir@/mysqladmin ping &>/dev/null
+	then
+	   @bindir@/mysqladmin flush-logs
 	fi
     endscript
 }