diff options
| author | unknown <joreland@mysql.com> | 2004-09-01 04:55:16 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-09-01 04:55:16 +0200 |
| commit | 069c47d260a8ace235841a98877f47ae85a8f237 (patch) | |
| tree | 9ee4f88ee6169712ed0f5725e4a71d48dcf79eaf /sql/share/polish/errmsg.txt | |
| parent | 15135482adf5a4e556e25576e4b1f408e6343e79 (diff) | |
| parent | 775c057ef4445f787bf07e0a99ecb8075672f9cd (diff) | |
| download | mariadb-git-069c47d260a8ace235841a98877f47ae85a8f237.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
acinclude.m4:
Auto merged
configure.in:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'sql/share/polish/errmsg.txt')
| -rw-r--r-- | sql/share/polish/errmsg.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt index 417757b2aea..c61db27cd58 100644 --- a/sql/share/polish/errmsg.txt +++ b/sql/share/polish/errmsg.txt @@ -309,4 +309,4 @@ character-set=latin2 "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' and '%s'" +"Conflicting declarations: '%s%s' and '%s%s'" |