Fixed help typos in mysql.cc

client/mysql.cc:
  Fixed typos
configure.in:
  Cleanup
sql/ha_innobase.cc:
  Safety patch
sql/item_strfunc.cc:
  cleanup

4 files changed, 21 insertions, 21 deletions

diff --git a/client/mysql.cc b/client/mysql.cc
index 60e97bff621..32547a4d138 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -34,7 +34,7 @@
 #include "my_readline.h"
 #include <signal.h>
 
-const char *VER="11.17";
+const char *VER="11.18";
 
 /* Don't try to make a nice table if the data is too big */
 #define MAX_COLUMN_LENGTH	     1024
@@ -397,12 +397,12 @@ static struct option long_options[] =
   {"local-infile",  optional_argument,	   0, OPT_LOCAL_INFILE},
   {"no-auto-rehash",no_argument,	   0, 'A'},
   {"no-named-commands", no_argument,       0, 'g'},
-  {"no-tee",        no_argument,           0, OPT_NOTEE},
 #ifndef __WIN__
   {"no-pager",      no_argument,           0, OPT_NOPAGER},
   {"nopager",       no_argument,           0, OPT_NOPAGER},  /* we are kind */
   {"pager",         optional_argument,     0, OPT_PAGER},
 #endif
+  {"no-tee",        no_argument,           0, OPT_NOTEE},
   {"notee",         no_argument,           0, OPT_NOTEE},    /* we are kind */
   {"tee",           required_argument,     0, OPT_TEE},
   {"one-database",  no_argument,	   0, 'o'},
@@ -484,7 +484,7 @@ static void usage(int version)
                         still work from the first line.\n\
   -G, --enable-named-commands\n\
                         Named commands are enabled. Opposite to -g.\n\
-  -i, --ignore-space	Ignore space after function names.\n\
+  -i, --ignore-spaces	Ignore spaces after function names.\n\
   -h, --host=...	Connect to host.\n\
   -H, --html		Produce HTML output.\n\
   --local-infile=[1|0]  Enable/disable LOAD DATA LOCAL INFILE\n\
diff --git a/configure.in b/configure.in
index b55f1f6f726..5e6efe8ea5d 100644
--- a/configure.in
+++ b/configure.in
@@ -291,19 +291,15 @@ case "$target_os" in
     if test "$GCC" != "yes"; then
       # We are using built-in inline function
       CFLAGS="$CFLAGS -Kalloca"
-      CXX="$CXX -DNO_CPLUSPLUS_ALLOCA"
-    else
-      CXX="$CXX -DNO_CPLUSPLUS_ALLOCA"
     fi
+    CXXFLAGS="$CXXFLAGS -DNO_CPLUSPLUS_ALLOCA"
   ;;
   sysv5OpenUNIX8*) 
     if test "$GCC" != "yes"; then
       # We are using built-in inline function
       CFLAGS="$CFLAGS -Kalloca"
-      CXX="$CXX -DNO_CPLUSPLUS_ALLOCA"
-    else
-      CXX="$CXX -DNO_CPLUSPLUS_ALLOCA"
     fi
+    CXXFLAGS="$CXXFLAGS -DNO_CPLUSPLUS_ALLOCA"
   ;;
 esac
 AC_SUBST(CC)
diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc
index 9159ef3f1c1..a741ffefbb5 100644
--- a/sql/ha_innobase.cc
+++ b/sql/ha_innobase.cc
@@ -1890,7 +1890,7 @@ ha_innobase::change_active_index(
 			InnoDB */
 {
 	row_prebuilt_t* prebuilt	= (row_prebuilt_t*) innobase_prebuilt;
-	KEY*		key;
+	KEY*		key=0;
 
   	statistic_increment(ha_read_key_count, &LOCK_status);
 
@@ -1911,9 +1911,10 @@ ha_innobase::change_active_index(
 	if (!prebuilt->index) {
 		fprintf(stderr,
 	"InnoDB: Could not find key n:o %u with name %s from dict cache\n"
-	"InnoDB: for table %s\n", keynr, key->name, prebuilt->table->name);
+	"InnoDB: for table %s\n", keynr, key ? key->name : "NULL",
+			prebuilt->table->name);
 
-		return(1);
+		DBUG_RETURN(1);
 	}
 	
 	assert(prebuilt->search_tuple);
@@ -1929,7 +1930,7 @@ ha_innobase::change_active_index(
 
 	build_template(prebuilt, user_thd, table, ROW_MYSQL_WHOLE_ROW);
 
-	return(0);
+	DBUG_RETURN(0);
 }
 
 /**************************************************************************
@@ -2812,7 +2813,7 @@ ha_innobase::estimate_number_of_rows(void)
 
 	estimate = 2 * data_file_length / dict_index_calc_min_rec_len(index);
 	
-	return((ha_rows) estimate);
+	DBUG_RETURN((ha_rows) estimate);
 }
 
 /*************************************************************************
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index bd7fde79629..0321d37c0fe 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -1720,18 +1720,21 @@ String* Item_func_inet_ntoa::val_str(String* str)
   uchar buf[8], *p;
   ulonglong n = (ulonglong) args[0]->val_int();
   char num[4];
-  // we do not know if args[0] is NULL until we have called
-  // some val function on it if args[0] is not a constant!
+  /*
+    we do not know if args[0] is NULL until we have called
+    some val function on it if args[0] is not a constant!
+  */
   if ((null_value=args[0]->null_value))
     return 0;					// Null value
+
   str->length(0);
   int8store(buf,n);
 
-  // now we can assume little endian
-  // we handle the possibility of an 8-byte IP address
-  // however, we do not want to confuse those who are just using
-  // 4 byte ones
-  
+  /*
+    Now we can assume little endian. 
+    We handle the possibility of an 8-byte IP address however, we do
+    not want to confuse those who are just using 4 byte ones
+  */
   for (p= buf + 8; p > buf+4 && p[-1] == 0 ; p-- ) ;
   num[3]='.';
   while (p-- > buf)