diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-01-30 15:44:49 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-01-30 15:44:49 +0200 |
| commit | 3aec7ca4156e8427cec829d6d392e345d15ba20d (patch) | |
| tree | a6a00e2376ec5327aa29d5a5b2441a06f8d146d4 /mysql-test/std_data | |
| parent | 355d084567bb94a878fe586c75d0756d3fdf8204 (diff) | |
| parent | 16a6158c4764d0a264c16ce7010753e16946ab42 (diff) | |
| download | mariadb-git-3aec7ca4156e8427cec829d6d392e345d15ba20d.tar.gz | |
merged 5.1-main -> 5.1-bugteam
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/ndb_config_config.ini | 55 | ||||
| -rw-r--r-- | mysql-test/std_data/rpl_bug28618.dat | 3 | ||||
| -rw-r--r-- | mysql-test/std_data/rpl_mixed.dat | 3 |
3 files changed, 61 insertions, 0 deletions
diff --git a/mysql-test/std_data/ndb_config_config.ini b/mysql-test/std_data/ndb_config_config.ini new file mode 100644 index 00000000000..c325952d322 --- /dev/null +++ b/mysql-test/std_data/ndb_config_config.ini @@ -0,0 +1,55 @@ +[ndbd default] +NoOfReplicas= 2 +MaxNoOfConcurrentTransactions= 64 +MaxNoOfConcurrentOperations= 10000 +DataMemory= 20M +IndexMemory= 1M +Diskless= 0 +TimeBetweenWatchDogCheck= 30000 +DataDir= /data/msvensson/mysql/mysql-5.1-new-maint/mysql-test/var/ndbcluster-10095 +MaxNoOfOrderedIndexes= 32 +MaxNoOfAttributes= 2048 +TimeBetweenGlobalCheckpoints= 500 +NoOfFragmentLogFiles= 4 +FragmentLogFileSize=12M +DiskPageBufferMemory= 4M +# O_DIRECT has issues on 2.4 whach have not been handled, Bug #29612 +#ODirect= 1 +# the following parametes just function as a small regression +# test that the parameter exists +InitialNoOfOpenFiles= 27 + +# +# Increase timeouts to cater for slow test-machines +# (possibly running several tests in parallell) +# +HeartbeatIntervalDbDb= 30000 +HeartbeatIntervalDbApi= 30000 +#TransactionDeadlockDetectionTimeout= 7500 + +[ndbd] +HostName= localhost + +[ndbd] +HostName= localhost + +[ndb_mgmd] +HostName= localhost +DataDir= /data/msvensson/mysql/mysql-5.1-new-maint/mysql-test/var/ndbcluster-10095 # +PortNumber= 10095 + +[mysqld] + +[mysqld] + +[mysqld] + +[mysqld] + +[mysqld] + +[mysqld] + +[mysqld] + +[mysqld] diff --git a/mysql-test/std_data/rpl_bug28618.dat b/mysql-test/std_data/rpl_bug28618.dat new file mode 100644 index 00000000000..b800c4dd39d --- /dev/null +++ b/mysql-test/std_data/rpl_bug28618.dat @@ -0,0 +1,3 @@ +1|master only +2|master only +3|master only diff --git a/mysql-test/std_data/rpl_mixed.dat b/mysql-test/std_data/rpl_mixed.dat new file mode 100644 index 00000000000..131c57750cc --- /dev/null +++ b/mysql-test/std_data/rpl_mixed.dat @@ -0,0 +1,3 @@ +10|line A +20|line B +30|line C |