Commit 261136c0 authored by unknown's avatar unknown
Browse files

ndb: break out ndb backup compatability test, so that it can be disabled on mac 


mysql-test/include/have_case_sensitive_file_system.inc:
  New BitKeeper file ``mysql-test/include/have_case_sensitive_file_system.inc''
mysql-test/r/case_sensitive_file_system.require:
  New BitKeeper file ``mysql-test/r/case_sensitive_file_system.require''
mysql-test/r/ndb_restore_compat.result:
  New BitKeeper file ``mysql-test/r/ndb_restore_compat.result''
mysql-test/t/ndb_restore_compat.test:
  New BitKeeper file ``mysql-test/t/ndb_restore_compat.test''
parent 77869308

mysql-test/include/have_case_sensitive_file_system.inc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
--require r/case_sensitive_file_system.require

--disable_query_log

show variables like "lower_case_file_system";

--enable_query_log

mysql-test/r/case_sensitive_file_system.require

0 → 100644
+2 −0
Original line number Diff line number Diff line 
Variable_name	Value

lower_case_file_system	OFF

mysql-test/r/ndb_restore.result

+0 −104
Original line number Diff line number Diff line
@@ -467,107 +467,3 @@ 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	0

1	1	30000	0	0	0	0	0

1	2	20000	0	0	0	0	0

1	3	20000	0	0	0	0	0

1	4	20000	0	0	0	0	0

2	0	9981761	17	80457	19	98696	0

2	1	17823	55	203688	46	215865	0

2	2	47056	33	159275	33	132219	0

2	3	15719	26	126833	29	131114	0

2	4	27641	32	133459	36	125818	0

SELECT * FROM ACCOUNT       ORDER BY ACCOUNT_ID;

ACCOUNT_ID	OWNER	BALANCE	ACCOUNT_TYPE

0	0	9863546	0

1	3001	12885	1

2	3002	11012	2

3	3003	32789	3

4	3004	10992	4

5	3005	2247	1

6	3006	3170	1

7	3007	60321	2

8	3008	30508	3

9	3009	62530	4

SELECT COUNT(*) FROM TRANSACTION;

COUNT(*)

3444

SELECT * FROM SYSTEM_VALUES ORDER BY SYSTEM_VALUES_ID;

SYSTEM_VALUES_ID	VALUE

0	2039

1	3

SELECT * FROM cluster.apply_status WHERE server_id=0;

server_id	epoch

0	151

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

SELECT * FROM cluster.apply_status WHERE server_id=0;

server_id	epoch

0	331

DROP DATABASE BANK;

mysql-test/r/ndb_restore_compat.result

0 → 100644
+104 −0
Original line number Diff line number Diff line 
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	0

1	1	30000	0	0	0	0	0

1	2	20000	0	0	0	0	0

1	3	20000	0	0	0	0	0

1	4	20000	0	0	0	0	0

2	0	9981761	17	80457	19	98696	0

2	1	17823	55	203688	46	215865	0

2	2	47056	33	159275	33	132219	0

2	3	15719	26	126833	29	131114	0

2	4	27641	32	133459	36	125818	0

SELECT * FROM ACCOUNT       ORDER BY ACCOUNT_ID;

ACCOUNT_ID	OWNER	BALANCE	ACCOUNT_TYPE

0	0	9863546	0

1	3001	12885	1

2	3002	11012	2

3	3003	32789	3

4	3004	10992	4

5	3005	2247	1

6	3006	3170	1

7	3007	60321	2

8	3008	30508	3

9	3009	62530	4

SELECT COUNT(*) FROM TRANSACTION;

COUNT(*)

3444

SELECT * FROM SYSTEM_VALUES ORDER BY SYSTEM_VALUES_ID;

SYSTEM_VALUES_ID	VALUE

0	2039

1	3

SELECT * FROM cluster.apply_status WHERE server_id=0;

server_id	epoch

0	151

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

SELECT * FROM cluster.apply_status WHERE server_id=0;

server_id	epoch

0	331

DROP DATABASE BANK;

mysql-test/t/ndb_restore.test

+0 −37
Original line number Diff line number Diff line
@@ -373,40 +373,3 @@ 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 -e -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;

SELECT * FROM cluster.apply_status WHERE server_id=0;



#

# 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 -e -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;

SELECT * FROM cluster.apply_status WHERE server_id=0;

DROP DATABASE BANK;