Commit 1b3a5dee authored by Sergey Petrunya's avatar Sergey Petrunya

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.
parent f2fcd7bd
......@@ -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
......
......@@ -975,7 +975,7 @@ subst_spvars(THD *thd, sp_instr *instr, LEX_STRING *query_str)
thd->query_name_consts= 0;
for (Item_splocal **splocal= sp_vars_uses.front();
splocal < sp_vars_uses.back(); splocal++)
splocal <= sp_vars_uses.back(); splocal++)
{
Item *val;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment