Commit 13b4ee92 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/home/dlenev/src/mysql-5.1-merges2


sql/sql_base.cc:
  Auto merged
parents 594ba86b e54ecf09

client/mysqltest.c

+4 −2
Original line number Diff line number Diff line
@@ -3662,8 +3662,10 @@ DYNAMIC_ARRAY patterns; 
static void init_win_path_patterns()

{

  /* List of string patterns to match in order to find paths */

  const char* paths[] = { "$MYSQL_TEST_DIR", "./test/", 0 };

  int num_paths= 2;

  const char* paths[] = { "$MYSQL_TEST_DIR",

                          "$MYSQL_TMP_DIR",

                          "./test/", 0 };

  int num_paths= 3;

  int i;

  char* p;

include/my_global.h

+9 −0
Original line number Diff line number Diff line
@@ -43,6 +43,15 @@ 
#define HAVE_ERRNO_AS_DEFINE

#endif /* __CYGWIN__ */



#if defined(__QNXNTO__) && !defined(FD_SETSIZE)

#define FD_SETSIZE 1024         /* Max number of file descriptor bits in

                                   fd_set, used when calling 'select'

                                   Must be defined before including

                                   "sys/select.h" and "sys/time.h"

                                 */

#endif





/* to make command line shorter we'll define USE_PRAGMA_INTERFACE here */

#ifdef USE_PRAGMA_IMPLEMENTATION

#define USE_PRAGMA_INTERFACE

mysql-test/mysql-test-run.pl

+2 −1
Original line number Diff line number Diff line
@@ -1156,6 +1156,7 @@ sub environment_setup () { 
  $ENV{'USE_RUNNING_SERVER'}= $glob_use_running_server;

  $ENV{'MYSQL_TEST_DIR'}=     $glob_mysql_test_dir;

  $ENV{'MYSQLTEST_VARDIR'}=   $opt_vardir;

  $ENV{'MYSQL_TMP_DIR'}=      $opt_tmpdir;

  $ENV{'MASTER_MYSOCK'}=      $master->[0]->{'path_mysock'};

  $ENV{'MASTER_MYSOCK1'}=     $master->[1]->{'path_mysock'};

  $ENV{'MASTER_MYPORT'}=      $master->[0]->{'path_myport'};
@@ -2876,7 +2877,7 @@ sub run_mysqltest ($) { 
  if ( $opt_debug )

  {

    $cmdline_mysqlcheck .=

      " --debug=d:t:A,$opt_vardir_trace/log/mysqldump.trace";

      " --debug=d:t:A,$opt_vardir_trace/log/mysqlcheck.trace";

  }



  my $cmdline_mysqldump= "$exe_mysqldump --no-defaults -uroot " .

mysql-test/mysql-test-run.sh

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ SYST=0 
REALT=0

FAST_START=""

MYSQL_TMP_DIR=$MYSQL_TEST_DIR/var/tmp

export MYSQL_TMP_DIR



# Use a relative path for where the slave will find the dumps

# generated by "LOAD DATA" on the master. The path is relative

mysql-test/r/index_merge.result

+22 −0
Original line number Diff line number Diff line
@@ -402,3 +402,25 @@ explain select * from t1 force index(cola,colb) WHERE cola = 'foo' AND colb = 'b 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index_merge	cola,colb	cola,colb	3,3	NULL	24	Using intersect(cola,colb); Using where

drop table t1;

create table t0 (a int);

insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);

create table t1 (

a int, b int, 

filler1 char(200), filler2 char(200),

key(a),key(b)

);

insert into t1 select @v:= A.a, @v, 't1', 'filler2' from t0 A, t0 B, t0 C;

create table t2 like t1;

create table t3 (

a int, b int, 

filler1 char(200), filler2 char(200),

key(a),key(b)

) engine=merge union=(t1,t2);

explain select * from t1 where a=1 and b=1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index_merge	a,b	a,b	5,5	NULL	#	Using intersect(a,b); Using where

explain select * from t3 where a=1 and b=1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t3	index_merge	a,b	a,b	5,5	NULL	#	Using intersect(a,b); Using where

drop table t3;

drop table t0, t1, t2;