Commit 32d4a360 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt


sql/mysqld.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents 84c4f5af d556631b

BUILD/compile-dist

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
# tree can then be picked up by "make dist" to create the "pristine source

# package" that is used as the basis for all other binary builds.

#

make distclean

test -f Makefile && make distclean

(cd storage/bdb/dist && sh s_all)

(cd storage/innobase && aclocal && autoheader && \

    libtoolize --automake --force --copy && \

include/m_string.h

+1 −1
Original line number Diff line number Diff line
@@ -256,6 +256,6 @@ typedef struct 
} LEX_STRING;



#define STRING_WITH_LEN(X) (X), ((uint) (sizeof(X) - 1))

#define C_STRING_WITH_SIZE(X) ((char *) (X)), ((uint) (sizeof(X) - 1))

#define C_STRING_WITH_LEN(X) ((char *) (X)), ((uint) (sizeof(X) - 1))



#endif

include/my_global.h

+3 −0
Original line number Diff line number Diff line
@@ -797,6 +797,9 @@ typedef SOCKET_SIZE_TYPE size_socket; 
#define DBL_MAX		1.79769313486231470e+308

#define FLT_MAX		((float)3.40282346638528860e+38)

#endif

#ifndef SSIZE_MAX

#define SSIZE_MAX ((~((size_t) 0)) / 2)

#endif



#if !defined(HAVE_ISINF) && !defined(isinf)

#define isinf(X)    0

mysql-test/mysql-test-run.pl

+25 −24
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ our $opt_user_test; 
our $opt_valgrind= 0;

our $opt_valgrind_mysqld= 0;

our $opt_valgrind_mysqltest= 0;

our $opt_valgrind_all= 0;

our $default_valgrind_options= "-v --show-reachable=yes";

our $opt_valgrind_options;

our $opt_valgrind_path;
@@ -629,10 +629,9 @@ sub command_line_setup () { 
             # Coverage, profiling etc

             'gcov'                     => \$opt_gcov,

             'gprof'                    => \$opt_gprof,

             'valgrind'                 => \$opt_valgrind,

             'valgrind|valgrind-all'    => \$opt_valgrind,

             'valgrind-mysqltest'       => \$opt_valgrind_mysqltest,

             'valgrind-mysqld'          => \$opt_valgrind_mysqld,

             'valgrind-all'             => \$opt_valgrind_all,

             'valgrind-options=s'       => \$opt_valgrind_options,

             'valgrind-path=s'          => \$opt_valgrind_path,
@@ -816,20 +815,32 @@ sub command_line_setup () { 
    }

  }



  # Turn on valgrinding of all executables if "valgrind" or "valgrind-all"

  if ( $opt_valgrind or $opt_valgrind_all )

  # Check valgrind arguments

  if ( $opt_valgrind or $opt_valgrind_path or defined $opt_valgrind_options)

  {

    mtr_report("Turning on valgrind for all executables");

    $opt_valgrind= 1;

    $opt_valgrind_mysqld= 1;

    $opt_valgrind_mysqltest= 1;

  }

  elsif ( $opt_valgrind_mysqld or $opt_valgrind_mysqltest )

  elsif ( $opt_valgrind_mysqld )

  {

    # If test's are run for a specific executable, turn on

    # verbose and show-reachable

    mtr_report("Turning on valgrind for mysqld(s) only");

    $opt_valgrind= 1;

    $opt_valgrind_all= 1;

  }

  elsif ( $opt_valgrind_mysqltest )

  {

    mtr_report("Turning on valgrind for mysqltest only");

    $opt_valgrind= 1;

  }



  if ( $opt_valgrind )

  {

    # Set valgrind_options to default unless already defined

    $opt_valgrind_options=$default_valgrind_options

      unless defined $opt_valgrind_options;



    mtr_report("Running valgrind with options \"$opt_valgrind_options\"");

  }



  if ( ! $opt_testcase_timeout )
@@ -3694,17 +3705,8 @@ sub valgrind_arguments { 
  mtr_add_arg($args, "--suppressions=%s/valgrind.supp", $glob_mysql_test_dir)

    if -f "$glob_mysql_test_dir/valgrind.supp";



  if ( $opt_valgrind_all )

  {

    mtr_add_arg($args, "-v");

    mtr_add_arg($args, "--show-reachable=yes");

  }



  if ( $opt_valgrind_options )

  {

  # Add valgrind options, can be overriden by user

  mtr_add_arg($args, '%s', $_) for (split(' ', $opt_valgrind_options));

  }





  mtr_add_arg($args, $$exe);
@@ -3816,12 +3818,11 @@ Options for coverage, profiling etc 
  gcov                  FIXME

  gprof                 FIXME

  valgrind              Run the "mysqltest" and "mysqld" executables using

                        valgrind

  valgrind-all          Same as "valgrind" but will also add "verbose" and

                        "--show-reachable" flags to valgrind

                        valgrind with options($default_valgrind_options)

  valgrind-all          Synonym for --valgrind

  valgrind-mysqltest    Run the "mysqltest" executable with valgrind

  valgrind-mysqld       Run the "mysqld" executable with valgrind

  valgrind-options=ARGS Extra options to give valgrind

  valgrind-options=ARGS Options to give valgrind, replaces default options

  valgrind-path=[EXE]   Path to the valgrind executable



Misc options

mysql-test/r/fulltext2.result

+8 −0
Original line number Diff line number Diff line
@@ -241,3 +241,11 @@ select * from t1 where match a against('ab c' in boolean mode); 
a

drop table t1;

set names latin1;

SET NAMES utf8;

CREATE TABLE t1(a VARCHAR(255), FULLTEXT(a)) ENGINE=MyISAM DEFAULT CHARSET=utf8;

INSERT INTO t1 VALUES('„MySQL“');

SELECT a FROM t1 WHERE MATCH a AGAINST('“MySQL„' IN BOOLEAN MODE);

a

„MySQL“

DROP TABLE t1;

SET NAMES latin1;