bk commit into 5.1 tree (mats:1.1792)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats 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.1792 05/03/17 14:21:28 mats@stripped +2 -0
  WL#2324: Injector support in MySQL
    Update row only uses one bitvector for the columns

  sql/injector.h
    1.3 05/03/17 14:21:24 mats@stripped +7 -7
    Update row only uses one bitvector for the columns

  sql/injector.cc
    1.3 05/03/17 14:21:24 mats@stripped +2 -3
    Update row only uses one bitvector for the columns

# 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:	mats
# Host:	romeo.kindahl.net
# Root:	/home/bk/w2324-mysql-5.1

--- 1.2/sql/injector.cc	2005-03-16 14:55:14 +01:00
+++ 1.3/sql/injector.cc	2005-03-17 14:21:24 +01:00
@@ -42,9 +42,8 @@
 
 
 int injector::transaction::
-update_row(server_id_type sid, table tbl, 
-	   bitvector const& before_cols, record_type before, 
-	   bitvector const& after_cols, record_type after)
+update_row(server_id_type sid, table tbl, bitvector const& cols, 
+	   record_type before, record_type after)
 {
    DBUG_ENTER("injector::transaction::update_row(...)");
    DBUG_RETURN(0);

--- 1.2/sql/injector.h	2005-03-16 14:55:14 +01:00
+++ 1.3/sql/injector.h	2005-03-17 14:21:24 +01:00
@@ -87,6 +87,7 @@
       transaction(transaction const&);
       ~transaction();
 
+      // Default assignment operator: standard implementation
       transaction& operator=(transaction t) {
 	swap(t);
 	return *this;
@@ -95,21 +96,20 @@
       /*
 	Add a 'write row' entry to the transaction.
       */
-      int write_row (server_id_type sid, table tbl, 
-		     bitvector const& cols, record_type record);
+      int write_row (server_id_type sid, table tbl, bitvector const& cols, 
+		     record_type record);
 
       /*
 	Add a 'delete row' entry to the transaction.
       */
-      int delete_row(server_id_type sid, table tbl, 
-		     bitvector const& cols, record_type record);
+      int delete_row(server_id_type sid, table tbl, bitvector const& cols, 
+		     record_type record);
 
       /*
 	Add an 'update row' entry to the transaction.
       */
-      int update_row(server_id_type sid, table tbl, 
-		     bitvector const& before_cols, record_type before, 
-		     bitvector const& after_cols,  record_type after);
+      int update_row(server_id_type sid, table tbl, bitvector const& cols, 
+		     record_type before, record_type after);
 
       /*
 	Commit a transaction.