List:Commits« Previous MessageNext Message »
From:tomas Date:January 10 2006 11:13am
Subject:bk commit into 5.1 tree (tomas:1.2021)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2021 06/01/10 12:13:26 tomas@stripped +2 -0
  Merge tulin@stripped:/home/bk/mysql-5.1-new
  into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-wl2325-v6

  sql/log_event.cc
    1.196 06/01/10 12:13:18 tomas@stripped +0 -0
    Auto merged

  sql/handler.cc
    1.205 06/01/10 12:13:17 tomas@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325-v6/RESYNC

--- 1.195/sql/log_event.cc	2006-01-10 00:31:48 +01:00
+++ 1.196/sql/log_event.cc	2006-01-10 12:13:18 +01:00
@@ -79,6 +79,20 @@
 
 inline int ignored_error_code(int err_code)
 {
+#ifdef HAVE_NDB_BINLOG
+  /*
+    The following error codes are hard-coded and will always be ignored.
+  */
+  switch (err_code)
+  {
+  case ER_DB_CREATE_EXISTS:
+  case ER_DB_DROP_EXISTS:
+    return 1;
+  default:
+    /* Nothing to do */
+    break;
+  }
+#endif
   return ((err_code == ER_SLAVE_IGNORED_TABLE) ||
           (use_slave_mask && bitmap_is_set(&slave_error_mask, err_code)));
 }
@@ -5276,7 +5290,8 @@
       {
         slave_print_msg(ERROR_LEVEL, rli, error,
                         "Error in %s event: error during table %s.%s lock",
-                        get_type_str(), table->s->db, table->s->table_name);
+                        get_type_str(), table->s->db.str, 
+                        table->s->table_name.str);
         DBUG_RETURN(error);
       }
       /*
@@ -5412,7 +5427,12 @@
 
   if (error)
   {                     /* error has occured during the transaction */
-    /*
+    slave_print_msg(ERROR_LEVEL, rli, error,
+                    "Error in %s event: error during transaction execution "
+                    "on table %s.%s",
+                    get_type_str(), table->s->db.str, 
+                    table->s->table_name.str);
+     /*
       If one day we honour --skip-slave-errors in row-based replication, and
       the error should be skipped, then we would clear mappings, rollback,
       close tables, but the slave SQL thread would not stop and then may
@@ -5485,7 +5505,8 @@
       slave_print_msg(ERROR_LEVEL, rli, error,
                       "Error in %s event: commit of row events failed, "
                       "table `%s`.`%s`",
-                      get_type_str(), table->s->db, table->s->table_name);
+                      get_type_str(), table->s->db.str, 
+                      table->s->table_name.str);
     DBUG_RETURN(error);
   }
 
@@ -5585,8 +5606,8 @@
 {
     char buf[256];
     char const *const flagstr= get_flags(STMT_END_F) ? "STMT_END_F" : "";
-    char const *const dbnam= m_table->s->db;
-    char const *const tblnam= m_table->s->table_name;
+    char const *const dbnam= m_table->s->db.str;
+    char const *const tblnam= m_table->s->table_name.str;
     my_size_t bytes= snprintf(buf, sizeof(buf),
                               "%s.%s - %s", dbnam, tblnam, flagstr);
     protocol->store(buf, bytes, &my_charset_bin);
@@ -6105,7 +6126,8 @@
   */
   thd->lex->sql_command= SQLCOM_REPLACE;
 
-  table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);   // needed for ndbcluster
+  table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);  // Needed for ndbcluster
+  table->file->extra(HA_EXTRA_IGNORE_NO_KEY);   // Needed for ndbcluster
   /*
     TODO: the cluster team (Tomas?) says that it's better if the engine knows
     how many rows are going to be inserted, then it can allocate needed memory
@@ -6372,6 +6394,9 @@
   }
 
   DBUG_ASSERT(record_buf);
+
+  /* We need to retrieve all fields */
+  table->file->ha_set_all_bits_in_read_set();
 
   if (table->s->keys > 0)
   {
Thread
bk commit into 5.1 tree (tomas:1.2021)tomas10 Jan