diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-03-09 15:47:59 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-03-09 15:47:59 +0200 |
| commit | 139a2b64bf8ec2e248656835e23a5c98ffc667a8 (patch) | |
| tree | 7d77d6f1073f8090f275b30cb3f10254497da243 /storage/maria/ma_test2.c | |
| parent | b3f7eac5301529c2d069ebe4d0558980412af3a2 (diff) | |
| parent | ce675406ca8dbc1532a908803a1371de8432d466 (diff) | |
| download | mariadb-git-139a2b64bf8ec2e248656835e23a5c98ffc667a8.tar.gz | |
Merge with 5.2
Diffstat (limited to 'storage/maria/ma_test2.c')
| -rw-r--r-- | storage/maria/ma_test2.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/storage/maria/ma_test2.c b/storage/maria/ma_test2.c index 9e2f32f767b..6ab8cae2915 100644 --- a/storage/maria/ma_test2.c +++ b/storage/maria/ma_test2.c @@ -69,24 +69,25 @@ int main(int argc, char *argv[]) MARIA_KEYDEF keyinfo[10]; MARIA_COLUMNDEF recinfo[10]; MARIA_INFO info; - const char *filename; char *blob_buffer; MARIA_CREATE_INFO create_info; + char filename[FN_REFLEN]; #if defined(SAFE_MUTEX) && defined(THREAD) safe_mutex_deadlock_detector= 1; #endif MY_INIT(argv[0]); - filename= "test2"; + maria_data_root= (char *)"."; get_options(argc,argv); + fn_format(filename, "test2", maria_data_root, "", MYF(0)); + if (! async_io) my_disable_async_io=1; /* If we sync or not have no affect on this test */ my_disable_sync= 1; - maria_data_root= (char *)"."; /* Maria requires that we always have a page cache */ if (maria_init() || (init_pagecache(maria_pagecache, pagecache_size, 0, 0, @@ -1101,6 +1102,9 @@ static void get_options(int argc, char **argv) case 'H': checkpoint= atoi(++pos); break; + case 'h': + maria_data_root= ++pos; + break; case 'k': if ((keys=(uint) atoi(++pos)) < 1 || keys > (uint) (MARIA_KEYS-first_key)) |