diff options
| author | unknown <hf@deer.(none)> | 2004-07-21 19:10:37 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-07-21 19:10:37 +0500 |
| commit | c5fc0d433ab28d4309297875092888c920dcde3f (patch) | |
| tree | e760e781ebd9feba1f0e8c01f34971bd6e703d70 /sql/share | |
| parent | bf95f9195fe431841fe1e29e6b82c9f47ec52ad3 (diff) | |
| parent | 58bdba5785313f89398231f796ba989a4de81a69 (diff) | |
| download | mariadb-git-c5fc0d433ab28d4309297875092888c920dcde3f.tar.gz | |
Merging
mysql-test/r/func_str.result:
Auto merged
sql/item_geofunc.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/estonian/errmsg.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt index a2f4c848217..626816ae72c 100644 --- a/sql/share/estonian/errmsg.txt +++ b/sql/share/estonian/errmsg.txt @@ -307,5 +307,4 @@ character-set=latin7 "Got error %d '%-.100s' from %s", "Got temporary error %d '%-.100s' from %s", "Unknown or incorrect time zone: '%-.64s'", -"Invalid TIMESTAMP value in column '%s' at row %ld", "Invalid %s character string: '%.64s'", |