summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.ndb.mysql.com>2006-04-21 01:51:58 +0200
committerunknown <tomas@poseidon.ndb.mysql.com>2006-04-21 01:51:58 +0200
commit7d259218f897b69b868b395c2c3384636670e9a8 (patch)
treeab2d6f6e7ee26f7cbef4c6b74f29acd52d4f7e3b /mysql-test
parent214fcab9e268ee6bec8b608488a475b08a622831 (diff)
downloadmariadb-git-7d259218f897b69b868b395c2c3384636670e9a8.tar.gz
Bug#18594 ndb_restore log boken in 5.1
- added compatability with 5.0 - added test case for compatability with 5.0 and 5.1 mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Data: New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Data'' mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Data: New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Data'' mysql-test/std_data/ndb_backup50/BACKUP-1.1.log: New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.1.log'' mysql-test/std_data/ndb_backup50/BACKUP-1.2.log: New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.2.log'' mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Data: New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Data'' mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Data: New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Data''
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/ndb_restore.result113
-rw-r--r--mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Databin0 -> 116228 bytes
-rw-r--r--mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Databin0 -> 113556 bytes
-rw-r--r--mysql-test/std_data/ndb_backup50/BACKUP-1.1.logbin0 -> 7592 bytes
-rw-r--r--mysql-test/std_data/ndb_backup50/BACKUP-1.2.logbin0 -> 7128 bytes
-rw-r--r--mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Databin0 -> 184636 bytes
-rw-r--r--mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Databin0 -> 181060 bytes
-rw-r--r--mysql-test/t/ndb_restore.test35
8 files changed, 148 insertions, 0 deletions
diff --git a/mysql-test/r/ndb_restore.result b/mysql-test/r/ndb_restore.result
index 7dc4057e615..c745869daee 100644
--- a/mysql-test/r/ndb_restore.result
+++ b/mysql-test/r/ndb_restore.result
@@ -467,3 +467,116 @@ Create table test/def/t2_c failed: Translate frm error
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
drop table if exists t2_c;
520093696,<the_backup_id>
+DROP DATABASE IF EXISTS BANK;
+CREATE DATABASE BANK default charset=latin1 default collate=latin1_bin;
+USE BANK;
+SHOW TABLES;
+Tables_in_BANK
+ACCOUNT
+GL
+ACCOUNT_TYPE
+TRANSACTION
+SYSTEM_VALUES
+SELECT * FROM GL ORDER BY TIME,ACCOUNT_TYPE;
+TIME ACCOUNT_TYPE BALANCE DEPOSIT_COUNT DEPOSIT_SUM WITHDRAWAL_COUNT WITHDRAWAL_SUM PURGED
+0 0 10000000 0 0 0 0 1
+0 1 30000 0 0 0 0 1
+0 2 20000 0 0 0 0 1
+0 3 20000 0 0 0 0 1
+0 4 20000 0 0 0 0 1
+1 0 10000000 0 0 0 0 1
+1 1 30000 0 0 0 0 1
+1 2 20000 0 0 0 0 1
+1 3 20000 0 0 0 0 1
+1 4 20000 0 0 0 0 1
+2 0 9857062 54 225197 76 368135 1
+2 1 60601 174 822920 181 792319 1
+2 2 68832 117 531214 98 482382 1
+2 3 83550 106 521953 104 458403 1
+2 4 19955 118 532084 110 532129 1
+3 0 9732896 62 289563 88 413729 1
+3 1 51056 202 895888 193 905433 0
+3 2 67183 122 596787 127 598436 1
+3 3 97669 159 761743 141 747624 1
+3 4 141196 140 727808 136 606567 1
+4 0 9616621 138 603930 142 720205 0
+4 1 178927 348 1741521 344 1613650 0
+4 2 52141 236 1169929 232 1184971 0
+4 3 48938 228 1147957 244 1196688 0
+4 4 193373 246 1257982 234 1205805 0
+5 0 9515281 156 726253 166 827593 0
+5 1 253798 597 2840640 545 2765769 0
+5 2 102776 362 1821680 364 1771045 0
+5 3 87349 359 1778652 375 1740241 0
+5 4 130796 351 1727448 375 1790025 0
+SELECT * FROM ACCOUNT ORDER BY ACCOUNT_ID;
+ACCOUNT_ID OWNER BALANCE ACCOUNT_TYPE
+0 0 9531306 0
+1 3001 123844 1
+2 3002 30800 2
+3 3003 3133 3
+4 3004 6524 4
+5 3005 80152 1
+6 3006 107390 1
+7 3007 69448 2
+8 3008 663 3
+9 3009 136740 4
+SELECT COUNT(*) FROM TRANSACTION;
+COUNT(*)
+6649
+SELECT * FROM SYSTEM_VALUES ORDER BY SYSTEM_VALUES_ID;
+SYSTEM_VALUES_ID VALUE
+0 4767
+1 6
+TRUNCATE GL;
+TRUNCATE ACCOUNT;
+TRUNCATE TRANSACTION;
+TRUNCATE SYSTEM_VALUES;
+TRUNCATE ACCOUNT_TYPE;
+SELECT * FROM GL ORDER BY TIME,ACCOUNT_TYPE;
+TIME ACCOUNT_TYPE BALANCE DEPOSIT_COUNT DEPOSIT_SUM WITHDRAWAL_COUNT WITHDRAWAL_SUM PURGED
+0 0 10000000 0 0 0 0 1
+0 1 30000 0 0 0 0 1
+0 2 20000 0 0 0 0 1
+0 3 20000 0 0 0 0 1
+0 4 20000 0 0 0 0 1
+1 0 10000000 0 0 0 0 1
+1 1 30000 0 0 0 0 1
+1 2 20000 0 0 0 0 1
+1 3 20000 0 0 0 0 1
+1 4 20000 0 0 0 0 1
+2 0 10000000 0 0 0 0 1
+2 1 30000 0 0 0 0 1
+2 2 20000 0 0 0 0 1
+2 3 20000 0 0 0 0 1
+2 4 20000 0 0 0 0 1
+3 0 9963591 14 59111 19 95520 0
+3 1 44264 49 255559 53 241295 0
+3 2 25515 39 177806 36 172291 0
+3 3 16779 26 129200 29 132421 0
+3 4 39851 43 182771 34 162920 0
+4 0 9733661 141 632616 162 862546 0
+4 1 63853 426 2005337 415 1985748 0
+4 2 140473 314 1548632 297 1433674 0
+4 3 13481 310 1528043 324 1531341 0
+4 4 138532 316 1540206 309 1441525 0
+SELECT * FROM ACCOUNT ORDER BY ACCOUNT_ID;
+ACCOUNT_ID OWNER BALANCE ACCOUNT_TYPE
+0 0 9679579 0
+1 3001 18130 1
+2 3002 12318 2
+3 3003 3049 3
+4 3004 39517 4
+5 3005 37051 1
+6 3006 144497 1
+7 3007 130670 2
+8 3008 13747 3
+9 3009 11442 4
+SELECT COUNT(*) FROM TRANSACTION;
+COUNT(*)
+4056
+SELECT * FROM SYSTEM_VALUES ORDER BY SYSTEM_VALUES_ID;
+SYSTEM_VALUES_ID VALUE
+0 2297
+1 5
+DROP DATABASE BANK;
diff --git a/mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Data b/mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Data
new file mode 100644
index 00000000000..32494d5a1e7
--- /dev/null
+++ b/mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Data
Binary files differ
diff --git a/mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Data b/mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Data
new file mode 100644
index 00000000000..2141fb0a6e4
--- /dev/null
+++ b/mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Data
Binary files differ
diff --git a/mysql-test/std_data/ndb_backup50/BACKUP-1.1.log b/mysql-test/std_data/ndb_backup50/BACKUP-1.1.log
new file mode 100644
index 00000000000..e4e114d4b46
--- /dev/null
+++ b/mysql-test/std_data/ndb_backup50/BACKUP-1.1.log
Binary files differ
diff --git a/mysql-test/std_data/ndb_backup50/BACKUP-1.2.log b/mysql-test/std_data/ndb_backup50/BACKUP-1.2.log
new file mode 100644
index 00000000000..a1c89b7015c
--- /dev/null
+++ b/mysql-test/std_data/ndb_backup50/BACKUP-1.2.log
Binary files differ
diff --git a/mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Data b/mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Data
new file mode 100644
index 00000000000..22b99ddc18d
--- /dev/null
+++ b/mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Data
Binary files differ
diff --git a/mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Data b/mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Data
new file mode 100644
index 00000000000..159cff93053
--- /dev/null
+++ b/mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Data
Binary files differ
diff --git a/mysql-test/t/ndb_restore.test b/mysql-test/t/ndb_restore.test
index f11324492c2..01fdb2ecc5a 100644
--- a/mysql-test/t/ndb_restore.test
+++ b/mysql-test/t/ndb_restore.test
@@ -373,3 +373,38 @@ drop table if exists t2_c;
--exec $NDB_TOOLS_DIR/ndb_select_all --no-defaults -d sys -D , SYSTAB_0 | grep 520093696, | sed "s/,$the_backup_id/,<the_backup_id>/"
# End of 4.1 tests
+
+#
+# Bug #18594 ndb_restore log boken in 5.1
+#
+
+--disable_warnings
+DROP DATABASE IF EXISTS BANK;
+--enable_warnings
+CREATE DATABASE BANK default charset=latin1 default collate=latin1_bin;
+USE BANK;
+--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 1 -p 1 -m -r $MYSQL_TEST_DIR/std_data/ndb_backup51 >> $NDB_TOOLS_OUTPUT
+--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 2 -p 1 -r $MYSQL_TEST_DIR/std_data/ndb_backup51 >> $NDB_TOOLS_OUTPUT
+SHOW TABLES;
+SELECT * FROM GL ORDER BY TIME,ACCOUNT_TYPE;
+SELECT * FROM ACCOUNT ORDER BY ACCOUNT_ID;
+SELECT COUNT(*) FROM TRANSACTION;
+SELECT * FROM SYSTEM_VALUES ORDER BY SYSTEM_VALUES_ID;
+
+#
+# verify restore of 5.0 backup
+# here we must use the already created tables as restoring the old
+# table definitions will not work
+#
+TRUNCATE GL;
+TRUNCATE ACCOUNT;
+TRUNCATE TRANSACTION;
+TRUNCATE SYSTEM_VALUES;
+TRUNCATE ACCOUNT_TYPE;
+--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 1 -p 1 -r $MYSQL_TEST_DIR/std_data/ndb_backup50 >> $NDB_TOOLS_OUTPUT
+--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 2 -p 1 -r $MYSQL_TEST_DIR/std_data/ndb_backup50 >> $NDB_TOOLS_OUTPUT
+SELECT * FROM GL ORDER BY TIME,ACCOUNT_TYPE;
+SELECT * FROM ACCOUNT ORDER BY ACCOUNT_ID;
+SELECT COUNT(*) FROM TRANSACTION;
+SELECT * FROM SYSTEM_VALUES ORDER BY SYSTEM_VALUES_ID;
+DROP DATABASE BANK;
View Lorry Controller Status