Commit b1cdde89 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql

parents fa5717b9 dfd7f455

client/mysql.cc

+3 −3
Original line number Diff line number Diff line
@@ -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\

configure.in

+2 −6
Original line number Diff line number Diff line
@@ -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)

sql/ha_innobase.cc

+6 −5
Original line number Diff line number Diff line
@@ -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);

}



/*************************************************************************

sql/item_strfunc.cc

+10 −7
Original line number Diff line number Diff line
@@ -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)