bzr commit into mysql-6.0-runtime branch (davi:2786)

[Davi Arnaut]

# At a local mysql-6.0-runtime repository of davi

 2786 Davi Arnaut	2009-01-14
      Fixes after merge from main.
modified:
  .bzr-mysql/default.conf
  sql/backup/kernel.cc
  sql/handler.cc

per-file messages:
  .bzr-mysql/default.conf
    Restore tree name after merge from main.
  sql/backup/kernel.cc
    Diagnostics area is now used through the stmt_da pointer.
  sql/handler.cc
    Diagnostics area is now used through the stmt_da pointer.
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2009-01-10 10:56:50 +0000
+++ b/.bzr-mysql/default.conf	2009-01-14 10:10:00 +0000
@@ -1,5 +1,5 @@
 [MYSQL]
-tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-opt/
-post_commit_to = "commits@stripped"
-post_push_to = "commits@stripped"
-tree_name = "mysql-6.0-opt"
+tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-runtime
+post_commit_to = commits@stripped
+post_push_to = commits@stripped
+tree_name = mysql-6.0-runtime

=== modified file 'sql/backup/kernel.cc'
--- a/sql/backup/kernel.cc	2008-12-17 18:40:14 +0000
+++ b/sql/backup/kernel.cc	2009-01-14 10:10:00 +0000
@@ -1241,7 +1241,7 @@ int Backup_restore_ctx::do_restore(bool 
     following line should be removed.
    */
   close_thread_tables(m_thd);                   // Never errors
-  m_thd->main_da.reset_diagnostics_area();      // Never errors  
+  m_thd->stmt_da->reset_diagnostics_area();     // Never errors
 
   err= lock_tables_for_restore();               // logs errors
   if (err)
@@ -1273,7 +1273,7 @@ int Backup_restore_ctx::do_restore(bool 
     following line should be removed.
    */
   close_thread_tables(m_thd);                   // Never errors
-  m_thd->main_da.reset_diagnostics_area();      // Never errors
+  m_thd->stmt_da->reset_diagnostics_area();     // Never errors
 
   DBUG_PRINT("restore",("Done."));
 

=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2009-01-13 15:26:20 +0000
+++ b/sql/handler.cc	2009-01-14 10:10:00 +0000
@@ -3893,7 +3893,7 @@ int ha_reset_logs(THD *thd)
 {
   binlog_func_st bfn= {BFN_RESET_LOGS, 0};
   binlog_func_foreach(thd, &bfn);
-  if (thd->main_da.is_error())
+  if (thd->stmt_da->is_error())
     return 1;
   return 0;
 }
@@ -3902,7 +3902,7 @@ int ha_reset_slave(THD* thd)
 {
   binlog_func_st bfn= {BFN_RESET_SLAVE, 0};
   binlog_func_foreach(thd, &bfn);
-  if (thd->main_da.is_error())
+  if (thd->stmt_da->is_error())
     return 1;
   return 0;
 }
@@ -3924,7 +3924,7 @@ int ha_binlog_index_purge_file(THD *thd,
 {
   binlog_func_st bfn= {BFN_BINLOG_PURGE_FILE, (void *)file};
   binlog_func_foreach(thd, &bfn);
-  if (thd->main_da.is_error())
+  if (thd->stmt_da->is_error())
     return 1;
   return 0;
 }
@@ -3933,7 +3933,7 @@ static int ha_global_schema_lock(THD *th
 {
   binlog_func_st bfn= {BFN_GLOBAL_SCHEMA_LOCK, (void *)&no_queue};
   int res= binlog_func_foreach(thd, &bfn);
-  if (res || thd->main_da.is_error())
+  if (res || thd->stmt_da->is_error())
     return 1;
   return 0;
 }
@@ -3942,7 +3942,7 @@ static int ha_global_schema_unlock(THD *
 {
   binlog_func_st bfn= {BFN_GLOBAL_SCHEMA_UNLOCK, 0};
   binlog_func_foreach(thd, &bfn);
-  if (thd->main_da.is_error())
+  if (thd->stmt_da->is_error())
     return 1;
   return 0;
 }