Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1

into mdk10.(none):/home/reggie/bk/mysql-4.1

mysql-test/r/group_by.result

@@ -693,7 +693,7 @@ concat('val-', x3.a + 3*x4.a), -- 12
 concat('val-', @a:=x3.a + 3*x4.a + 12*C.a), -- 120
 concat('val-', @a + 120*D.a)
 from t1 x3, t1 x4, t1 C, t1 D where x3.a < 3 and x4.a < 4 and D.a < 4;
-delete from t2  where a = 2 and b = 'val-2' limit 30;
+delete from t2  where a = 2 and b = 'val-2' order by a,b,c,d limit 30;
 explain select c from t2 where a = 2 and b = 'val-2' group by c;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2	ref	PRIMARY,a	PRIMARY	400	const,const	6	Using where

mysql-test/t/group_by.test

@@ -508,7 +508,8 @@ insert into t2 select
    concat('val-', @a:=x3.a + 3*x4.a + 12*C.a), -- 120
    concat('val-', @a + 120*D.a)
 from t1 x3, t1 x4, t1 C, t1 D where x3.a < 3 and x4.a < 4 and D.a < 4;
-delete from t2  where a = 2 and b = 'val-2' limit 30;
+
+delete from t2  where a = 2 and b = 'val-2' order by a,b,c,d limit 30;
 
 explain select c from t2 where a = 2 and b = 'val-2' group by c;
 select c from t2 where a = 2 and b = 'val-2' group by c;

ndb/src/kernel/blocks/dbdict/Dbdict.cpp

@@ -2227,8 +2227,9 @@ void Dbdict::checkSchemaStatus(Signal* signal)
 	  restartCreateTab(signal, tableId, oldEntry, false);
           return;
         }//if
-	break;
       }
+      ndbrequire(ok); 
+      break;
     }
     case SchemaFile::DROP_TABLE_STARTED:
       jam();

scripts/make_win_src_distribution.sh

@@ -251,7 +251,7 @@ copy_dir_dirs() {
 
 for i in client dbug extra heap include isam \
          libmysql libmysqld merge myisam \
-         myisammrg mysys regex sql strings sql-common \
+         myisammrg mysys regex sql strings sql-common sql/examples \
          tools vio zlib
 do
   copy_dir_files $i

sql/sql_select.cc

@@ -7179,8 +7179,9 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit,
           /*
             We'll use ref access method on key new_ref_key. In general case 
             the index search tuple for new_ref_key will be different (e.g.
-            when one of the indexes only covers prefix of the field, see
-            BUG#9213 in group_by.test).
+            when one index is defined as (part1, part2, ...) and another as
+            (part1, part2(N), ...) and the WHERE clause contains 
+            "part1 = const1 AND part2=const2". 
             So we build tab->ref from scratch here.
           */
           KEYUSE *keyuse= tab->keyuse;