bzr commit into mysql-5.0-bugteam branch (jimw:2736) Bug#39101

[Jim Winstead]

#At file:///Users/jimw/my/mysql-5.0/ based on revid:bernt.johnsen@stripped

 2736 Jim Winstead	2009-05-07
      Fix support for -i (--ignore-spaces) in the mysql command line application,
      which didn't actually do anything. (Bug #39101)
      modified:
        client/mysql.cc
        mysql-test/r/mysql.result
        mysql-test/t/mysql.test

=== modified file 'client/mysql.cc'
--- a/client/mysql.cc	2009-04-14 14:16:30 +0000
+++ b/client/mysql.cc	2009-05-07 17:28:29 +0000
@@ -140,7 +140,7 @@ static my_bool info_flag=0,ignore_errors
 	       tty_password= 0, opt_nobeep=0, opt_reconnect=1,
 	       default_charset_used= 0, opt_secure_auth= 0,
                default_pager_set= 0, opt_sigint_ignore= 0,
-               show_warnings= 0;
+               show_warnings= 0, ignore_spaces= 0;
 static volatile int executing_query= 0, interrupted_query= 0;
 static my_bool preserve_comments= 0;
 static ulong opt_max_allowed_packet, opt_net_buffer_length;
@@ -1350,8 +1350,9 @@ static struct my_option my_long_options[
   {"no-named-commands", 'g',
    "Named commands are disabled. Use \\* form only, or use named commands only in the beginning of a line ending with a semicolon (;) Since version 10.9 the client now starts with this option ENABLED by default! Disable with '-G'. Long format commands still work from the first line. WARNING: option deprecated; use --disable-named-commands instead.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"ignore-spaces", 'i', "Ignore space after function names.", 0, 0, 0,
-   GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"ignore-spaces", 'i', "Ignore space after function names.",
+   (gptr*) &ignore_spaces, (gptr*) &ignore_spaces, 0, GET_BOOL, NO_ARG, 0, 0,
+   0, 0, 0, 0},
   {"local-infile", OPT_LOCAL_INFILE, "Enable/disable LOAD DATA LOCAL INFILE.",
    (gptr*) &opt_local_infile,
    (gptr*) &opt_local_infile, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
@@ -1749,6 +1750,10 @@ static int get_options(int argc, char **
   }
   if (tty_password)
     opt_password= get_tty_password(NullS);
+
+  if (ignore_spaces)
+    connect_flag|= CLIENT_IGNORE_SPACE;
+
   return(0);
 }
 

=== modified file 'mysql-test/r/mysql.result'
--- a/mysql-test/r/mysql.result	2009-03-24 20:44:38 +0000
+++ b/mysql-test/r/mysql.result	2009-05-07 17:28:29 +0000
@@ -192,4 +192,10 @@ delimiter
 1
 1
 1
+COUNT (*)
+1
+COUNT (*)
+1
+COUNT (*)
+1
 End of 5.0 tests

=== modified file 'mysql-test/t/mysql.test'
--- a/mysql-test/t/mysql.test	2009-03-24 20:50:59 +0000
+++ b/mysql-test/t/mysql.test	2009-05-07 17:28:29 +0000
@@ -341,4 +341,11 @@ EOF
 
 remove_file $MYSQLTEST_VARDIR/tmp/bug31060.sql;
 
+#
+# Bug #39101: client -i (--ignore-spaces) option does not seem to work
+#
+--exec $MYSQL -i -e "SELECT COUNT (*)"
+--exec $MYSQL --ignore-spaces -e "SELECT COUNT (*)"
+--exec $MYSQL -b -i -e "SELECT COUNT (*)"
+
 --echo End of 5.0 tests