From c01bbd33d79ac5f7ba822a3c8cadb0c31364e366 Mon Sep 17 00:00:00 2001
From: unknown <gluh@mysql.com/eagle.(none)>
Date: Fri, 2 Feb 2007 14:26:53 +0400
Subject: [PATCH] after merge fix

mysql-test/r/ndb_read_multi_range.result:
  result fix
mysql-test/t/ndb_read_multi_range.test:
  test case fix
---
 mysql-test/r/ndb_read_multi_range.result | 6 +++---
 mysql-test/t/ndb_read_multi_range.test   | 6 +++---
 sql/opt_range.cc                         | 2 +-
 sql/sql_delete.cc                        | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mysql-test/r/ndb_read_multi_range.result b/mysql-test/r/ndb_read_multi_range.result
index 8bc0f519cde..12f3185bb1a 100644
--- a/mysql-test/r/ndb_read_multi_range.result
+++ b/mysql-test/r/ndb_read_multi_range.result
@@ -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
diff --git a/mysql-test/t/ndb_read_multi_range.test b/mysql-test/t/ndb_read_multi_range.test
index c9059bcbd6b..9d7415880ce 100644
--- a/mysql-test/t/ndb_read_multi_range.test
+++ b/mysql-test/t/ndb_read_multi_range.test
@@ -249,12 +249,12 @@ t22.a in (select t12.a from t11, t12 where t11.a in(255,256) and t11.a = t12.a a
 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;
 
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 1e18b2d48bd..733203b3160 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -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;
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index 7daf3be1578..ea8c0e2d83e 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -75,8 +75,8 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
   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);