Commit 66fb56f1 authored by unknown's avatar unknown
Browse files

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 

into  example.com:/work/mysql-5.1-runtime-wl3337


BitKeeper/etc/ignore:
  auto-union
client/mysqltest.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/sp_notembedded.result:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/share/errmsg.txt:
  C
mysql-test/r/events_bugs.result:
  update result
  manual merge
mysql-test/r/ps_1general.result:
  update result
  manual merge
sql/sql_yacc.yy:
  manual merge
parents 021cea21 33918998

.bzrignore

+1107 −0

File changed.

Preview size limit exceeded, changes collapsed.

client/mysqltest.c

+6 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ static my_bool ps_protocol= 0, ps_protocol_enabled= 0; 
static my_bool sp_protocol= 0, sp_protocol_enabled= 0;

static my_bool view_protocol= 0, view_protocol_enabled= 0;

static my_bool cursor_protocol= 0, cursor_protocol_enabled= 0;

static my_bool opt_valgrind_test= 0;

static int parsing_disabled= 0;



static char **default_argv;
@@ -3286,6 +3287,8 @@ static struct my_option my_long_options[] = 
   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"user", 'u', "User for login.", (gptr*) &user, (gptr*) &user, 0, GET_STR,

   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"valgrind", 'N', "Define VALGRIND_TEST to 1.", (gptr*) &opt_valgrind_test,

   (gptr*) &opt_valgrind_test, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"verbose", 'v', "Write more.", (gptr*) &verbose, (gptr*) &verbose, 0,

   GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"version", 'V', "Output version information and exit.",
@@ -5060,6 +5063,9 @@ static void init_var_hash(MYSQL *mysql) 
    die("Variable hash initialization failed");

  my_hash_insert(&var_hash, (byte*) var_init(0,"BIG_TEST", 0,

                                             (opt_big_test) ? "1" : "0", 0));

  my_hash_insert(&var_hash, (byte*) var_init(0,"VALGRIND_TEST", 0,

                                             (opt_valgrind_test) ? "1" : "0",

                                             0));

  v= var_init(0,"MAX_TABLES", 0, (sizeof(ulong) == 4) ? "31" : "62",0);

  my_hash_insert(&var_hash, (byte*) v);

  v= var_init(0,"SERVER_VERSION", 0, mysql_get_server_info(mysql), 0);

libmysqld/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -68,7 +68,8 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ 
	spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \

	sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \

	parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \

	event_scheduler.cc events.cc event_timed.cc \

	event_scheduler.cc events.cc event_data_objects.cc \

        event_queue.cc event_db_repository.cc \

	rpl_filter.cc sql_partition.cc sql_builtin.cc sql_plugin.cc \

	sql_tablespace.cc \

	rpl_injector.cc my_user.c partition_info.cc

mysql-test/include/not_valgrind.inc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
--require r/not_valgrind.require

--disable_query_log

eval select $VALGRIND_TEST as using_valgrind;

--enable_query_log

mysql-test/mysql-test-run.pl

+5 −0
Original line number Diff line number Diff line
@@ -3873,6 +3873,11 @@ sub run_mysqltest ($) { 
    mtr_add_arg($args, "--big-test");

  }



  if ( $opt_valgrind )

  {

    mtr_add_arg($args, "--valgrind");

  }



  if ( $opt_compress )

  {

    mtr_add_arg($args, "--compress");