bk commit into 5.2 tree (antony:1.2572)

[antony]

Below is the list of changes that have just been committed into a local
5.2 repository of antony. When antony 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@stripped, 2007-08-24 16:04:15-07:00, antony@stripped +2 -0
  Post merge fix

  mysql-test/suite/rpl/r/rpl_udf.result@stripped, 2007-08-24 16:04:11-07:00, antony@stripped +2 -2
    Fix bad auto-merge

  sql/sql_load.cc@stripped, 2007-08-24 16:04:11-07:00, antony@stripped +1 -1
    Post merge fix

diff -Nrup a/mysql-test/suite/rpl/r/rpl_udf.result b/mysql-test/suite/rpl/r/rpl_udf.result
--- a/mysql-test/suite/rpl/r/rpl_udf.result	2007-07-15 09:58:34 -07:00
+++ b/mysql-test/suite/rpl/r/rpl_udf.result	2007-08-24 16:04:11 -07:00
@@ -248,8 +248,8 @@ affected rows: 2
 "Running on the slave"
 SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%';
 db	name	type	param_list	body	comment
-test	myfuncsql_int	FUNCTION	i INT	RETURN i	
 test	myfuncsql_double	FUNCTION	d DOUBLE	RETURN d * 2.00	
+test	myfuncsql_int	FUNCTION	i INT	RETURN i	
 affected rows: 2
 "Running on the master"
 CREATE TABLE t1(sum INT, price FLOAT(24)) ENGINE=MyISAM;
@@ -290,8 +290,8 @@ affected rows: 2
 "Running on the slave"
 SELECT db, name, type,  param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%';
 db	name	type	param_list	body	comment
-test	myfuncsql_int	FUNCTION	i INT	RETURN i	This was altered.
 test	myfuncsql_double	FUNCTION	d DOUBLE	RETURN d * 2.00	This was altered.
+test	myfuncsql_int	FUNCTION	i INT	RETURN i	This was altered.
 affected rows: 2
 SELECT myfuncsql_int(25);
 myfuncsql_int(25)
diff -Nrup a/sql/sql_load.cc b/sql/sql_load.cc
--- a/sql/sql_load.cc	2007-08-24 15:17:42 -07:00
+++ b/sql/sql_load.cc	2007-08-24 16:04:11 -07:00
@@ -1034,7 +1034,7 @@ read_xml_field(THD *thd, COPY_INFO &info
       We don't need to reset auto-increment field since we are restoring
       its default value at the beginning of each loop iteration.
     */
-    thd->no_trans_update.stmt= no_trans_update_stmt;
+    thd->transaction.stmt.modified_non_trans_table= no_trans_update_stmt;
     thd->row_count++;
     continue_loop:;
   }