diff options
| author | Alfranio Correia <alfranio.correia@oracle.com> | 2010-12-03 01:06:56 +0000 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@oracle.com> | 2010-12-03 01:06:56 +0000 |
| commit | b28d2c25a71c0be09af0e5f1760d17b70530885f (patch) | |
| tree | 17b03034adacba5198daf59764421d0d94a325d9 /sql/share | |
| parent | 3ffab566196fb596e91eb9260d791d8578401b16 (diff) | |
| parent | 3f5a9c7ea03e5c6a62f41bb90f6b1655c59d3d75 (diff) | |
| download | mariadb-git-b28d2c25a71c0be09af0e5f1760d17b70530885f.tar.gz | |
merge mysql-5.5-bugteam(local) --> mysql-5.5-bugteam
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index be97afe055a..b0dc4d9195b 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6392,3 +6392,5 @@ ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MIN ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MAX eng "The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout." +ER_STMT_CACHE_FULL + eng "Multi-row statements required more than 'max_binlog_stmt_cache_size' bytes of storage; increase this mysqld variable and try again" |