From: Lars Thalmann
Date: December 29 2005 9:43pm
Subject: bk commit into 5.1 tree (lars:1.1981)
List-Archive: http://lists.mysql.com/commits/466
Message-Id: <200512292143.jBTLhk60031316@dl145j.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann 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.1981 05/12/29 22:43:32 lars@stripped +4 -0
  WL#2325: Post-merge fixes

  sql/slave.cc
    1.261 05/12/29 22:43:11 lars@stripped +5 -3
    Post-merge fixes

  sql/rpl_injector.h
    1.2 05/12/29 22:43:10 lars@stripped +6 -2
    Post-merge fixes

  sql/log_event.cc
    1.197 05/12/29 22:43:10 lars@stripped +5 -5
    Post-merge fixes

  include/my_base.h
    1.77 05/12/29 22:43:08 lars@stripped +1 -1
    Post-merge fixes

# 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:	lars
# Host:	dl145j.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.1-wl2325-v3-max

--- 1.76/include/my_base.h	2005-12-29 21:16:16 +01:00
+++ 1.77/include/my_base.h	2005-12-29 22:43:08 +01:00
@@ -154,7 +154,7 @@
   */
   HA_EXTRA_KEYREAD_PRESERVE_FIELDS,
   HA_EXTRA_IGNORE_NO_KEY,		/* Tuple not found don't rollback everything*/
-  HA_EXTRA_NO_IGNORE_NO_KEY
+  HA_EXTRA_NO_IGNORE_NO_KEY,
   HA_EXTRA_MMAP
 };
 

--- 1.196/sql/log_event.cc	2005-12-29 21:16:18 +01:00
+++ 1.197/sql/log_event.cc	2005-12-29 22:43:10 +01:00
@@ -5418,11 +5418,11 @@
 
   if (error)
   {                     /* error has occured during the transaction */
-    slave_print_error(rli, error,
-		      "Error in %s event: error during transaction execution "
-		      "on table %s.%s",
-		      get_type_str(), table->s->db, table->s->table_name);
-    /*
+    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, table->s->table_name);
+     /*
       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

--- 1.260/sql/slave.cc	2005-12-29 20:48:13 +01:00
+++ 1.261/sql/slave.cc	2005-12-29 22:43:11 +01:00
@@ -3576,13 +3576,15 @@
         {
           if (rli->last_slave_errno == 0)
           {
-            slave_print_error(rli, thd->net.last_errno,
-                              thd->net.last_error ? thd->net.last_error : "<no message>");
+            slave_print_msg(ERROR_LEVEL, rli, thd->net.last_errno,
+                            thd->net.last_error ?
+                            thd->net.last_error : "<no message>");
           }
           else if (rli->last_slave_errno != thd->net.last_errno)
           {
             sql_print_error("Slave (additional info): %s Error_code: %d",
-                            thd->net.last_error ? thd->net.last_error : "<no message>",
+                            thd->net.last_error ?
+                            thd->net.last_error : "<no message>",
                             thd->net.last_errno);
           }
         }

--- 1.1/sql/rpl_injector.h	2005-11-24 09:59:13 +01:00
+++ 1.2/sql/rpl_injector.h	2005-12-29 22:43:10 +01:00
@@ -110,6 +110,10 @@
           injector::transaction
             Provide a flexible interface to the representation of tables.
 
+        TODO
+
+          This should use LEX_STRING (WL#2894)
+
       */
       class table 
       {
@@ -119,8 +123,8 @@
         { 
         }
 
-        char const *db_name() const { return m_table->s->db; }
-        char const *table_name() const { return m_table->s->table_name; }
+        char const *db_name() const { return m_table->s->db.str; }
+        char const *table_name() const { return m_table->s->table_name.str; }
         TABLE *get_table() const { return m_table; }
         bool is_transactional() const { return m_is_transactional; }