Commit bffe61d8 authored by unknown's avatar unknown
Browse files

Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 

into hundin.mysql.fi:/home/heikki/mysql-5.0
parents 83bd17bb bf0d45ae

Build-tools/Do-compile

+2 −2
Original line number Diff line number Diff line
@@ -377,8 +377,8 @@ system("cd $pwd/$host; perl $ENV{HOME}/my_md5sum $tar_file_lite > ${tar_file_lit 
#

# Unpack the binary distribution

#

if ($opt_stage <= 4 && !$opt_no_test)

$global_step= "extract binary distribution";

if ($opt_stage <= 4 && !$opt_no_test)

{

  log_timestamp("START");

  rm_all(<$pwd/$host/test/*>);
@@ -396,8 +396,8 @@ $ENV{"LD_LIBRARY_PATH"}= ("$test_dir/lib" . 
#

# Run the test suite

#

if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest)

$global_step= "tests in default mode";

if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest)

{

  log_timestamp("START");

  my $flags= "";

client/mysqltest.c

+11 −1
Original line number Diff line number Diff line
@@ -1695,7 +1695,11 @@ int safe_connect(MYSQL* con, const char* host, const char* user, 
    }

    sleep(CON_RETRY_SLEEP);

  }

  con->reconnect= 1; /* TODO: change this to 0 in future versions */

  /*

   TODO: change this to 0 in future versions, but the 'kill' test relies on

   existing behavior

  */

  con->reconnect= 1;

  return con_error;

}
@@ -1790,6 +1794,12 @@ int connect_n_handle_errors(struct st_query *q, MYSQL* con, const char* host, 
    goto err;

  }



  /*

   TODO: change this to 0 in future versions, but the 'kill' test relies on

   existing behavior

  */

  con->reconnect= 1;



  if (record)

  {

    if (!q->record_file[0] && !result_file)

libmysql/libmysql.c

+2 −1
Original line number Diff line number Diff line
@@ -4144,7 +4144,8 @@ static my_bool is_binary_compatible(enum enum_field_types type1, 
    range4[]= { MYSQL_TYPE_ENUM, MYSQL_TYPE_SET, MYSQL_TYPE_TINY_BLOB,

                MYSQL_TYPE_MEDIUM_BLOB, MYSQL_TYPE_LONG_BLOB, MYSQL_TYPE_BLOB,

                MYSQL_TYPE_VAR_STRING, MYSQL_TYPE_STRING, MYSQL_TYPE_GEOMETRY,

                MYSQL_TYPE_DECIMAL, MYSQL_TYPE_NULL },

                MYSQL_TYPE_DECIMAL, MYSQL_TYPE_NULL };

  static const enum enum_field_types

   *range_list[]= { range1, range2, range3, range4 },

   **range_list_end= range_list + sizeof(range_list)/sizeof(*range_list);

   const enum enum_field_types **range, *type;

libmysqld/examples/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ link_sources: 
	done;



DEFS = 		-DEMBEDDED_LIBRARY

INCLUDES =	@MT_INCLUDES@ -I$(top_srcdir)/include -I$(srcdir) \

INCLUDES =	-I$(top_srcdir)/include -I$(srcdir) \

		-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \

		-I$(top_builddir)/include $(openssl_includes)

LIBS =		@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@

mysql-test/r/func_gconcat.result

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ set group_concat_max_len = 1024; 
select group_concat(sum(a)) from t1 group by grp;

ERROR HY000: Invalid use of group function

select grp,group_concat(c order by 2) from t1 group by grp;

ERROR 42S22: Unknown column '2' in 'group statement'

ERROR 42S22: Unknown column '2' in 'order clause'

drop table t1;

create table t1 ( URL_ID int(11), URL varchar(80));

create table t2 ( REQ_ID int(11), URL_ID int(11));