Post-merge fix.

sql/share/estonian/errmsg.txt:
  Auto merged
sql/sql_db.cc:
  Auto merged
This commit is contained in:
unknown 2004-07-23 18:54:01 +02:00
commit 6ab9b7b6b9
125 changed files with 5787 additions and 16732 deletions

View file

@ -307,6 +307,7 @@ 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'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"