diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2013-07-05 15:25:01 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2013-07-05 15:25:01 +0400 |
| commit | 1b3a5deec5f95b330726db96540048e92df07513 (patch) | |
| tree | 3c2b21fe23750e7b4feebf2618599a7a0cc1fb80 /sql/share | |
| parent | f2fcd7bdbcd6f4fe3b36fd326aa1ce1baacf7d1a (diff) | |
| download | mariadb-git-1b3a5deec5f95b330726db96540048e92df07513.tar.gz | |
Fix limit_rows_examined.test:
- Take into account that Dynamic_array::back() now returns
pointer to the last element (it used to return pointer to
right after the last element)
- Fix error messages merge: ER_INTERNAL_ERROR was defined
independently by both mysql-5.6 and mariadb-5.5. Switch
to their error number, and still support ours for compatibility.
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 156ec759099..216c3d091bc 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7098,6 +7098,8 @@ ER_VIEW_ORDERBY_IGNORED eng "View '%-.192s'.'%-.192s' ORDER BY clause ignored because there is other ORDER BY clause already." ER_CONNECTION_KILLED 70100 eng "Connection was killed" +ER_UNSED + eng "Internal error: '%-.192s'" ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_SKIP_REPLICATION eng "Cannot modify @@session.skip_replication inside a transaction" ER_STORED_FUNCTION_PREVENTS_SWITCH_SKIP_REPLICATION |