diff options
| author | unknown <hery.ramilison@oracle.com> | 2011-03-16 15:11:20 +0100 |
|---|---|---|
| committer | MySQL Build Team <build@mysql.com> | 2011-03-16 15:11:20 +0100 |
| commit | 753c406994b348e65f6d099096178e457628e475 (patch) | |
| tree | 3b31ba86b07ae94f5ca16e551fc8157d0188b2ab /mysys/default.c | |
| parent | 62e83ad8c074b4a9c937760daf705b02c5d85e8b (diff) | |
| parent | fe12c639b1eae3fe42664f3817a2677795826888 (diff) | |
| download | mariadb-git-753c406994b348e65f6d099096178e457628e475.tar.gz | |
Merge from mysql-5.5.10-release
Diffstat (limited to 'mysys/default.c')
| -rw-r--r-- | mysys/default.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/default.c b/mysys/default.c index 805dc5f3f58..fe070f42748 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -376,7 +376,7 @@ static int handle_default_option(void *in_ctx, const char *group_name, if (!option) return 0; - if (find_type((char *)group_name, ctx->group, 3)) + if (find_type((char *)group_name, ctx->group, FIND_TYPE_NO_PREFIX)) { if (!(tmp= alloc_root(ctx->alloc, strlen(option) + 1))) return 1; |