From 77bba943cb0f51d96acd92e90f38281e9b3f52d5 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 13 Jan 2005 09:05:23 -0800 Subject: [PATCH 01/18] 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 Date: Tue, 18 Jan 2005 17:26:05 +0300 Subject: [PATCH 02/18] 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 c148946d03c17a996f6819af3e713af14ad17f23 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 18 Jan 2005 17:35:32 +0100 Subject: [PATCH 03/18] - small improvement for the logrotate config file (patch found in the SUSE source RPM): use "mysqladmin ping" instead of grepping the process list for the mysqld binary (should be more portable than relying on the "ps" options support-files/mysql-log-rotate.sh: - small improvement (patch found in the SUSE source RPM): use "mysqladmin ping" instead of grepping the process list for the mysqld binary (should be more portable than relying on the "ps" options --- support-files/mysql-log-rotate.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) 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 } From 97d30585c5c2ff85b7d0404f02c2c32e8facbe2f Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 18 Jan 2005 23:50:42 +0300 Subject: [PATCH 04/18] Fix for valgrind failures in get_mm_tree. mysql-test/r/join_outer.result: Corrected table names mysql-test/t/join_outer.test: Corrected table names sql/item_cmpfunc.h: Fix for valgrind failure (unitialized read Item_func_trig_cond->const_item_cache in get_mm_tree): Since get_mm_tree can be called for an instance of Item_func_trig_cond, make Item_func_trig_cond::const_item() return false. get_mm_tree will assume Item_func_trig_cond are unknown functions and will not build range access plans for them --- mysql-test/r/join_outer.result | 28 ++++++++++++++-------------- mysql-test/t/join_outer.test | 28 ++++++++++++++-------------- sql/item_cmpfunc.h | 1 + 3 files changed, 29 insertions(+), 28 deletions(-) diff --git a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result index b7343065c73..d2879e18726 100644 --- a/mysql-test/r/join_outer.result +++ b/mysql-test/r/join_outer.result @@ -784,32 +784,32 @@ t2.flag_value IS NULL; flag_name flag_value flag2 NULL DROP TABLE t1,t2; -CREATE TABLE invoice ( +CREATE TABLE t1 ( id int(11) unsigned NOT NULL auto_increment, text_id int(10) unsigned default NULL, PRIMARY KEY (id) ); -INSERT INTO invoice VALUES("1", "0"); -INSERT INTO invoice VALUES("2", "10"); -CREATE TABLE text_table ( +INSERT INTO t1 VALUES("1", "0"); +INSERT INTO t1 VALUES("2", "10"); +CREATE TABLE t2 ( text_id char(3) NOT NULL default '', language_id char(3) NOT NULL default '', text_data text, PRIMARY KEY (text_id,language_id) ); -INSERT INTO text_table VALUES("0", "EN", "0-EN"); -INSERT INTO text_table VALUES("0", "SV", "0-SV"); -INSERT INTO text_table VALUES("10", "EN", "10-EN"); -INSERT INTO text_table VALUES("10", "SV", "10-SV"); -SELECT invoice.id, invoice.text_id, text_table.text_data -FROM invoice LEFT JOIN text_table -ON invoice.text_id = text_table.text_id -AND text_table.language_id = 'SV' - WHERE (invoice.id LIKE '%' OR text_table.text_data LIKE '%'); +INSERT INTO t2 VALUES("0", "EN", "0-EN"); +INSERT INTO t2 VALUES("0", "SV", "0-SV"); +INSERT INTO t2 VALUES("10", "EN", "10-EN"); +INSERT INTO t2 VALUES("10", "SV", "10-SV"); +SELECT t1.id, t1.text_id, t2.text_data +FROM t1 LEFT JOIN t2 +ON t1.text_id = t2.text_id +AND t2.language_id = 'SV' + WHERE (t1.id LIKE '%' OR t2.text_data LIKE '%'); id text_id text_data 1 0 0-SV 2 10 10-SV -DROP TABLE invoice, text_table; +DROP TABLE t1, t2; CREATE TABLE t0 (a0 int PRIMARY KEY); CREATE TABLE t1 (a1 int PRIMARY KEY); CREATE TABLE t2 (a2 int); diff --git a/mysql-test/t/join_outer.test b/mysql-test/t/join_outer.test index ce2ce577b46..66de5e5a4c9 100644 --- a/mysql-test/t/join_outer.test +++ b/mysql-test/t/join_outer.test @@ -554,34 +554,34 @@ SELECT t1.flag_name,t2.flag_value DROP TABLE t1,t2; -CREATE TABLE invoice ( +CREATE TABLE t1 ( id int(11) unsigned NOT NULL auto_increment, text_id int(10) unsigned default NULL, PRIMARY KEY (id) ); -INSERT INTO invoice VALUES("1", "0"); -INSERT INTO invoice VALUES("2", "10"); +INSERT INTO t1 VALUES("1", "0"); +INSERT INTO t1 VALUES("2", "10"); -CREATE TABLE text_table ( +CREATE TABLE t2 ( text_id char(3) NOT NULL default '', language_id char(3) NOT NULL default '', text_data text, PRIMARY KEY (text_id,language_id) ); -INSERT INTO text_table VALUES("0", "EN", "0-EN"); -INSERT INTO text_table VALUES("0", "SV", "0-SV"); -INSERT INTO text_table VALUES("10", "EN", "10-EN"); -INSERT INTO text_table VALUES("10", "SV", "10-SV"); +INSERT INTO t2 VALUES("0", "EN", "0-EN"); +INSERT INTO t2 VALUES("0", "SV", "0-SV"); +INSERT INTO t2 VALUES("10", "EN", "10-EN"); +INSERT INTO t2 VALUES("10", "SV", "10-SV"); -SELECT invoice.id, invoice.text_id, text_table.text_data - FROM invoice LEFT JOIN text_table - ON invoice.text_id = text_table.text_id - AND text_table.language_id = 'SV' - WHERE (invoice.id LIKE '%' OR text_table.text_data LIKE '%'); +SELECT t1.id, t1.text_id, t2.text_data + FROM t1 LEFT JOIN t2 + ON t1.text_id = t2.text_id + AND t2.language_id = 'SV' + WHERE (t1.id LIKE '%' OR t2.text_data LIKE '%'); -DROP TABLE invoice, text_table; +DROP TABLE t1, t2; # Test for bug #5896 diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index a6fe9e44a3d..a156322e13c 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -264,6 +264,7 @@ public: longlong val_int() { return *trig_var ? args[0]->val_int() : 1; } enum Functype functype() const { return TRIG_COND_FUNC; }; const char *func_name() const { return "trigcond"; }; + bool const_item() const { return FALSE; } }; class Item_func_not_all :public Item_func_not From 54b281a37a1af1d2edc1522029a61894491b96f4 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 18 Jan 2005 16:50:09 -0800 Subject: [PATCH 05/18] 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 Date: Tue, 18 Jan 2005 17:01:06 -0800 Subject: [PATCH 06/18] 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 ed327104b6803959f7f5acb4dc84afd117ad26b4 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 19 Jan 2005 09:15:34 +0100 Subject: [PATCH 07/18] bug#7777 - ndb compile on qnx remove usage of compiler supplied and instead impl. own inlined placement new ndb/include/kernel/AttributeHeader.hpp: remove usage ndb/include/ndb_global.h.in: remove usage instead impl. own ndb/src/kernel/blocks/backup/BackupInit.cpp: remove usage ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: remove usage ndb/src/kernel/blocks/dbdih/DbdihInit.cpp: remove usage ndb/src/kernel/blocks/dblqh/DblqhInit.cpp: remove usage ndb/src/kernel/blocks/dbtc/DbtcInit.cpp: remove usage ndb/src/kernel/blocks/dbtup/DbtupGen.cpp: remove usage ndb/src/kernel/blocks/dbtux/Dbtux.hpp: remove usage ndb/src/kernel/blocks/grep/GrepInit.cpp: remove usage ndb/src/kernel/blocks/suma/SumaInit.cpp: remove usage ndb/src/kernel/vm/Emulator.cpp: remove usage ndb/src/kernel/vm/SimulatedBlock.hpp: remove usage ndb/src/mgmapi/mgmapi_configuration.cpp: remove usage --- ndb/include/kernel/AttributeHeader.hpp | 1 - ndb/include/ndb_global.h.in | 6 ++---- ndb/src/kernel/blocks/backup/BackupInit.cpp | 1 - ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp | 1 - ndb/src/kernel/blocks/dbdih/DbdihInit.cpp | 1 - ndb/src/kernel/blocks/dblqh/DblqhInit.cpp | 1 - ndb/src/kernel/blocks/dbtc/DbtcInit.cpp | 1 - ndb/src/kernel/blocks/dbtup/DbtupGen.cpp | 1 - ndb/src/kernel/blocks/dbtux/Dbtux.hpp | 1 - ndb/src/kernel/blocks/grep/GrepInit.cpp | 1 - ndb/src/kernel/blocks/suma/SumaInit.cpp | 1 - ndb/src/kernel/vm/Emulator.cpp | 1 - ndb/src/kernel/vm/SimulatedBlock.hpp | 1 - ndb/src/mgmapi/mgmapi_configuration.cpp | 1 - 14 files changed, 2 insertions(+), 17 deletions(-) diff --git a/ndb/include/kernel/AttributeHeader.hpp b/ndb/include/kernel/AttributeHeader.hpp index b807b4ef4f1..ed9085301be 100644 --- a/ndb/include/kernel/AttributeHeader.hpp +++ b/ndb/include/kernel/AttributeHeader.hpp @@ -17,7 +17,6 @@ #ifndef ATTRIBUTE_HEADER #define ATTRIBUTE_HEADER -#include /** * @class AttributeHeader * @brief Header passed in front of every attribute value in AttrInfo signal diff --git a/ndb/include/ndb_global.h.in b/ndb/include/ndb_global.h.in index d7a5cb1b1cf..eadd5e37b9b 100644 --- a/ndb/include/ndb_global.h.in +++ b/ndb/include/ndb_global.h.in @@ -138,10 +138,8 @@ static const char table_name_separator = '/'; #endif #ifdef __cplusplus -#include -#endif - -#ifdef __cplusplus +inline void* operator new(size_t, void* __p) { return __p; } +inline void* operator new[](size_t, void* __p) { return __p; } extern "C" { #endif diff --git a/ndb/src/kernel/blocks/backup/BackupInit.cpp b/ndb/src/kernel/blocks/backup/BackupInit.cpp index e0171c61eca..08fa089a9c0 100644 --- a/ndb/src/kernel/blocks/backup/BackupInit.cpp +++ b/ndb/src/kernel/blocks/backup/BackupInit.cpp @@ -22,7 +22,6 @@ //=========================================================================== #include "Backup.hpp" -#include #include #include diff --git a/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp b/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp index c1dca184466..dfae180ae71 100644 --- a/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp +++ b/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp @@ -39,7 +39,6 @@ #include #include -#include #include #include diff --git a/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp b/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp index b823dbcd952..9a5efebc56e 100644 --- a/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp +++ b/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp @@ -18,7 +18,6 @@ #define DBDIH_C #include "Dbdih.hpp" #include -#include #define DEBUG(x) { ndbout << "DIH::" << x << endl; } diff --git a/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp b/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp index 0577aa4d344..ec29489180c 100644 --- a/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp +++ b/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp @@ -19,7 +19,6 @@ #define DBLQH_C #include "Dblqh.hpp" #include -#include #define DEBUG(x) { ndbout << "LQH::" << x << endl; } diff --git a/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp b/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp index 5c66ba776b0..59c8237f20a 100644 --- a/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp +++ b/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #define DEBUG(x) { ndbout << "TC::" << x << endl; } diff --git a/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp b/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp index 0f0e6d61f41..0d7430e662d 100644 --- a/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp +++ b/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp @@ -31,7 +31,6 @@ #include #include -#include #define DEBUG(x) { ndbout << "TUP::" << x << endl; } diff --git a/ndb/src/kernel/blocks/dbtux/Dbtux.hpp b/ndb/src/kernel/blocks/dbtux/Dbtux.hpp index 8af83e3c056..2c96271eb5d 100644 --- a/ndb/src/kernel/blocks/dbtux/Dbtux.hpp +++ b/ndb/src/kernel/blocks/dbtux/Dbtux.hpp @@ -17,7 +17,6 @@ #ifndef DBTUX_H #define DBTUX_H -#include #include #include #include diff --git a/ndb/src/kernel/blocks/grep/GrepInit.cpp b/ndb/src/kernel/blocks/grep/GrepInit.cpp index 36855f86568..d764fb1f473 100644 --- a/ndb/src/kernel/blocks/grep/GrepInit.cpp +++ b/ndb/src/kernel/blocks/grep/GrepInit.cpp @@ -15,7 +15,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "Grep.hpp" -#include #include #include diff --git a/ndb/src/kernel/blocks/suma/SumaInit.cpp b/ndb/src/kernel/blocks/suma/SumaInit.cpp index 36217c313af..b5945db3811 100644 --- a/ndb/src/kernel/blocks/suma/SumaInit.cpp +++ b/ndb/src/kernel/blocks/suma/SumaInit.cpp @@ -16,7 +16,6 @@ #include "Suma.hpp" -#include #include #include diff --git a/ndb/src/kernel/vm/Emulator.cpp b/ndb/src/kernel/vm/Emulator.cpp index adf3c438945..068610b6778 100644 --- a/ndb/src/kernel/vm/Emulator.cpp +++ b/ndb/src/kernel/vm/Emulator.cpp @@ -33,7 +33,6 @@ #include #include #include -#include extern "C" { extern void (* ndb_new_handler)(); diff --git a/ndb/src/kernel/vm/SimulatedBlock.hpp b/ndb/src/kernel/vm/SimulatedBlock.hpp index cff19734368..787d14ca5cb 100644 --- a/ndb/src/kernel/vm/SimulatedBlock.hpp +++ b/ndb/src/kernel/vm/SimulatedBlock.hpp @@ -36,7 +36,6 @@ #include #include -#include #include "DLList.hpp" #include "ArrayPool.hpp" #include "DLHashTable.hpp" diff --git a/ndb/src/mgmapi/mgmapi_configuration.cpp b/ndb/src/mgmapi/mgmapi_configuration.cpp index 7bac2d10b92..80ab428c05a 100644 --- a/ndb/src/mgmapi/mgmapi_configuration.cpp +++ b/ndb/src/mgmapi/mgmapi_configuration.cpp @@ -1,7 +1,6 @@ #include #include #include "mgmapi_configuration.hpp" -#include ndb_mgm_configuration_iterator::ndb_mgm_configuration_iterator (const ndb_mgm_configuration & conf, unsigned type_of_section) From da8a9e2f20e737f63e271f3a8ae7e8ba8dc276b7 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 19 Jan 2005 10:07:15 +0100 Subject: [PATCH 08/18] ndb compiler warning, c++ style comment in c-file ndb/include/ndb_constants.h: remove // from .h-file --- ndb/include/ndb_constants.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ndb/include/ndb_constants.h b/ndb/include/ndb_constants.h index 491d0719a69..a04afe1bd72 100644 --- a/ndb/include/ndb_constants.h +++ b/ndb/include/ndb_constants.h @@ -48,7 +48,7 @@ #define NDB_TYPE_BIGUNSIGNED 10 #define NDB_TYPE_FLOAT 11 #define NDB_TYPE_DOUBLE 12 -#define NDB_TYPE_DECIMAL 13 // not used +#define NDB_TYPE_DECIMAL 13 /* not used */ #define NDB_TYPE_CHAR 14 #define NDB_TYPE_VARCHAR 15 #define NDB_TYPE_BINARY 16 From 4bd96dd11d1707589545c4f6ccd497490e647e63 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 19 Jan 2005 18:32:34 +0100 Subject: [PATCH 09/18] ndb - make sure scan recevier pointers are aligned ndb/src/ndbapi/NdbScanOperation.cpp: align pointers --- ndb/src/ndbapi/NdbScanOperation.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ndb/src/ndbapi/NdbScanOperation.cpp b/ndb/src/ndbapi/NdbScanOperation.cpp index a90c9f524a2..670a18f72a0 100644 --- a/ndb/src/ndbapi/NdbScanOperation.cpp +++ b/ndb/src/ndbapi/NdbScanOperation.cpp @@ -241,17 +241,17 @@ NdbScanOperation::fix_receivers(Uint32 parallel){ if(parallel > m_allocated_receivers){ const Uint32 sz = parallel * (4*sizeof(char*)+sizeof(Uint32)); - Uint32 * tmp = new Uint32[(sz+3)/4]; + Uint64 * tmp = new Uint64[(sz+7)/8]; // Save old receivers - memcpy(tmp+parallel, m_receivers, m_allocated_receivers*sizeof(char*)); + memcpy(tmp, m_receivers, m_allocated_receivers*sizeof(char*)); delete[] m_array; - m_array = tmp; + m_array = (Uint32*)tmp; - m_prepared_receivers = tmp; - m_receivers = (NdbReceiver**)(tmp + parallel); + m_receivers = (NdbReceiver**)tmp; m_api_receivers = m_receivers + parallel; m_conf_receivers = m_api_receivers + parallel; m_sent_receivers = m_conf_receivers + parallel; + m_prepared_receivers = (Uint32*)(m_sent_receivers + parallel); // Only get/init "new" receivers NdbReceiver* tScanRec; From 98713d6482bdd53169611ed374d1f8efcd810d95 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 19 Jan 2005 10:24:51 -0800 Subject: [PATCH 10/18] 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 Date: Wed, 19 Jan 2005 10:40:39 -0800 Subject: [PATCH 11/18] 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 Date: Thu, 20 Jan 2005 12:37:02 +0400 Subject: [PATCH 12/18] 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 Date: Thu, 20 Jan 2005 12:39:46 +0400 Subject: [PATCH 13/18] 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 Date: Thu, 20 Jan 2005 12:44:33 +0400 Subject: [PATCH 14/18] 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'" From a242d574367192ef8698711f97e7bfc4cfb731b7 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 20 Jan 2005 13:08:16 +0400 Subject: [PATCH 15/18] errmsg.txt: Minor fix after character set conversion. sql/share/japanese-sjis/errmsg.txt: Minor fix after character set conversion. --- sql/share/japanese-sjis/errmsg.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/share/japanese-sjis/errmsg.txt b/sql/share/japanese-sjis/errmsg.txt index 66284b22367..a06723727b7 100644 --- a/sql/share/japanese-sjis/errmsg.txt +++ b/sql/share/japanese-sjis/errmsg.txt @@ -15,10 +15,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* - 3.22.10-beta euc-japanese (ujis) text + Shift-JIS Japanese */ -character-set=ujis +character-set=sjis "hashchk", "isamchk", From 89a24f933537f550844862d936ed57b44ec16069 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 20 Jan 2005 12:07:44 +0100 Subject: [PATCH 16/18] - Improved Do-rpm to perform RPM builds inside of a chrooted build environment (using "build" on SUSE Linux) Build-tools/Do-rpm: - added functionality to perform RPM builds inside of a chrooted build environment (using "build" on SUSE Linux) - see "--help" for more details --- Build-tools/Do-rpm | 266 +++++++++++++++++++++++++++++---------------- 1 file changed, 170 insertions(+), 96 deletions(-) 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= ; 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 <] Write a log file [to ] - (default is "$LOGFILE") -m, --mail=
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= Use 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 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: From 877ed48b3de43ffe1f1250593c061881e9c4106d Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 20 Jan 2005 12:19:48 +0100 Subject: [PATCH 17/18] bug#8010 - ndb release connections when last op was simple read ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: bug#8010 release connections when last op was simple read --- ndb/src/kernel/blocks/dbtc/DbtcMain.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp index 815d6c9d838..c804fa32bd2 100644 --- a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp +++ b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp @@ -1271,7 +1271,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; From 59a68b89647753d1460279c7eb0fcf8d4044036a Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 20 Jan 2005 15:33:21 +0400 Subject: [PATCH 18/18] errmsg.txt: Adding Shift-JIS error messages for Japanese Windows distributions. Thanks to Serg for help with a perl program to merge 4.1 messages into 5.0 format :) sql/share/errmsg.txt: Adding Shift-JIS error messages for Japanese Windows distributions. Thanks Serg for help :) --- sql/share/errmsg.txt | 104 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 103 insertions(+), 1 deletion(-) 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' テーブルが作れません.(errno: %d)", est "Ei suuda luua tabelit '%-.64s' (veakood: %d)" fre "Ne peut cr馥r 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' データベースが作れません (errno: %d)", est "Ei suuda luua andmebaasi '%-.64s' (veakood: %d)" fre "Ne peut cr馥r 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' データベースが作れません.既にそのデータベースが存在します", est "Ei suuda luua andmebaasi '%-.64s': andmebaas juba eksisteerib" fre "Ne peut cr馥r la base '%-.64s'; elle existe d駛" 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' データベースを破棄できません. そのデータベースがないのです.", 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 lschen. 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 "データベース破棄エラー ('%-.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 Lschen der Datenbank ('%-.64s' kann nicht gelscht 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 "データベース破棄エラー ('%-.64s' を rmdir できません, errno: %d)", est "Viga andmebaasi kustutamisel (ei suuda kustutada kataloogi '%-.64s', veakood: %d)" fre "Erreur en effa軋nt la base (rmdir '%-.64s', erreur %d)" ger "Fehler beim Lschen der Datenbank (Verzeichnis '%-.64s' kann nicht gelscht 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' の削除がエラー (errno: %d)", est "Viga '%-.64s' kustutamisel (veakood: %d)" fre "Erreur en effa軋nt '%-.64s' (Errcode: %d)" ger "Fehler beim Lschen von '%-.64s' (Fehler: %d)" @@ -247,6 +254,7 @@ ER_CANT_FIND_SYSTEM_REC dan "Kan ikke l誑e posten i systemfolderen" nla "Kan record niet lezen in de systeem tabel" eng "Can't read record in system table" + jps "system table のレコードを読む事ができませんでした", est "Ei suuda lugeda kirjet ssteemsest 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誑e 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' のステイタスが得られません. (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誑e 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駱ertoire de travail (Errcode: %d)" ger "Kann Arbeitsverzeichnis nicht ermitteln (Fehler: %d)" @@ -319,6 +329,7 @@ ER_CANT_LOCK dan "Kan ikke l蚶e fil (Fejlkode: %d)" nla "Kan de file niet blokeren (Errcode: %d)" eng "Can't lock file (errno: %d)" + jps "ファイルをロックできません (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 蘆ne fil: '%-.64s' (Fejlkode: %d)" nla "Kan de file '%-.64s' niet openen (Errcode: %d)" eng "Can't open file: '%-.64s' (errno: %d)" + jps "'%-.64s' ファイルを開く事ができません (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' ファイルを見付ける事ができません.(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誑e 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' ディレクトリが読めません.(errno: %d)", est "Ei suuda lugeda kataloogi '%-.64s' (veakood: %d)" fre "Ne peut lire le r駱ertoire 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' ディレクトリに chdir できません.(errno: %d)", est "Ei suuda siseneda kataloogi '%-.64s' (veakood: %d)" fre "Ne peut changer le r駱ertoire 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). 誰かが何かを減らすまでまってください...", est "Ketas t臺s (%s). Ootame kuni tekib vaba ruumi..." fre "Disque plein (%s). J'attend que quelqu'un lib鑽e 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 ngler 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 が重複していて書きこめません", est "Ei saa kirjutada, korduv vti tabelis '%-.64s'" fre "Ecriture impossible, doublon dans une cl de la table '%-.64s'" ger "Kann nicht speichern, Grund: doppelter Schlssel in Tabelle '%-.64s'" @@ -533,6 +550,7 @@ ER_ERROR_ON_READ dan "Fejl ved l誑ning af '%-.64s' (Fejlkode: %d)" nla "Fout bij het lezen van file '%-.64s' (Errcode: %d)" eng "Error reading file '%-.64s' (errno: %d)" + jps "'%-.64s' ファイルの読み込みエラー (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 omdbning 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' ファイルを書く事ができません (errno: %d)", est "Viga faili '%-.64s' kirjutamisel (veakood: %d)" fre "Erreur d'馗riture 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蚶t mod opdateringer" nla "'%-.64s' is geblokeerd tegen veranderingen" eng "'%-.64s' is locked against change" + jps "'%-.64s' はロックされています", est "'%-.64s' on lukustatud muudatuste vastu" fre "'%-.64s' est verrouill contre les modifications" ger "'%-.64s' ist fr ﾄnderungen gesperrt" @@ -629,6 +650,7 @@ ER_FILSORT_ABORT dan "Sortering afbrudt" nla "Sorteren afgebroken" eng "Sort aborted" + jps "Sort 中断", est "Sorteerimine katkestatud" fre "Tri alphab騁ique 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 fr '%-.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'のなかにレコードが見付かりません", 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 "ファイル '%-.64s' の info が間違っているようです", est "Vigane informatsioon failis '%-.64s'" fre "Information erronn馥 dans le fichier: '%-.64s'" ger "Falsche Information in Datei '%-.64s'" @@ -773,6 +798,7 @@ ER_NOT_KEYFILE dan "Fejl i indeksfilen til tabellen '%-.64s'; prv 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' テーブルの key file が間違っているようです. 修復をしてください", est "Tabeli '%-.64s' vtmefail on vigane; proovi seda parandada" fre "Index corrompu dans la table: '%-.64s'; essayez de le r駱arer" ger "Falsche Schlssel-Datei fr 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' テーブルは古い形式の key file のようです; 修復をしてください", est "Tabeli '%-.64s' vtmefail on aegunud; paranda see!" fre "Vieux fichier d'index pour la table '%-.64s'; r駱arez le!" ger "Alte Schlssel-Datei fr 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' は読み込み専用です", 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 prv 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. デーモンをリスタートしてみてください (%d bytes 必要)", est "M舁u sai otsa. Proovi MySQL uuesti k臺vitada (puudu j臺 %d baiti)" fre "Manque de m駑oire. Red駑arrez le d駑on et r-essayez (%d octets n馗essaires)" ger "Kein Speicher vorhanden (%d Bytes bentigt). 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舁u sai sorteerimisel otsa. Suurenda MySQL-i sorteerimispuhvrit" fre "Manque de m駑oire pour le tri. Augmentez-la." ger "Kein Speicher zum Sortieren vorhanden. sort_buffer_size sollte erhht werden" @@ -893,6 +923,7 @@ ER_UNEXPECTED_EOF dan "Uventet afslutning p fil (eof) ved l誑ning 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' ファイルを読み込み中に EOF が予期せぬ所で現れました. (errno: %d)", est "Ootamatu faililpum舐gend 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蘰t for tr蘚e/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 かその他のプロセスがメモリーを全て使っているか確認してください. メモリーを使い切っていない場合、'ulimit' を設定して mysqld のメモリー使用限界量を多くするか、swap space を増やしてみてください", est "M舁u sai otsa. Vimalik, et aitab swap-i lisamine vi k舖u 'ulimit' abil MySQL-le rohkema m舁u kasutamise lubamine" fre "Manque de 'threads'/m駑oire" ger "Kein Speicher mehr vorhanden. Prfen Sie, ob mysqld oder ein anderer Prozess allen Speicher verbraucht. Wenn nicht, sollten Sie mit 'ulimit' dafr 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誡tsnavn 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 fr diese Adresse nicht erhalten" @@ -1011,6 +1045,7 @@ ER_DBACCESS_DENIED_ERROR 42000 dan "Adgang n詒tet 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 "ユーザー '%-.32s'@'%-.64s' の '%-.64s' データベースへのアクセスを拒否します", est "Ligip蒿s keelatud kasutajale '%-.32s'@'%-.64s' andmebaasile '%-.64s'" fre "Acc鑚 refus pour l'utilisateur: '%-.32s'@'@%-.64s'. Base '%-.64s'" ger "Benutzer '%-.32s'@'%-.64s' hat keine Zugriffsberechtigung fr Datenbank '%-.64s'" @@ -1034,6 +1069,7 @@ ER_ACCESS_DENIED_ERROR 28000 dan "Adgang n詒tet 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 "ユーザー '%-.32s'@'%-.64s' を拒否します.uUsing password: %s)", est "Ligip蒿s keelatud kasutajale '%-.32s'@'%-.64s' (kasutab parooli: %s)" fre "Acc鑚 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 "データベースが選択されていません.", est "Andmebaasi ei ole valitud" fre "Aucune base n'a 騁 s駘ectionn馥" ger "Keine Datenbank ausgew臧lt" @@ -1081,6 +1118,7 @@ ER_UNKNOWN_COM_ERROR 08S01 dan "Ukendt kommando" nla "Onbekend commando" eng "Unknown command" + jps "そのコマンドは何？", est "Tundmatu k舖k" fre "Commande inconnue" ger "Unbekannter Befehl" @@ -1105,6 +1143,7 @@ ER_BAD_NULL_ERROR 23000 dan "Kolonne '%-.64s' kan ikke v誡e 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 黎re 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' なんてデータベースは知りません.", 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駛" 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臺b" fre "Arr黎 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 名は重複してます", est "Kattuv tulba nimi '%-.64s'" fre "Nom du champ '%-.64s' d駛 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 の名前は重複しています", est "Kattuv vtme nimi '%-.64s'" fre "Nom de clef '%-.64s' d駛 utilis" ger "Doppelter Name fr Schlssel (Key) vorhanden: '%-.64s'" @@ -1435,6 +1483,7 @@ ER_DUP_ENTRY 23000 S1009 dan "Ens v誡dier '%-.64s' for indeks %d" nla "Dubbele ingang '%-.64s' voor zoeksleutel %d" eng "Duplicate entry '%-.64s' for key %d" + jps "'%-.64s' は key %d において重複しています", est "Kattuv v蒿rtus '%-.64s' vtmele %d" fre "Duplicata du champ '%-.64s' pour la clef %d" ger "Doppelter Eintrag '%-.64s' fr Schlssel %d" @@ -1482,6 +1531,7 @@ ER_PARSE_ERROR 42000 dan "%s n誡 '%-.64s' p linje %d" nla "%s bij '%-.64s' in regel %d" eng "%s near '%-.80s' at line %d" + jps "%s : '%-.80s' 付近 : %d 行目", est "%s '%-.80s' ligidal real %d" fre "%s pr鑚 de '%-.64s' la ligne %d" ger "%s bei '%-.80s' in Zeile %d" @@ -1506,6 +1556,7 @@ ER_EMPTY_QUERY 42000 dan "Foresprgsel var tom" nla "Query was leeg" eng "Query was empty" + jps "Query が空です.", est "Thi p舐ing" 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誡ngler specificeret" nla "Meerdere primaire zoeksleutels gedefinieerd" eng "Multiple primary key defined" + jps "複数の primary key が定義されました", est "Mitut primaarset vtit ei saa olla" fre "Plusieurs clefs primaires d馭inies" ger "Mehrfacher Prim舐schlssel (PRIMARY KEY) definiert" @@ -1601,6 +1654,7 @@ ER_TOO_MANY_KEYS 42000 S1009 dan "For mange ngler specificeret. Kun %d ngler m bruges" nla "Teveel zoeksleutels gedefinieerd. Maximaal zijn %d zoeksleutels toegestaan" eng "Too many keys specified; max %d keys allowed" + jps "key の指定が多すぎます. key は最大 %d までです", est "Liiga palju vtmeid. Maksimaalselt vib olla %d vtit" fre "Trop de clefs sont d馭inies. Maximum de %d clefs allou" ger "Zu viele Schlssel definiert. Maximal %d Schlssel erlaubt" @@ -1648,6 +1702,7 @@ ER_TOO_LONG_KEY 42000 S1009 dan "Specificeret ngle var for lang. Maksimal nglel誅gde 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 "Vti on liiga pikk. Maksimaalne vtmepikkus on %d" fre "La cl est trop longue. Longueur maximale: %d" ger "Schlssel ist zu lang. Die maximale Schlssell舅ge betr臠t %d" @@ -1672,6 +1727,7 @@ ER_KEY_COLUMN_DOES_NOT_EXITS 42000 S1009 dan "Nglefeltet '%-.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' がテーブルにありません.", est "Vtme tulp '%-.64s' puudub tabelis" fre "La cl '%-.64s' n'existe pas dans la table" ger "In der Tabelle gibt es keine Schlsselspalte '%-.64s'" @@ -1719,6 +1775,7 @@ ER_TOO_BIG_FIELDLENGTH 42000 S1009 dan "For stor feltl誅gde 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' は,確保する column の大きさが多すぎます. (最大 %d まで). BLOB をかわりに使用してください.", est "Tulba '%-.64s' pikkus on liiga pikk (maksimaalne pikkus: %d). Kasuta BLOB v舁jatpi" fre "Champ '%-.64s' trop long (max = %d). Utilisez un BLOB" ger "Feldl舅ge fr 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誡e 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 "テーブルの定義が違います; there can be only one auto column and it must be defined as a key", est "Vigane tabelikirjeldus; Tabelis tohib olla ks auto_increment tpi tulp ning see peab olema defineeritud vtmena" fre "Un seul champ automatique est permis et il doit 黎re index" ger "Falsche Tabellendefinition. Es darf nur ein Auto-Feld geben und dieses muss als Schlssel 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黎 pour des connections" ger "%-.64s: Bereit fr 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. 中断!\n", est "%s: sain signaali %d. Lpetan!\n" fre "%s: Re輹 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: Lpp\n" fre "%s: Arr黎 du serveur termin饅n" ger "%-.64s: Heruntergefahren (shutdown)\n" @@ -1862,6 +1923,7 @@ ER_FORCING_CLOSE 08S01 dan "%s: Forceret nedlukning af tr蘚: %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: スレッド %ld 強制終了 user: '%-.64s'\n", est "%s: Sulgen juga lime %ld kasutaja: '%-.32s'\n" fre "%s: Arr黎 forc de la t稍he (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馥r 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 ngle, 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 実行時に指定されていません). テーブルを作り直してください", est "Tabelil '%-.64s' puuduvad vtmed. Loo tabel uuesti" fre "La table '%-.64s' n'a pas d'index comme celle utilis馥 dans CREATE INDEX. Recr馥z 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誡e i database-folderen og kunne l誑es 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 "ファイル '%-.64s' は databse の directory にあるか全てのユーザーが読めるように許可されていなければなりません.", est "Fail '%-.64s' peab asuma andmebaasi kataloogis vi olema kigile loetav" fre "Le fichier '%-.64s' doit 黎re dans le r駱ertoire de la base et lisible par tous" ger "Datei '%-.64s' muss im Datenbank-Verzeichnis vorhanden und lesbar fr 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駛" 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 "レコード数: %ld 削除: %ld Skipped: %ld Warnings: %ld", est "Kirjeid: %ld Kustutatud: %ld Vahele j臚tud: %ld Hoiatusi: %ld" fre "Enregistrements: %ld Effac駸: %ld Non trait駸: %ld Avertissements: %ld" ger "Datens舩ze: %ld Gelscht: %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 "レコード数: %ld 重複: %ld", est "Kirjeid: %ld Kattuvaid: %ld" fre "Enregistrements: %ld Doublons: %ld" ger "Datens舩ze: %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 で全ての column は削除できません. DROP TABLE を使用してください", est "ALTER TABLE kasutades ei saa kustutada kiki tulpasid. Kustuta tabel DROP TABLE abil" fre "Vous ne pouvez effacer tous les champs avec ALTER TABLE. Utilisez DROP TABLE" ger "Mit ALTER TABLE knnen nicht alle Felder auf einmal gelscht werden. Dafr DROP TABLE verwenden" @@ -2125,6 +2194,7 @@ ER_CANT_DROP_FIELD_OR_KEY 42000 dan "Kan ikke udfre DROP '%-.64s'. Undersg om feltet/nglen 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' を破棄できませんでした; check that column/key exists", est "Ei suuda kustutada '%-.64s'. Kontrolli kas tulp/vti eksisteerib" fre "Ne peut effacer (DROP) '%-.64s'. V駻ifiez s'il existe" ger "Kann '%-.64s' nicht lschen. Existiert das Feld / der Schlssel?" @@ -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 "レコード数: %ld 重複数: %ld Warnings: %ld", est "Kirjeid: %ld Kattuvaid: %ld Hoiatusi: %ld" fre "Enregistrements: %ld Doublons: %ld Avertissements: %ld" ger "Datens舩ze: %ld Duplikate: %ld Warnungen: %ld" @@ -2179,6 +2250,7 @@ ER_NO_SUCH_THREAD dan "Ukendt tr蘚 id: %lu" nla "Onbekend thread id: %lu" eng "Unknown thread id: %lu" + jps "thread id: %lu はありません", est "Tundmatu lim: %lu" fre "Num駻o de t稍he inconnu: %lu" ger "Unbekannte Thread-ID: %lu" @@ -2203,6 +2275,7 @@ ER_KILL_DENIED_ERROR dan "Du er ikke ejer af tr蘚en %lu" nla "U bent geen bezitter van thread %lu" eng "You are not owner of thread %lu" + jps "thread %lu のオーナーではありません", est "Ei ole lime %lu omanik" fre "Vous n'黎es pas propri騁aire de la t稍he no: %lu" ger "Sie sind nicht Eigentmer von Thread %lu" @@ -2296,6 +2369,7 @@ ER_TABLE_NOT_LOCKED_FOR_WRITE dan "Tabellen '%-.64s' var l蚶t med READ l蚶 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 になっていて、更新はできません", est "Tabel '%-.64s' on lukustatud READ lukuga ning ei ole muudetav" fre "Table '%-.64s' verrouill馥 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蚶t 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 によってロックされていません", est "Tabel '%-.64s' ei ole lukustatud k舖uga LOCK TABLES" fre "Table '%-.64s' non verrouill馥: 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 "指定した database 名 '%-.100s' が間違っています", est "Vigane andmebaasi nimi '%-.100s'" fre "Nom de base de donn馥 ill馮al: '%-.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 "指定した table 名 '%-.100s' はまちがっています", est "Vigane tabeli nimi '%-.100s'" fre "Nom de table ill馮al: '%-.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 "テーブルは最低 1 個の column が必要です", est "Tabelis peab olema v臧emalt 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臺s" fre "La table '%-.64s' est pleine" ger "Tabelle '%-.64s' ist voll" @@ -2662,6 +2741,7 @@ ER_UNKNOWN_CHARACTER_SET 42000 dan "Ukendt tegns誥: '%-.64s'" nla "Onbekende character set: '%-.64s'" eng "Unknown character set: '%-.64s'" + jps "character set '%-.64s' はサポートしていません", est "Vigane kooditabel '%-.64s'" fre "Jeu de caract鑽es 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 "テーブルが多すぎます; 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 strrelse, 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-tpi v舁ju on %d. Muuda mned v舁jad BLOB-tpi v舁jadeks" 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舅ge zu groﾟ. Die maximale Spaltenl舅ge fr den verwendeten Tabellentyp (ohne BLOB-Felder) betr臠t %d. Einige Felder mssen 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 strre stak om ndvendigt" 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. スタック領域を多くとりたい場合、'mysqld -O thread_stack=#' と指定してください", fre "D饕ordement de la pile des t稍hes (Thread stack). Utilis馥s: %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 で使用されました. このカラムは 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馭inie 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誑e funktionen '%-.64s'" nla "Kan functie '%-.64s' niet laden" eng "Can't load function '%-.64s'" + jps "function '%-.64s' を ロードできません", 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 へのパスが通っていません", est "Teegi nimes ei tohi olla kataloogi" fre "Chemin interdit pour les biblioth鑷ues partag馥s" ger "Keine Pfade gestattet fr 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駛" ger "Funktion '%-.64s' existiert schon" @@ -2893,6 +2982,7 @@ ER_CANT_OPEN_LIBRARY dan "Kan ikke 蘆ne 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' を開く事ができません (errno: %d %s)", est "Ei suuda avada jagatud teeki '%-.64s' (veakood: %d %-.64s)" fre "Impossible d'ouvrir la biblioth鑷ue partag馥 '%-.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' をライブラリー中に見付ける事ができません", est "Ei leia funktsiooni '%-.64s' antud teegis" fre "Impossible de trouver la fonction '%-.64s' dans la biblioth鑷ue'" 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馭inie" ger "Funktion '%-.64s' ist nicht definiert" @@ -2959,6 +3051,7 @@ ER_HOST_IS_BLOCKED dan "V誡ten er blokeret p grund af mange fejlforesprgsler. L蚶 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 のため、拒否されました. 'mysqladmin flush-hosts' で解除してください", est "Masin '%-.64s' on blokeeritud hulgaliste hendusvigade tttu. Blokeeringu saab thistada 'mysqladmin flush-hosts' k舖uga" fre "L'hte '%-.64s' est bloqu cause d'un trop grand nombre d'erreur de connection. D饕loquer 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誡ten '%-.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 hte '%-.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 誅dre 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 で使用している状態では、パスワードの変更はできません", est "Te kasutate MySQL-i anonmse kasutajana, kelledel pole parooli muutmise igust" fre "Vous utilisez un utilisateur anonyme et les utilisateurs anonymes ne sont pas autoris駸 changer les mots de passe" ger "Sie benutzen MySQL als anonymer Benutzer und drfen daher keine Passwrter 舅dern" @@ -3019,6 +3114,7 @@ ER_PASSWORD_NOT_ALLOWED 42000 dan "Du skal have tilladelse til at opdatere tabeller i MySQL databasen for at 誅dre 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 "他のユーザーのパスワードを変更するためには, mysql データベースに対して update の許可がなければなりません.", est "Teiste paroolide muutmiseks on nutav tabelite muutmisigus 'mysql' andmebaasis" fre "Vous devez avoir le privil鑒e update sur les tables de la base de donn馥 mysql pour pouvoir changer les mots de passe des autres" ger "Sie bentigen die Berechtigung zum Aktualisieren von Tabellen in der Datenbank 'mysql', um die Passwrter anderer Benutzer 舅dern zu knnen" @@ -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 "一致数(Rows matched): %ld 変更: %ld Warnings: %ld", est "Sobinud kirjeid: %ld Muudetud: %ld Hoiatusi: %ld" fre "Enregistrements correspondants: %ld Modifi駸: %ld Warnings: %ld" ger "Datens舩ze gefunden: %ld Ge舅dert: %ld Warnungen: %ld" @@ -3077,6 +3174,7 @@ ER_CANT_CREATE_THREAD dan "Kan ikke danne en ny tr蘚 (fejl nr. %d). Hvis computeren ikke er lbet tr for hukommelse, kan du se i brugervejledningen for en mulig operativ-system - afh誅gig 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 "新規にスレッドが作れませんでした (errno %d). もし最大使用許可メモリー数を越えていないのにエラーが発生しているなら, マニュアルの中から 'possible OS-dependent bug' という文字を探してくみてださい.", est "Ei suuda luua uut lime (veakood %d). Kui m舁u ei ole otsas, on ten與liselt tegemist operatsioonissteemispetsiifilise veaga" fre "Impossible de cr馥r une nouvelle t稍he (errno %d). S'il reste de la m駑oire libre, consultez le manual pour trouver un 騅entuel bug d駱endant de l'OS" ger "Kann keinen neuen Thread erzeugen (Fehler: %d). Sollte noch Speicher verfgbar sein, bitte im Handbuch wegen mglicher Fehler im Betriebssystem nachschlagen" @@ -3138,6 +3236,7 @@ ER_INVALID_USE_OF_NULL 22004 dan "Forkert brug af nulv誡di (NULL)" nla "Foutief gebruik van de NULL waarde" eng "Invalid use of NULL value" + jps "NULL 値の使用方法が不適切です", 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誡t '%-.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 "ユーザー '%-.32s' (ホスト '%-.64s' のユーザー) は許可されていません", est "Sellist igust ei ole defineeritud kasutajale '%-.32s' masinast '%-.64s'" fre "Un tel droit n'est pas d馭ini pour l'utilisateur '%-.32s' sur l'hte '%-.64s'" ger "Fr 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 "コマンド %-.16s は ユーザー '%-.32s'@'%-.64s' ,テーブル '%-.64s' に対して許可されていません", est "%-.16s k舖k 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 fr Benutzer '%-.32s'@'%-.64s' und fr 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 "コマンド %-.16s は ユーザー '%-.32s'@'%-.64s'\n カラム '%-.64s' テーブル '%-.64s' に対して許可されていません", est "%-.16s k舖k 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 fr Benutzer '%-.32s'@'%-.64s' und Spalte '%-.64s' in Tabelle '%-.64s'"