database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Fixes for tests after merge from 5.0

Browse Source 
mysql-test/r/grant.result:
  Fixed a result. Editor added wrong characters.
mysql-test/r/mysqlbinlog2.result:
  Fixed
mysql-test/r/sp.result:
  Fixed a result, moved lines around.
mysql-test/r/sp_trans.result:
  Fixed a result, moved lines around.
mysql-test/t/mysqlbinlog2.test:
  Merged tests from 5.0
mysql-test/t/sp_trans.test:
  Merged test from 5.0 and fixed to be compatible with 5.1
sql/sql_class.cc:
  Merged from 5.0
sql/sql_error.cc:
  Fixed push_warning()
This commit is contained in:
unknown
2007-04-05 22:34:33 +03:00
parent 67da87d82e
commit b89367f2f8
8 changed files with 151 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_error.cc
View File

@ -147,15 +147,9 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level,
if (thd->warn_list.elements < thd->variables.max_error_count)
{
/*
The following code is here to change the allocation to not
use the thd->mem_root, which is freed after each query
*/
MEM_ROOT *old_root= thd->mem_root;
thd->mem_root= &thd->warn_root;
if ((err= new MYSQL_ERROR(thd, code, level, msg)))
/* We have to use warn_root, as mem_root is freed after each query */
if ((err= new (&thd->warn_root) MYSQL_ERROR(thd, code, level, msg)))
thd->warn_list.push_back(err);
thd->mem_root= old_root;
}
thd->warn_count[(uint) level]++;
thd->total_warn_count++;