bk commit into 5.1 tree (mats:1.1827)

[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.1827 05/03/22 12:30:49 mats@stripped +3 -0
  WL#1012, WL#2324
    Merge with 5.1 WL#2325 clone

  mysql-test/t/rpl_row_trans.disabled
    1.1 05/03/22 12:30:42 mats@stripped +1 -0

  sql/sql_select.cc
    1.303 05/03/22 12:30:42 mats@stripped +2 -2
    Using ha_write_row instead of write_row

  mysql-test/t/rpl_row_trans.disabled
    1.0 05/03/22 12:30:42 mats@stripped +0 -0
    BitKeeper file /home/bk/forndb-mysql-5.1/mysql-test/t/rpl_row_trans.disabled

  mysql-test/mysql-test-run.sh
    1.255 05/03/22 12:30:42 mats@stripped +6 -6
    Enabling .disabled tests.

# 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/forndb-mysql-5.1

--- 1.254/mysql-test/mysql-test-run.sh	2005-03-21 22:12:09 +01:00
+++ 1.255/mysql-test/mysql-test-run.sh	2005-03-22 12:30:42 +01:00
@@ -1537,12 +1537,12 @@
    return
  fi
 
-# if [ -f "$TESTDIR/$tname.disabled" ]
-# then
-#   comment=`$CAT $TESTDIR/$tname.disabled`;
-#   disable_test $tname "$comment"
-#   return
-# fi
+ if [ -f "$TESTDIR/$tname.disabled" ]
+ then
+   comment=`$CAT $TESTDIR/$tname.disabled`;
+   disable_test $tname "$comment"
+   return
+ fi
  if [ -f "$TESTDIR/disabled.def" ] ; then
    comment=`$GREP "^$tname *: *" $TESTDIR/disabled.def`;
    if [ -n "$comment" ]

--- 1.302/sql/sql_select.cc	2005-03-22 10:43:16 +01:00
+++ 1.303/sql/sql_select.cc	2005-03-22 12:30:42 +01:00
@@ -10145,7 +10145,7 @@
                        join->sum_funcs_end[send_group_parts]);
 	if (join->having && join->having->val_int() == 0)
           error= -1;
-        else if ((error=table->file->write_row(table->record[0])))
+        else if ((error=table->file->ha_write_row(table->record[0])))
 	{
 	  if (create_myisam_from_heap(join->thd, table,
 				      &join->tmp_table_param,
@@ -12796,7 +12796,7 @@
           item->save_in_result_field(1);
       }
       copy_sum_funcs(sum_funcs_end[i+1], sum_funcs_end[i]);
-      if ((error= table->file->write_row(table->record[0])))
+      if ((error= table->file->ha_write_row(table->record[0])))
       {
 	if (create_myisam_from_heap(thd, table, &tmp_table_param,
 				      error, 0))
--- New file ---
+++ mysql-test/t/rpl_row_trans.disabled	05/03/22 12:30:42
Not Yet Implemented