From: gni Date: July 20 2007 11:44am Subject: bk commit into 5.1 tree (gni:1.2521) BUG#22240 List-Archive: http://lists.mysql.com/commits/31229 X-Bug: 22240 Message-Id: <200707201144.l6KBi4Ik009933@dev3-221.dev.cn.tlan> 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-07-20 19:43:56+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-07-20 19:43:53+08:00, gni@stripped +6 -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-07-20 19:43:53+08:00, gni@stripped +426 -0 backup data mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data@stripped, 2007-07-20 19:43:53+08:00, gni@stripped +0 -0 mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data@stripped, 2007-07-20 19:43:53+08:00, gni@stripped +417 -0 backup data mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data@stripped, 2007-07-20 19:43:53+08:00, gni@stripped +0 -0 mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl@stripped, 2007-07-20 19:43:53+08:00, gni@stripped +59 -0 meta data of 5.0 backup mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl@stripped, 2007-07-20 19:43:53+08:00, gni@stripped +0 -0 mysql-test/std_data/ndb_backup50/BACKUP-2.1.log@stripped, 2007-07-20 19:43:53+08:00, gni@stripped +2 -0 log data of 5.0 backup mysql-test/std_data/ndb_backup50/BACKUP-2.1.log@stripped, 2007-07-20 19:43:53+08:00, gni@stripped +0 -0 mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl@stripped, 2007-07-20 19:43:53+08:00, gni@stripped +59 -0 meta data of 5.0 backup mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl@stripped, 2007-07-20 19:43:53+08:00, gni@stripped +0 -0 mysql-test/std_data/ndb_backup50/BACKUP-2.2.log@stripped, 2007-07-20 19:43:53+08:00, gni@stripped +2 -0 log data of 5.0 backup mysql-test/std_data/ndb_backup50/BACKUP-2.2.log@stripped, 2007-07-20 19:43:53+08:00, gni@stripped +0 -0 mysql-test/t/ndb_restore_compat.test@stripped, 2007-07-20 19:43:53+08:00, gni@stripped +6 -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/07/20 19:43:53 NDBBCKUP   _  .  9   --- New file --- +++ mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data 07/07/20 19:43:53 NDBBCKUP  g     g --- New file --- +++ mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl 07/07/20 19:43:53 NDBBCKUP 0ŴC-(]+Z;) ? }c[7qS|p君dExBE*sk00;~D{bMz3_}-DDDw?% ᤀRto2XR`i>)8I(`}}?qoinsTvnH t53W" --- New file --- +++ mysql-test/std_data/ndb_backup50/BACKUP-2.1.log 07/07/20 19:43:53 NDBBCKUP --- New file --- +++ mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl 07/07/20 19:43:53 NDBBCKUP 0ŴC-(]+Z;) ? }c[7qS|p君dExBE*sk00;~D{bMz3_}-DDDw?% ᤀRto2XR`i>)8I(`}}?qoinsTvnH t53W" --- New file --- +++ mysql-test/std_data/ndb_backup50/BACKUP-2.2.log 07/07/20 19:43:53 NDBBCKUP --- 1.5/mysql-test/r/ndb_restore_compat.result 2007-07-20 19:44:04 +08:00 +++ 1.6/mysql-test/r/ndb_restore_compat.result 2007-07-20 19:44:04 +08:00 @@ -111,4 +111,10 @@ 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 +Guangbao Ni Suite 503, 5F NCI Tower, A12 Jianguomenwai Avenue Chaoyang District, Beijing, 100022 PRC +David Li Suite 503, 5F NCI Tower, A12 Jianguomenwai Avenue Chaoyang District, Beijing, 100022 PRC +USERNAME Varchar(255;latin1_swedish_ci) NULL AT=SHORT_VAR ST=MEMORY +ADDRESS Longvarchar(2002;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY DROP DATABASE BANK; --- 1.4/mysql-test/t/ndb_restore_compat.test 2007-07-20 19:44:04 +08:00 +++ 1.5/mysql-test/t/ndb_restore_compat.test 2007-07-20 19:44:04 +08:00 @@ -58,4 +58,10 @@ 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; +--exec $NDB_TOOLS_DIR/ndb_desc --no-defaults -d BANK DESCRIPTION | grep SHORT_VAR +--exec $NDB_TOOLS_DIR/ndb_desc --no-defaults -d BANK DESCRIPTION | grep MEDIUM_VAR + DROP DATABASE BANK;