Merge

sql/sql_show.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  SCCS merged

mysql-test/r/ndb_blob.result

@@ -397,4 +397,9 @@ select * from t1 order by a;
 a	b
 1	AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 2	BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
+alter table t1 engine=myisam;
+select * from t1 order by a;
+a	b
+1	AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+2	BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
 drop table t1;

mysql-test/t/ndb_blob.test

@@ -309,6 +309,7 @@ select count(*) from t1;
 drop table t1;
 drop database mysqltest;
 
+# bug #5349
 set autocommit=1;
 use test;
 CREATE TABLE t1 (
@@ -325,4 +326,8 @@ INSERT INTO t1 VALUES
 select * from t1 order by a;
 alter table t1 engine=ndb;
 select * from t1 order by a;
+
+# bug #5872
+alter table t1 engine=myisam;
+select * from t1 order by a;
 drop table t1;

sql/ha_ndbcluster.cc

@@ -1195,18 +1195,21 @@ inline int ha_ndbcluster::next_result(byte *buf)
 	be sent to NDB
       */
       DBUG_PRINT("info", ("ops_pending: %d", ops_pending));    
-      if (current_thd->transaction.on)
+      if (ops_pending)
       {
-	if (ops_pending && (execute_no_commit(this,trans) != 0))
-	  DBUG_RETURN(ndb_err(trans));
-      }
-      else
-      {
-	if (ops_pending && (execute_commit(this,trans) != 0))
-	  DBUG_RETURN(ndb_err(trans));
-	trans->restart();
+	if (current_thd->transaction.on)
+	{
+	  if (execute_no_commit(this,trans) != 0)
+	    DBUG_RETURN(ndb_err(trans));
+	}
+	else
+	{
+	  if  (execute_commit(this,trans) != 0)
+	    DBUG_RETURN(ndb_err(trans));
+	  DBUG_ASSERT(trans->restart() == 0);
+	}
+	ops_pending= 0;
       }
-      ops_pending= 0;
       
       contact_ndb= (check == 2);
     }
@@ -1641,7 +1644,7 @@ int ha_ndbcluster::write_row(byte *record)
 	no_uncommitted_rows_execute_failure();
 	DBUG_RETURN(ndb_err(trans));
       }
-      trans->restart();
+      DBUG_ASSERT(trans->restart() == 0);
     }
   }
   if ((has_auto_increment) && (skip_auto_increment))
@@ -2278,7 +2281,7 @@ int ha_ndbcluster::rnd_init(bool scan)
   {
     if (!scan)
       DBUG_RETURN(1);
-    cursor->restart();    
+    DBUG_ASSERT(cursor->restart() == 0);
   }
   index_init(table->primary_key);
   DBUG_RETURN(0);
@@ -2435,7 +2438,7 @@ void ha_ndbcluster::info(uint flag)
     DBUG_PRINT("info", ("HA_STATUS_CONST"));
     set_rec_per_key();
   }
-   if (flag & HA_STATUS_ERRKEY)
+  if (flag & HA_STATUS_ERRKEY)
   {
     DBUG_PRINT("info", ("HA_STATUS_ERRKEY"));
     errkey= dupkey;

sql/item.cc

@@ -1999,7 +1999,7 @@ bool Item_ref::fix_fields(THD *thd,TABLE_LIST *tables, Item **reference)
       }
       else if (tmp != not_found_field)
       {
-	ref= 0; // To prevent "delete *ref;" on ~Item_erf() of this item
+	ref= 0; // To prevent "delete *ref;" on ~Item_ref() of this item
 	Item_field* fld;
 	if (!((*reference)= fld= new Item_field(tmp)))
 	  return 1;

sql/sql_class.h

@@ -1264,8 +1264,6 @@ class select_subselect :public select_result
   bool send_fields(List<Item> &list, uint flag) { return 0; };
   bool send_data(List<Item> &items)=0;
   bool send_eof() { return 0; };
-
-  friend class Ttem_subselect;
 };
 
 /* Single value subselect interface class */

sql/sql_show.cc

@@ -1140,7 +1140,7 @@ static const char *require_quotes(const char *name, uint name_length)
   for ( ; name < end ; name++)
   {
     uchar chr= (uchar) *name;
-    length= my_mbcharlen(system_charset_info, chr);
+    length= my_mbcharlen(system_charset_info, (uchar) chr);
     if (length == 1 && !system_charset_info->ident_map[chr])
       return name;
   }
@@ -1169,7 +1169,7 @@ append_identifier(THD *thd, String *packet, const char *name, uint length)
   for (name_end= name+length ; name < name_end ; name+= length)
   {
     char chr= *name;
-    length= my_mbcharlen(system_charset_info, chr);
+    length= my_mbcharlen(system_charset_info, (uchar) chr);
     if (length == 1 && chr == quote_char)
       packet->append(&quote_char, 1, system_charset_info);
     packet->append(name, length, packet->charset());