database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb

Browse Source 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
This commit is contained in:
Justin.He/justin.he@dev3-240.dev.cn.tlan
2007-08-30 16:17:32 +08:00
parent d14cba104a 56902d5251
commit f8a85abf3c
12 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data Normal file
View File

Binary file not shown.

BIN
mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data Normal file
View File

Binary file not shown.

BIN
mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl Normal file
View File

Binary file not shown.

BIN
mysql-test/std_data/ndb_backup50/BACKUP-2.1.log Normal file
View File

Binary file not shown.

BIN
mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl Normal file
View File

Binary file not shown.

BIN
mysql-test/std_data/ndb_backup50/BACKUP-2.2.log Normal file
View File

Binary file not shown.

5
mysql-test/suite/ndb/r/ndb_restore_compat.result
View File

@ -111,4 +111,9 @@ SYSTEM_VALUES_ID VALUE
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 ORDER BY USERNAME;
USERNAME ADDRESS
Guangbao Ni 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;

6
mysql-test/suite/ndb/t/ndb_restore_compat.test
View File

@ -58,4 +58,10 @@ SELECT * FROM ACCOUNT ORDER BY ACCOUNT_ID;
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 ORDER BY USERNAME;
--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;