bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:4364 to 4365)

[Magnus Blåudd]

 4365 Magnus Blåudd	2011-05-06
      ndb - adapt Makefile.am to new location of suite/ndb files

    modified:
      mysql-test/Makefile.am
 4364 Magnus Blåudd	2011-05-06
      ndb
       - move saved backups to a shorter path so that also tar
         from last century can unpack them
         i.e suite/ndb/std_data/ndb_backup* -> suite/ndb/backups/*

    renamed:
      mysql-test/suite/ndb/std_data/ => mysql-test/suite/ndb/backups/
      mysql-test/suite/ndb/std_data/ndb_backup50/ => mysql-test/suite/ndb/backups/50/
      mysql-test/suite/ndb/std_data/ndb_backup51/ => mysql-test/suite/ndb/backups/51/
      mysql-test/suite/ndb/std_data/ndb_backup51_d2_be/ => mysql-test/suite/ndb/backups/51_d2_be/
      mysql-test/suite/ndb/std_data/ndb_backup51_d2_le/ => mysql-test/suite/ndb/backups/51_d2_le/
      mysql-test/suite/ndb/std_data/ndb_backup51_data_be/ => mysql-test/suite/ndb/backups/51_data_be/
      mysql-test/suite/ndb/std_data/ndb_backup51_data_le/ => mysql-test/suite/ndb/backups/51_data_le/
      mysql-test/suite/ndb/std_data/ndb_backup51_dd/ => mysql-test/suite/ndb/backups/51_dd/
      mysql-test/suite/ndb/std_data/ndb_backup51_undolog_be/ => mysql-test/suite/ndb/backups/51_undolog_be/
      mysql-test/suite/ndb/std_data/ndb_backup51_undolog_le/ => mysql-test/suite/ndb/backups/51_undolog_le/
      mysql-test/suite/ndb/std_data/ndb_backup_before_native_default/ => mysql-test/suite/ndb/backups/before_native_default/
      mysql-test/suite/ndb/std_data/ndb_backup_bug54613/ => mysql-test/suite/ndb/backups/bug54613/
      mysql-test/suite/ndb/std_data/ndb_backup_hashmap/ => mysql-test/suite/ndb/backups/hashmap/
      mysql-test/suite/ndb/std_data/ndb_backup_packed/ => mysql-test/suite/ndb/backups/packed/
    modified:
      mysql-test/suite/ndb/t/ndb_alter_table_backup.test
      mysql-test/suite/ndb/t/ndb_dd_restore_compat.test
      mysql-test/suite/ndb/t/ndb_native_default_support.test
      mysql-test/suite/ndb/t/ndb_restore_compat_downward.test
      mysql-test/suite/ndb/t/ndb_restore_compat_endianness.test
      mysql-test/suite/ndb/t/ndb_restore_misc.test
      mysql-test/suite/ndb/t/ndb_restore_undolog.test
      mysql-test/suite/ndb_binlog/t/ndb_binlog_restore.test
=== modified file 'mysql-test/Makefile.am'
--- a/mysql-test/Makefile.am	2011-04-08 13:59:44 +0000
+++ b/mysql-test/Makefile.am	2011-05-06 18:01:43 +0000
@@ -75,19 +75,19 @@ EXTRA_DIST =	README \
 # List of directories containing test + result files and the
 # related test data files that should be copied
 TEST_DIRS = t r include std_data std_data/parts collections \
-	suite/ndb/std_data/ndb_backup50 \
-	suite/ndb/std_data/ndb_backup51 \
-	suite/ndb/std_data/ndb_backup51_data_be \
-	suite/ndb/std_data/ndb_backup51_data_le \
-	suite/ndb/std_data/ndb_backup51_dd \
-	suite/ndb/std_data/ndb_backup_packed \
-	suite/ndb/std_data/ndb_backup51_d2_be \
-	suite/ndb/std_data/ndb_backup51_d2_le \
-	suite/ndb/std_data/ndb_backup51_undolog_be \
-	suite/ndb/std_data/ndb_backup51_undolog_le \
-	suite/ndb/std_data/ndb_backup_hashmap \
-	suite/ndb/std_data/ndb_backup_before_native_default \
-	suite/ndb/std_data/ndb_backup_bug54613 \
+	suite/ndb/backups/50 \
+	suite/ndb/backups/51 \
+	suite/ndb/backups/51_data_be \
+	suite/ndb/backups/51_data_le \
+	suite/ndb/backups/51_dd \
+	suite/ndb/backups/packed \
+	suite/ndb/backups/51_d2_be \
+	suite/ndb/backups/51_d2_le \
+	suite/ndb/backups/51_undolog_be \
+	suite/ndb/backups/51_undolog_le \
+	suite/ndb/backups/hashmap \
+	suite/ndb/backups/before_native_default \
+	suite/ndb/backups/bug54613 \
 	std_data/funcs_1 \
 	extra/binlog_tests/ extra/rpl_tests \
 	suite/binlog suite/binlog/t suite/binlog/r suite/binlog/std_data \
@@ -105,7 +105,7 @@ TEST_DIRS = t r include std_data std_dat
 	suite/rpl suite/rpl/data suite/rpl/include suite/rpl/r \
 	suite/rpl/t \
 	suite/stress/include suite/stress/t suite/stress/r \
-	suite/ndb suite/ndb/t suite/ndb/r suite/ndb/include suite/ndb/std_data \
+	suite/ndb suite/ndb/t suite/ndb/r suite/ndb/include suite/ndb/data \
 	suite/ndb_big \
 	suite/ndb_binlog suite/ndb_binlog/t suite/ndb_binlog/r \
 	suite/ndb_team suite/ndb_team/t suite/ndb_team/r \

No bundle (reason: useless for push emails).