bzr push into mysql-5.5 branch (Georgi.Kodinov:3946 to 3947) Bug#14399795

[Georgi Kodinov]

 3947 Georgi Kodinov	2012-08-17
      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.

    modified:
      mysys/my_getopt.c
 3946 Marko Mäkelä	2012-08-21 [merge]
      Merge mysql-5.1 to mysql-5.5.

    modified:
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innobase/row/row0ins.c
=== modified file 'mysys/my_getopt.c'
--- a/mysys/my_getopt.c	2011-06-30 15:46:53 +0000
+++ b/mysys/my_getopt.c	2012-08-17 15:02:44 +0000
@@ -710,6 +710,11 @@ static int setval(const struct my_option
           }
           *(ulong*)value= arg;
         }
+        else if (type < 0)
+        {
+          res= EXIT_AMBIGUOUS_OPTION;
+          goto ret;
+        }
         else
           *(ulong*)value= type - 1;
       }

No bundle (reason: useless for push emails).