bk commit into 5.1 tree (gluh:1.2420)

[gluh]

Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh 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-02-02 14:26:53+04:00, gluh@stripped +4 -0
  after merge fix

  mysql-test/r/ndb_read_multi_range.result@stripped, 2007-02-02 14:26:51+04:00, gluh@stripped +3 -3
    result fix

  mysql-test/t/ndb_read_multi_range.test@stripped, 2007-02-02 14:26:51+04:00, gluh@stripped +3 -3
    test case fix

  sql/opt_range.cc@stripped, 2007-02-02 14:26:51+04:00, gluh@stripped +1 -1
    after merge fix

  sql/sql_delete.cc@stripped, 2007-02-02 14:26:51+04:00, gluh@stripped +2 -2
    after merge fix

# 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:	gluh
# Host:	eagle.(none)
# Root:	/home/gluh/MySQL/Merge/5.1-opt

--- 1.259/sql/opt_range.cc	2007-02-02 10:25:43 +04:00
+++ 1.260/sql/opt_range.cc	2007-02-02 14:26:51 +04:00
@@ -563,7 +563,7 @@ public:
   /* Number of ranges in the last checked tree->key */
   uint n_ranges;
   uint8 first_null_comp; /* first null component if any, 0 - otherwise */
-} PARAM;
+};
 
 class TABLE_READ_PLAN;
   class TRP_RANGE;

--- 1.207/sql/sql_delete.cc	2007-02-02 10:25:43 +04:00
+++ 1.208/sql/sql_delete.cc	2007-02-02 14:26:51 +04:00
@@ -75,8 +75,8 @@ bool mysql_delete(THD *thd, TABLE_LIST *
   if (!using_limit && const_cond && (!conds || conds->val_int()) &&
       !(specialflag & (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE)) &&
       (thd->lex->sql_command == SQLCOM_TRUNCATE ||
-       !(table->triggers && table->triggers->has_delete_triggers()))
-     )
+       !(table->triggers && table->triggers->has_delete_triggers())) &&
+      !thd->current_stmt_binlog_row_based)
   {
     /* Update the table->file->stats.records number */
     table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);

--- 1.9/mysql-test/r/ndb_read_multi_range.result	2006-12-15 12:06:09 +04:00
+++ 1.10/mysql-test/r/ndb_read_multi_range.result	2007-02-02 14:26:51 +04:00
@@ -417,12 +417,12 @@ a	b	c
 9199	9200	NULL
 223456	223457	NULL
 245651	245652	2005-12-08 15:58:27
-select c, count(*)
+select t21.c, count(*)
 from t21 
 inner join t22 using (a)
 where t22.b in (2,256,257,1121,1134,4102,9200,223457,245652)
-group by c
-order by c;
+group by t21.c
+order by t21.c;
 c	count(*)
 NULL	7
 2005-12-08 15:58:27	1

--- 1.11/mysql-test/t/ndb_read_multi_range.test	2006-12-15 12:06:09 +04:00
+++ 1.12/mysql-test/t/ndb_read_multi_range.test	2007-02-02 14:26:51 +04:00
@@ -249,12 +249,12 @@ t22.a in (select t12.a from t11, t12 whe
 delete from t22 where a > 245651;
 update t22 set b = a + 1;
 select * from t22 order by 1,2,3;
-select c, count(*)
+select t21.c, count(*)
 from t21 
 inner join t22 using (a)
 where t22.b in (2,256,257,1121,1134,4102,9200,223457,245652)
-group by c
-order by c;
+group by t21.c
+order by t21.c;
 
 DROP TABLE t1, t11, t12, t21, t22;