diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-09-15 14:53:07 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-09-15 14:53:07 +0200 |
| commit | e8d7e27fedf9db7e9143fe8eb2b6560696a1fea8 (patch) | |
| tree | 9070e8d565b56fa55f28f3f683c335d9d50359cf /mysys/my_getopt.c | |
| parent | 2a4c97fc3eb90c49f81219183dd6d9b998df3077 (diff) | |
| download | mariadb-git-e8d7e27fedf9db7e9143fe8eb2b6560696a1fea8.tar.gz | |
More after-merge fixes for merging MySQL 5.1.38 into MariaDB.
mysql-test/t/mysqldump.test:
Make test case work when build directory is not world readable
(this is the case for Buildbot checkouts).
mysys/my_getopt.c:
Restore bugfix which was lost in previous merge.
storage/xtradb/buf/buf0flu.c:
Fix extranous line caused by bad merge.
Diffstat (limited to 'mysys/my_getopt.c')
| -rw-r--r-- | mysys/my_getopt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index 46e07fda32e..5a06b18d4b8 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -656,8 +656,9 @@ static int setval(const struct my_option *opts, uchar* *value, char *argument, return EXIT_OUT_OF_MEMORY; break; case GET_ENUM: - if (((*(ulong *)result_pos)= - find_type(argument, opts->typelib, 2) - 1) < 0) + pos= find_type(argument, opts->typelib, 2) - 1; + (*(ulong *)result_pos)= pos; + if (pos < 0) { /* Accept an integer representation of the enumerated item. |