bk commit into 5.1 tree (gni:1.2521) BUG#22240

[gni]

Below is the list of changes that have just been committed into a local
5.1 repository of gni. When gni 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-06-27 13:57:43+08:00, gni@stripped +8 -0
  BUG#22240 Upgrading from cluster 5.0 to 5.1 does not resize VARCHARS as expected.
           add varchar type restoring test from 5.0 backup into 5.1

  mysql-test/r/ndb_restore_compat.result@stripped, 2007-06-27 13:57:40+08:00,
gni@stripped +4 -0
    add test result for varchar type from 5.0 version backup into 5.1

  mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data@stripped, 2007-06-27 13:57:40+08:00,
gni@stripped +426 -0
    backup data

  mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data@stripped, 2007-06-27 13:57:40+08:00,
gni@stripped +0 -0

  mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data@stripped, 2007-06-27 13:57:40+08:00,
gni@stripped +417 -0
    backup data

  mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data@stripped, 2007-06-27 13:57:40+08:00,
gni@stripped +0 -0

  mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl@stripped, 2007-06-27 13:57:40+08:00,
gni@stripped +58 -0
    meta data of 5.0 backup

  mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl@stripped, 2007-06-27 13:57:40+08:00,
gni@stripped +0 -0

  mysql-test/std_data/ndb_backup50/BACKUP-2.1.log@stripped, 2007-06-27 13:57:40+08:00,
gni@stripped +2 -0
    log data of 5.0 backup

  mysql-test/std_data/ndb_backup50/BACKUP-2.1.log@stripped, 2007-06-27 13:57:40+08:00,
gni@stripped +0 -0

  mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl@stripped, 2007-06-27 13:57:40+08:00,
gni@stripped +58 -0
    meta data of 5.0 backup

  mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl@stripped, 2007-06-27 13:57:40+08:00,
gni@stripped +0 -0

  mysql-test/std_data/ndb_backup50/BACKUP-2.2.log@stripped, 2007-06-27 13:57:41+08:00,
gni@stripped +2 -0
    log data of 5.0 backup

  mysql-test/std_data/ndb_backup50/BACKUP-2.2.log@stripped, 2007-06-27 13:57:41+08:00,
gni@stripped +0 -0

  mysql-test/t/ndb_restore_compat.test@stripped, 2007-06-27 13:57:40+08:00,
gni@stripped +3 -0
    add test for varchar type restoring from 5.0 backup into 5.1 

# 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:	gni
# Host:	dev3-221.dev.cn.tlan
# Root:	/home/ngb/mysql/mysql-5.1/mysql-5.1-bug22240
--- New file ---
+++ mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data	07/06/27 13:57:40
NDBBCKUP





ÿÿ
�

_�

ÿÿ
�

.�

ÿÿ
�

9�

ÿÿ
�

��

--- New file ---
+++ mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data	07/06/27 13:57:40
NDBBCKUP


ÿÿ
�

gþ


þÿÿ
þ

ÿ

ÿÿÿ
ÿ

ÿÿ
�

g�

--- New file ---
+++ mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl	07/06/27 13:57:40
NDBBCKUP

�0���ŴC-(�]��+Z;)������?»���
}c[7qS�|p�君d�Ex¾�¥BE*¸�sk�00µ:~D��������¾��®{�b���M¦��f;_�-DDD_�
��K@"�I
¥j����d°¤lw�7��;.�|R8Pq��iQ�v��~��T����ܐ��jL?f4®ӧ"¸




--- New file ---
+++ mysql-test/std_data/ndb_backup50/BACKUP-2.1.log	07/06/27 13:57:40
NDBBCKUP
--- New file ---
+++ mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl	07/06/27 13:57:40
NDBBCKUP

�0���ŴC-(�]��+Z;)������?»���
}c[7qS�|p�君d�Ex¾�¥BE*¸�sk�00µ:~D��������¾��®{�b���M¦��f;_�-DDD_�
��K@"�I
¥j����d°¤lw�7��;.�|R8Pq��iQ�v��~��T����ܐ��jL?f4®ӧ"¸




--- New file ---
+++ mysql-test/std_data/ndb_backup50/BACKUP-2.2.log	07/06/27 13:57:41
NDBBCKUP

--- 1.5/mysql-test/r/ndb_restore_compat.result	2007-06-27 13:57:53 +08:00
+++ 1.6/mysql-test/r/ndb_restore_compat.result	2007-06-27 13:57:53 +08:00
@@ -111,4 +111,8 @@
 SELECT * FROM mysql.ndb_apply_status WHERE server_id=0;
 server_id	epoch	log_name	start_pos	end_pos
 0	331		0	0
+SELECT * FROM DESCRIPTION;
+USERNAME        ADDRESS
+David Li        Suite 503, 5F NCI Tower, A12 Jianguomenwai Avenue Chaoyang District,
Beijing, 100022  PRC
+Guangbao Ni     Suite 503, 5F NCI Tower, A12 Jianguomenwai Avenue Chaoyang District,
Beijing, 100022  PRC
 DROP DATABASE BANK;

--- 1.4/mysql-test/t/ndb_restore_compat.test	2007-06-27 13:57:53 +08:00
+++ 1.5/mysql-test/t/ndb_restore_compat.test	2007-06-27 13:57:53 +08:00
@@ -58,4 +58,7 @@
 SELECT COUNT(*) FROM TRANSACTION;
 SELECT * FROM SYSTEM_VALUES ORDER BY SYSTEM_VALUES_ID;
 SELECT * FROM mysql.ndb_apply_status WHERE server_id=0;
+--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 2 -n 1 -m -p 1 -s -r
$MYSQL_TEST_DIR/std_data/ndb_backup50 >> $NDB_TOOLS_OUTPUT
+--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 2 -n 2 -p 1 -s -r
$MYSQL_TEST_DIR/std_data/ndb_backup50 >> $NDB_TOOLS_OUTPUT
+SELECT * FROM DESCRIPTION;
 DROP DATABASE BANK;