database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fixed help typos in mysql.cc

Browse Source
This commit is contained in:
monty@hundin.mysql.fi
2002-04-02 17:42:01 +03:00
parent 254c26da3e
commit dfd7f455e4
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/mysql.cc
View File

@ -34,7 +34,7 @@
#include "my_readline.h" #include "my_readline.h"
#include <signal.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 */ /* Don't try to make a nice table if the data is too big */
#define MAX_COLUMN_LENGTH 1024 #define MAX_COLUMN_LENGTH 1024
@ -397,12 +397,12 @@ static struct option long_options[] =
{"local-infile", optional_argument, 0, OPT_LOCAL_INFILE}, {"local-infile", optional_argument, 0, OPT_LOCAL_INFILE},
{"no-auto-rehash",no_argument, 0, 'A'}, {"no-auto-rehash",no_argument, 0, 'A'},
{"no-named-commands", no_argument, 0, 'g'}, {"no-named-commands", no_argument, 0, 'g'},
{"no-tee", no_argument, 0, OPT_NOTEE},
#ifndef __WIN__ #ifndef __WIN__
{"no-pager", no_argument, 0, OPT_NOPAGER}, {"no-pager", no_argument, 0, OPT_NOPAGER},
{"nopager", no_argument, 0, OPT_NOPAGER}, /* we are kind */ {"nopager", no_argument, 0, OPT_NOPAGER}, /* we are kind */
{"pager", optional_argument, 0, OPT_PAGER}, {"pager", optional_argument, 0, OPT_PAGER},
#endif #endif
{"no-tee", no_argument, 0, OPT_NOTEE},
{"notee", no_argument, 0, OPT_NOTEE}, /* we are kind */ {"notee", no_argument, 0, OPT_NOTEE}, /* we are kind */
{"tee", required_argument, 0, OPT_TEE}, {"tee", required_argument, 0, OPT_TEE},
{"one-database", no_argument, 0, 'o'}, {"one-database", no_argument, 0, 'o'},
@ -484,7 +484,7 @@ static void usage(int version)
still work from the first line.\n\ still work from the first line.\n\
-G, --enable-named-commands\n\ -G, --enable-named-commands\n\
Named commands are enabled. Opposite to -g.\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, --host=... Connect to host.\n\
-H, --html Produce HTML output.\n\ -H, --html Produce HTML output.\n\
--local-infile=[1|0] Enable/disable LOAD DATA LOCAL INFILE\n\ --local-infile=[1|0] Enable/disable LOAD DATA LOCAL INFILE\n\

8
configure.in
View File

@ -291,19 +291,15 @@ case "$target_os" in
if test "$GCC" != "yes"; then if test "$GCC" != "yes"; then
# We are using built-in inline function # We are using built-in inline function
CFLAGS="$CFLAGS -Kalloca" CFLAGS="$CFLAGS -Kalloca"
CXX="$CXX -DNO_CPLUSPLUS_ALLOCA"
else
CXX="$CXX -DNO_CPLUSPLUS_ALLOCA"
fi fi
CXXFLAGS="$CXXFLAGS -DNO_CPLUSPLUS_ALLOCA"
;; ;;
sysv5OpenUNIX8*) sysv5OpenUNIX8*)
if test "$GCC" != "yes"; then if test "$GCC" != "yes"; then
# We are using built-in inline function # We are using built-in inline function
CFLAGS="$CFLAGS -Kalloca" CFLAGS="$CFLAGS -Kalloca"
CXX="$CXX -DNO_CPLUSPLUS_ALLOCA"
else
CXX="$CXX -DNO_CPLUSPLUS_ALLOCA"
fi fi
CXXFLAGS="$CXXFLAGS -DNO_CPLUSPLUS_ALLOCA"
;; ;;
esac esac
AC_SUBST(CC) AC_SUBST(CC)

11
sql/ha_innobase.cc
View File

@ -1890,7 +1890,7 @@ ha_innobase::change_active_index(
InnoDB */ InnoDB */
{ {
row_prebuilt_t* prebuilt = (row_prebuilt_t*) innobase_prebuilt; row_prebuilt_t* prebuilt = (row_prebuilt_t*) innobase_prebuilt;
KEY* key; KEY* key=0;
statistic_increment(ha_read_key_count, &LOCK_status); statistic_increment(ha_read_key_count, &LOCK_status);
@ -1911,9 +1911,10 @@ ha_innobase::change_active_index(
if (!prebuilt->index) { if (!prebuilt->index) {
fprintf(stderr, fprintf(stderr,
"InnoDB: Could not find key n:o %u with name %s from dict cache\n" "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); assert(prebuilt->search_tuple);
@ -1929,7 +1930,7 @@ ha_innobase::change_active_index(
build_template(prebuilt, user_thd, table, ROW_MYSQL_WHOLE_ROW); 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); estimate = 2 * data_file_length / dict_index_calc_min_rec_len(index);
return((ha_rows) estimate); DBUG_RETURN((ha_rows) estimate);
} }
/************************************************************************* /*************************************************************************

17
sql/item_strfunc.cc
View File

@ -1720,18 +1720,21 @@ String* Item_func_inet_ntoa::val_str(String* str)
uchar buf[8], *p; uchar buf[8], *p;
ulonglong n = (ulonglong) args[0]->val_int(); ulonglong n = (ulonglong) args[0]->val_int();
char num[4]; 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)) if ((null_value=args[0]->null_value))
return 0; // Null value return 0; // Null value
str->length(0); str->length(0);
int8store(buf,n); int8store(buf,n);
// now we can assume little endian /*
// we handle the possibility of an 8-byte IP address Now we can assume little endian.
// however, we do not want to confuse those who are just using We handle the possibility of an 8-byte IP address however, we do
// 4 byte ones not want to confuse those who are just using 4 byte ones
*/
for (p= buf + 8; p > buf+4 && p[-1] == 0 ; p-- ) ; for (p= buf + 8; p > buf+4 && p[-1] == 0 ; p-- ) ;
num[3]='.'; num[3]='.';
while (p-- > buf) while (p-- > buf)