Commit 6352d006 authored by kostja@bodhi.(none)'s avatar kostja@bodhi.(none)

Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
parents 4c7d2df9 19ae62f3
...@@ -64,11 +64,11 @@ Prelock_error_handler::handle_error(uint sql_errno, ...@@ -64,11 +64,11 @@ Prelock_error_handler::handle_error(uint sql_errno,
if (sql_errno == ER_NO_SUCH_TABLE) if (sql_errno == ER_NO_SUCH_TABLE)
{ {
m_handled_errors++; m_handled_errors++;
return TRUE; // 'TRUE', as per coding style return TRUE;
} }
m_unhandled_errors++; m_unhandled_errors++;
return FALSE; // 'FALSE', as per coding style return FALSE;
} }
...@@ -3533,7 +3533,7 @@ int open_tables(THD *thd, TABLE_LIST **start, uint *counter, uint flags) ...@@ -3533,7 +3533,7 @@ int open_tables(THD *thd, TABLE_LIST **start, uint *counter, uint flags)
*/ */
for (tables= *start; tables ;tables= tables->next_global) for (tables= *start; tables ;tables= tables->next_global)
{ {
safe_to_ignore_table= FALSE; // 'FALSE', as per coding style safe_to_ignore_table= FALSE;
if (tables->lock_type == TL_WRITE_DEFAULT) if (tables->lock_type == TL_WRITE_DEFAULT)
{ {
......
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