diff options
author | unknown <monty@mysql.com> | 2003-12-19 16:42:17 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2003-12-19 16:42:17 +0200 |
commit | 6988eaffade652053ab5154ace6a321e4d2ff9c6 (patch) | |
tree | 1bc701f03b8b7eee26e53e61cad701ad3bbf621d /sql/share/greek | |
parent | 245b1385a10a12a955c95338b08190cac5cfcbd4 (diff) | |
parent | a7d8af9b08363808c2e2ec9e26ae67a5616bb746 (diff) | |
download | mariadb-git-6988eaffade652053ab5154ace6a321e4d2ff9c6.tar.gz |
merge with 4.0.18
Build-tools/Bootstrap:
Auto merged
client/mysql.cc:
Auto merged
mysql-test/r/auto_increment.result:
Auto merged
mysql-test/t/auto_increment.test:
Auto merged
mysql-test/t/type_decimal.test:
Auto merged
sql/opt_range.cc:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/slave.cc:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/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/share/polish/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
Diffstat (limited to 'sql/share/greek')
-rw-r--r-- | sql/share/greek/errmsg.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt index 5472e824e61..5813717f57a 100644 --- a/sql/share/greek/errmsg.txt +++ b/sql/share/greek/errmsg.txt @@ -204,7 +204,7 @@ character-set=greek "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, check permisions on master.info", +"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", |