From 61f064eb6d69e4c5116ee1f7d56c67c5fad9477c Mon Sep 17 00:00:00 2001
From: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
Date: Fri, 17 Aug 2012 18:02:44 +0300
Subject: [PATCH] Bug #14399795 : ISSUES RELATED TO SETTING AUDIT_LOG_STRATEGY
 DURING SERVER STARTUP

The options parser now correctly checks for ambiguous prefixes in
enumerated variables and emits an error when the value supplied is
ambiguous.

No test added since mysql-test-run.pl can't handle server startup
failures as an expected state.
---
 mysys/my_getopt.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index ac4ae46eab5..2ab9d44893c 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -710,6 +710,11 @@ static int setval(const struct my_option *opts, void *value, char *argument,
           }
           *(ulong*)value= arg;
         }
+        else if (type < 0)
+        {
+          res= EXIT_AMBIGUOUS_OPTION;
+          goto ret;
+        }
         else
           *(ulong*)value= type - 1;
       }