Manual merge from mysql-trunk.

Conflicts:
  - mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result

1 files changed, 3 insertions, 3 deletions

diff --git a/mysys/typelib.c b/mysys/typelib.c
index c332c82d17a..7681ff581ac 100644
--- a/mysys/typelib.c
+++ b/mysys/typelib.c
@@ -354,11 +354,11 @@ my_ulonglong find_set_from_flags(const TYPELIB *lib, uint default_name,
             !(value= parse_name(&on_off_default_typelib, &pos, end)))
           goto err;
         
-        if (value == 1) // this is '=off'
+        if (value == 1) /* this is '=off' */
           flags_to_clear|= bit;
-        else if (value == 2) // this is '=on'
+        else if (value == 2) /* this is '=on' */
           flags_to_set|= bit;
-        else // this is '=default' 
+        else /* this is '=default'  */
         {
           if (default_set & bit)
             flags_to_set|= bit;