bzr commit into mysql-6.0-wl2110-review branch (marc.alff:2682)

[Marc Alff]

#At file:///home/malff/BZR-TREE/mysql-6.0-wl2110-review/

 2682 Marc Alff	2008-08-25 [merge]
      Partial merge
modified:
  sql/sql_base.cc
  sql/sql_view.cc
  sql/table.cc

=== modified file 'sql/sql_base.cc'
--- a/sql/sql_base.cc	2008-07-25 15:10:14 +0000
+++ b/sql/sql_base.cc	2008-08-25 22:09:49 +0000
@@ -44,9 +44,7 @@ public:
 
   virtual ~Prelock_error_handler() {}
 
-  virtual bool handle_error(uint sql_errno, const char *message,
-                            MYSQL_ERROR::enum_warning_level level,
-                            THD *thd);
+  virtual bool handle_condition(THD *thd, const SQL_condition *cond);
 
   bool safely_trapped_errors();
 
@@ -57,12 +55,9 @@ private:
 
 
 bool
-Prelock_error_handler::handle_error(uint sql_errno,
-                                    const char * /* message */,
-                                    MYSQL_ERROR::enum_warning_level /* level */,
-                                    THD * /* thd */)
+Prelock_error_handler::handle_condition(THD *, const SQL_condition *cond)
 {
-  if (sql_errno == ER_NO_SUCH_TABLE)
+  if (cond->get_sql_errno() == ER_NO_SUCH_TABLE)
   {
     m_handled_errors++;
     return TRUE;
@@ -2383,7 +2378,7 @@ bool open_table(THD *thd, TABLE_LIST *ta
 
   if (flags & MYSQL_OPEN_TEMPORARY_ONLY)
   {
-    my_error(ER_NO_SUCH_TABLE, MYF(0), table_list->db, table_list->table_name);
+    thd->raise_ER_NO_SUCH_TABLE(table_list->db, table_list->table_name);
     DBUG_RETURN(TRUE);
   }
 
@@ -2506,7 +2501,7 @@ bool open_table(THD *thd, TABLE_LIST *ta
       locked tables list was created.
     */
     if (thd->locked_tables_mode == LTM_PRELOCKED)
-      my_error(ER_NO_SUCH_TABLE, MYF(0), table_list->db, table_list->alias);
+      thd->raise_ER_NO_SUCH_TABLE(table_list->db, table_list->alias);
     else
       my_error(ER_TABLE_NOT_LOCKED, MYF(0), alias);
     DBUG_RETURN(TRUE);

=== modified file 'sql/sql_view.cc'
--- a/sql/sql_view.cc	2008-07-15 16:29:51 +0000
+++ b/sql/sql_view.cc	2008-08-25 22:09:49 +0000
@@ -482,7 +482,7 @@ bool mysql_create_view(THD *thd, TABLE_L
         strcmp(tbl->view_db.str, view->db) == 0 &&
         strcmp(tbl->view_name.str, view->table_name) == 0)
     {
-      my_error(ER_NO_SUCH_TABLE, MYF(0), tbl->view_db.str, tbl->view_name.str);
+      thd->raise_ER_NO_SUCH_TABLE(tbl->view_db.str, tbl->view_name.str);
       res= TRUE;
       goto err;
     }
@@ -935,7 +935,7 @@ loop_out:
    {
       if (mode == VIEW_ALTER)
       {
-	my_error(ER_NO_SUCH_TABLE, MYF(0), view->db, view->alias);
+        thd->raise_ER_NO_SUCH_TABLE(view->db, view->alias);
         error= -1;
         goto err;
       }

=== modified file 'sql/table.cc'
--- a/sql/table.cc	2008-08-07 03:05:33 +0000
+++ b/sql/table.cc	2008-08-25 22:09:49 +0000
@@ -2304,7 +2304,7 @@ void open_table_error(TABLE_SHARE *share
   case 7:
   case 1:
     if (db_errno == ENOENT)
-      my_error(ER_NO_SUCH_TABLE, MYF(0), share->db.str, share->table_name.str);
+      current_thd->raise_ER_NO_SUCH_TABLE(share->db.str, share->table_name.str);
     else
     {
       strxmov(buff, share->normalized_path.str, reg_ext, NullS);