diff options
| author | unknown <jimw@mysql.com> | 2005-03-01 15:25:17 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-03-01 15:25:17 -0800 |
| commit | 84381afbe355e3d1ae8b6ecb0ea46bbfb23b5792 (patch) | |
| tree | 53a47f571684aa1dfa39f00073766239dbd4245e /sql/share | |
| parent | af529fd14c871e78acac4d6c0dd6091086692675 (diff) | |
| parent | 239543f725e27d0f9b842f74ccf1add91b64883e (diff) | |
| download | mariadb-git-84381afbe355e3d1ae8b6ecb0ea46bbfb23b5792.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-8444
into mysql.com:/home/jimw/my/mysql-5.0-clean
sql/mysqld.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index ba4ef70486b..f2772c29b32 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -1824,7 +1824,7 @@ ER_READY cze "%s: p-Bipraven na spojen" dan "%s: klar til tilslutninger" nla "%s: klaar voor verbindingen" - eng "%s: ready for connections.\nVersion: '%s' socket: '%s' port: %d" + eng "%s: ready for connections.\nVersion: '%s' socket: '%s' port: %d %s" jps "%s: ", est "%s: ootab hendusi" fre "%s: Prt pour des connections" @@ -1839,7 +1839,7 @@ ER_READY pol "%s: gotowe do po?czenia" por "%s: Pronto para conexes" rum "%s: sint gata pentru conectii" - rus "%s: .\n: '%s' : '%s' : %d" + rus "%s: .\n: '%s' : '%s' : %d %s" serbian "%s: Spreman za konekcije\n" slo "%s: pripraven na spojenie" spa "%s: preparado para conexiones" |