diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-02-26 00:22:35 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-02-26 00:22:35 +0200 |
| commit | b9c69c1609ad2590b6c0130c0d3fcc5e7a033e76 (patch) | |
| tree | 7ab76a019795a4806b97cb19efc02d2efcfaff5e /sql/share/japanese | |
| parent | 6e2ee18779d86b12d2c61a10fba4a1ced1ac0b8e (diff) | |
| parent | 21f2382b283e9676f58d61ac744dd744e153239a (diff) | |
| download | mariadb-git-b9c69c1609ad2590b6c0130c0d3fcc5e7a033e76.tar.gz | |
merge with 3.23 to get corrected error message files and rename of files in mysql-test
innobase/ibuf/ibuf0ibuf.c:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_analyse.h:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
mysql-test/t/rpl000015.slave-mi:
Auto merged
mysql-test/t/rpl_rotate_logs.slave-mi:
Auto merged
mysql-test/mysql-test-run.sh:
merge with 3.23
scripts/make_binary_distribution.sh:
merge with 3.23
sql/share/czech/errmsg.txt:
merge with 3.23
sql/share/danish/errmsg.txt:
merge with 3.23
sql/share/dutch/errmsg.txt:
merge with 3.23
sql/share/estonian/errmsg.txt:
merge with 3.23
sql/share/swedish/errmsg.txt:
merge with 3.23
sql/sql_class.cc:
merge with 3.23 (Keep local copy)
Diffstat (limited to 'sql/share/japanese')
| -rw-r--r-- | sql/share/japanese/errmsg.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt index 663676e0cf3..f9c1645419d 100644 --- a/sql/share/japanese/errmsg.txt +++ b/sql/share/japanese/errmsg.txt @@ -161,7 +161,7 @@ "Got an error from fcntl()", "Got packets out of order", "Couldn't uncompress communication packet", -"Got an error reading communication packets" +"Got an error reading communication packets", "Got timeout reading communication packets", "Got an error writing communication packets", "Got timeout writing communication packets", @@ -200,7 +200,7 @@ "Table '%-.64s' is marked as crashed and should be repaired", "Table '%-.64s' is marked as crashed and last (automatic?) repair failed", "Warning: 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', +"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 SLAVE STOP first", "This operation requires a running slave, configure slave and do SLAVE START", "The server is not configured as slave, fix in config file or with CHANGE MASTER TO", |