Commit 34bbdf06 authored by unknown's avatar unknown
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck


configure.in:
  Auto merged
parents 2e7c3675 421dadf7

client/mysql.cc

+7 −3
Original line number Diff line number Diff line
@@ -1813,9 +1813,13 @@ com_help(String *buffer __attribute__((unused)), 
  if (help_arg)

    return com_server_help(buffer,line,help_arg+1);



  put_info("\nFor the complete MySQL Manual online, visit:\n   http://www.mysql.com/documentation\n", INFO_INFO);

  put_info("For info on technical support from MySQL developers, visit:\n   http://www.mysql.com/support\n", INFO_INFO);

  put_info("For info on MySQL books, utilities, consultants, etc., visit:\n   http://www.mysql.com/portal\n", INFO_INFO);

  put_info("\nFor information about MySQL products and services, visit:\n"

           "   http://www.mysql.com/\n"

           "For developer information, including the MySQL Reference Manual, "

           "visit:\n"

           "   http://dev.mysql.com/\n"

           "To buy MySQL Network Support, training, or other products, visit:\n"

           "   https://shop.mysql.com/\n", INFO_INFO);

  put_info("List of all MySQL commands:", INFO_INFO);

  if (!named_cmds)

    put_info("Note that all text commands must be first on line and end with ';'",INFO_INFO);

configure.in

+13 −0
Original line number Diff line number Diff line
@@ -1672,6 +1672,19 @@ if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null; then 
  OPTIMIZE_CXXFLAGS="$OPTIMIZE_CXXFLAGS -DNDEBUG"

fi



# If the user specified CFLAGS, we won't add any optimizations

if test -n "$SAVE_CFLAGS"

then

  OPTIMIZE_CFLAGS=""

  DEBUG_OPTIMIZE_CC=""

fi

# Ditto for CXXFLAGS

if test -n "$SAVE_CXXFLAGS"

then

  OPTIMIZE_CXXFLAGS=""

  DEBUG_OPTIMIZE_CXX=""

fi



AC_ARG_WITH(debug,

    [  --without-debug         Build a production version without debugging code],

    [with_debug=$withval],

myisam/ft_parser.c

+3 −1
Original line number Diff line number Diff line
@@ -188,8 +188,10 @@ byte ft_simple_get_word(CHARSET_INFO *cs, byte **start, byte *end, 
    for (word->pos=doc; doc<end; length++, mbl=my_mbcharlen(cs, *(uchar *)doc), doc+=(mbl ? mbl : 1))

      if (true_word_char(cs,*doc))

        mwc= 0;

      else if (!misc_word_char(*doc) || mwc++)

      else if (!misc_word_char(*doc) || mwc)

        break;

      else

        mwc++;



    word->len= (uint)(doc-word->pos) - mwc;

myisam/mi_key.c

+3 −0
Original line number Diff line number Diff line
@@ -217,7 +217,10 @@ uint _mi_pack_key(register MI_INFO *info, uint keynr, uchar *key, uchar *old, 
      {

	k_length-=length;

        if (keyseg->flag & (HA_VAR_LENGTH | HA_BLOB_PART))

        {

          old+= 2;

          k_length-=2;                                  /* Skip length */

        }

	continue;					/* Found NULL */

      }

    }

mysql-test/r/analyze.result

+7 −0
Original line number Diff line number Diff line
@@ -30,3 +30,10 @@ check table t1; 
Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

drop table t1;

CREATE TABLE t1 (a int);

prepare stmt1 from "SELECT * FROM t1 PROCEDURE ANALYSE()";

execute stmt1;

Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype

execute stmt1;

Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype

deallocate prepare stmt1;