diff options
| author | unknown <joreland@mysql.com> | 2004-11-21 22:18:09 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-11-21 22:18:09 +0100 |
| commit | 48e8febccd7c2d44680eb3cc1ca170b7b73571e6 (patch) | |
| tree | 25b984c270e26ec40b05283b3c3f94fcd7f4a338 /ndb/tools | |
| parent | 7785740f1d4ace9013e7c8bad30c28fc90fd215a (diff) | |
| parent | 9e26c327a0530ea104e32960cef7a407dad060dc (diff) | |
| download | mariadb-git-48e8febccd7c2d44680eb3cc1ca170b7b73571e6.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl2077
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
Diffstat (limited to 'ndb/tools')
| -rw-r--r-- | ndb/tools/select_all.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ndb/tools/select_all.cpp b/ndb/tools/select_all.cpp index 9c944c8c93e..a670a2ed49a 100644 --- a/ndb/tools/select_all.cpp +++ b/ndb/tools/select_all.cpp @@ -50,7 +50,7 @@ static struct my_option my_long_options[] = GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }, { "parallelism", 'p', "parallelism", (gptr*) &_parallelism, (gptr*) &_parallelism, 0, - GET_INT, REQUIRED_ARG, 240, 0, 0, 0, 0, 0 }, + GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }, { "lock", 'l', "Read(0), Read-hold(1), Exclusive(2)", (gptr*) &_lock, (gptr*) &_lock, 0, GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }, |