diff options
| author | monty@mysql.com <> | 2004-09-06 15:14:10 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-09-06 15:14:10 +0300 |
| commit | 31122efde725e9b472e467a7cb1807100b7e6b1e (patch) | |
| tree | d9ef905036723648a1d354d0523ef8124e4dee76 /sql/share/japanese/errmsg.txt | |
| parent | 32594c99899edd6de0053609c087f04dc21fbbfd (diff) | |
| parent | 5d71817c7049e9db5c22e1667a41f57cf558d8ed (diff) | |
| download | mariadb-git-31122efde725e9b472e467a7cb1807100b7e6b1e.tar.gz | |
Merge with 4.1
(Includes merge of arena code in 4.1 and 5.0)
Diffstat (limited to 'sql/share/japanese/errmsg.txt')
| -rw-r--r-- | sql/share/japanese/errmsg.txt | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt index 68f2857aeca..f73eca2a183 100644 --- a/sql/share/japanese/errmsg.txt +++ b/sql/share/japanese/errmsg.txt @@ -1,5 +1,20 @@ -/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB - This file is public domain and comes with NO WARRANTY of any kind +/* 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 */ @@ -81,7 +96,7 @@ character-set=ujis "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: 準備完了\n", +"%s: 準備完了", "%s: Normal shutdown\n", "%s: Got signal %d. 中断!\n", "%s: Shutdown 完了\n", @@ -306,7 +321,8 @@ character-set=ujis "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 (%d) - truncated" +"Result of %s() was larger than max_allowed_packet (%ld) - truncated" +"Conflicting declarations: '%s%s' and '%s%s'" "Can't create a %s from within another stored routine" "%s %s already exists" "%s %s does not exist" |