diff options
| author | unknown <serg@serg.mylan> | 2004-07-21 23:32:11 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-07-21 23:32:11 +0200 |
| commit | ee6b36abf223b6a0fc930adb05babf30c720db23 (patch) | |
| tree | 627d927e4e9e57f24d498a32829834b2b686e419 /sql/share/english/errmsg.txt | |
| parent | 7dc2f74c9e9d6ab31a9dbc9e123ab72c53ee5e63 (diff) | |
| parent | 8da3aa0690796599167e3cfc5fd29deaca249d79 (diff) | |
| download | mariadb-git-ee6b36abf223b6a0fc930adb05babf30c720db23.tar.gz | |
merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/share/english/errmsg.txt')
| -rw-r--r-- | sql/share/english/errmsg.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index eceb027fa8a..d6f941d21f7 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -304,6 +304,7 @@ character-set=latin1 "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" "%s %s already exists" "%s %s does not exist" |