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:25:58+08:00, gni@stripped +8 -0
BUG#22240 Upgrading from cluster 5.0 to 5.1 does not resize VARCHARS as expected.
add varchar restoring from 5.0 version backup into 5.1 with ndb_restore
mysql-test/r/ndb_restore_compat.result@stripped, 2007-06-27 13:25:55+08:00, gni@stripped +4 -0
add result from 5.0 version backup with ndb_restore
mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data@stripped, 2007-06-27 13:05:25+08:00, gni@stripped +0 -0
Rename: BitKeeper/deleted/.del-BACKUP-2-0.1.Data -> mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data
BitKeeper/deleted/.del-BACKUP-2-0.1.Data@stripped, 2007-06-27 13:00:49+08:00, gni@stripped +0 -0
Delete: mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data
mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data@stripped, 2007-06-27 12:18:36+08:00, gni@stripped +426 -0
New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data''
mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data@stripped, 2007-06-27 12:18:36+08:00, gni@stripped +0 -0
mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data@stripped, 2007-06-27 13:05:45+08:00, gni@stripped +0 -0
Rename: BitKeeper/deleted/.del-BACKUP-2-0.2.Data -> mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data
BitKeeper/deleted/.del-BACKUP-2-0.2.Data@stripped, 2007-06-27 13:00:49+08:00, gni@stripped +0 -0
Delete: mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data
mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data@stripped, 2007-06-27 12:18:51+08:00, gni@stripped +417 -0
BitKeeper file /home/ngb/mysql/mysql-5.1/mysql-5.1-bug22240/mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data
mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data@stripped, 2007-06-27 12:18:51+08:00, gni@stripped +0 -0
mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl@stripped, 2007-06-27 13:05:57+08:00, gni@stripped +0 -0
Rename: BitKeeper/deleted/.del-BACKUP-2.1.ctl -> mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl
BitKeeper/deleted/.del-BACKUP-2.1.ctl@stripped, 2007-06-27 13:00:49+08:00, gni@stripped +0 -0
Delete: mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl
mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl@stripped, 2007-06-27 12:18:51+08:00, gni@stripped +58 -0
BitKeeper file /home/ngb/mysql/mysql-5.1/mysql-5.1-bug22240/mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl
mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl@stripped, 2007-06-27 12:18:51+08:00, gni@stripped +0 -0
mysql-test/std_data/ndb_backup50/BACKUP-2.1.log@stripped, 2007-06-27 13:06:09+08:00, gni@stripped +0 -0
Rename: BitKeeper/deleted/.del-BACKUP-2.1.log -> mysql-test/std_data/ndb_backup50/BACKUP-2.1.log
BitKeeper/deleted/.del-BACKUP-2.1.log@stripped, 2007-06-27 13:00:49+08:00, gni@stripped +0 -0
Delete: mysql-test/std_data/ndb_backup50/BACKUP-2.1.log
mysql-test/std_data/ndb_backup50/BACKUP-2.1.log@stripped, 2007-06-27 12:18:51+08:00, gni@stripped +2 -0
BitKeeper file /home/ngb/mysql/mysql-5.1/mysql-5.1-bug22240/mysql-test/std_data/ndb_backup50/BACKUP-2.1.log
mysql-test/std_data/ndb_backup50/BACKUP-2.1.log@stripped, 2007-06-27 12:18:51+08:00, gni@stripped +0 -0
mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl@stripped, 2007-06-27 13:06:20+08:00, gni@stripped +0 -0
Rename: BitKeeper/deleted/.del-BACKUP-2.2.ctl -> mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl
BitKeeper/deleted/.del-BACKUP-2.2.ctl@stripped, 2007-06-27 13:00:49+08:00, gni@stripped +0 -0
Delete: mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl
mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl@stripped, 2007-06-27 12:18:51+08:00, gni@stripped +58 -0
BitKeeper file /home/ngb/mysql/mysql-5.1/mysql-5.1-bug22240/mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl
mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl@stripped, 2007-06-27 12:18:51+08:00, gni@stripped +0 -0
mysql-test/std_data/ndb_backup50/BACKUP-2.2.log@stripped, 2007-06-27 13:06:35+08:00, gni@stripped +0 -0
Rename: BitKeeper/deleted/.del-BACKUP-2.2.log -> mysql-test/std_data/ndb_backup50/BACKUP-2.2.log
BitKeeper/deleted/.del-BACKUP-2.2.log@stripped, 2007-06-27 13:00:49+08:00, gni@stripped +0 -0
Delete: mysql-test/std_data/ndb_backup50/BACKUP-2.2.log
mysql-test/std_data/ndb_backup50/BACKUP-2.2.log@stripped, 2007-06-27 12:18:51+08:00, gni@stripped +2 -0
BitKeeper file /home/ngb/mysql/mysql-5.1/mysql-5.1-bug22240/mysql-test/std_data/ndb_backup50/BACKUP-2.2.log
mysql-test/std_data/ndb_backup50/BACKUP-2.2.log@stripped, 2007-06-27 12:18:51+08:00, gni@stripped +0 -0
mysql-test/t/ndb_restore_compat.test@stripped, 2007-06-27 13:25:55+08:00, gni@stripped +3 -0
add test for varchar type restoring from 5.0 version backup into 5.1 with ndb_restore
# 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 12:18:36
NDBBCKUP
--- New file ---
+++ mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data 07/06/27 12:18:51
NDBBCKUP
--- New file ---
+++ mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl 07/06/27 12:18:51
NDBBCKUP
--- New file ---
+++ mysql-test/std_data/ndb_backup50/BACKUP-2.1.log 07/06/27 12:18:51
NDBBCKUP
--- New file ---
+++ mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl 07/06/27 12:18:51
NDBBCKUP
--- New file ---
+++ mysql-test/std_data/ndb_backup50/BACKUP-2.2.log 07/06/27 12:18:51
NDBBCKUP
--- 1.4/mysql-test/r/ndb_restore_compat.result 2007-06-27 13:26:05 +08:00
+++ 1.5/mysql-test/r/ndb_restore_compat.result 2007-06-27 13:26:05 +08:00
@@ -101,4 +101,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.3/mysql-test/t/ndb_restore_compat.test 2007-06-27 13:26:05 +08:00
+++ 1.4/mysql-test/t/ndb_restore_compat.test 2007-06-27 13:26:05 +08:00
@@ -40,4 +40,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;
| Thread |
|---|
| • bk commit into 5.1 tree (gni:1.2556) BUG#22240 | gni | 27 Jun |
