Commit ea6aba52 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/kostja/mysql/tmp_merge 

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


configure.in:
  Auto merged
include/heap.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_heap.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
storage/heap/hp_create.c:
  Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/sql_update.cc:
  Manual merge
tests/mysql_client_test.c:
  SCCS merged
parents 2dc19ba6 cf4b6ee4

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ MYSQL_PROG_AR 


# libmysqlclient versioning when linked with GNU ld.

if $LD --version 2>/dev/null|grep -q GNU; then

  LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmysql/libmysql.ver"

  LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/libmysql/libmysql.ver"

  AC_CONFIG_FILES(libmysql/libmysql.ver)

fi

AC_SUBST(LD_VERSION_SCRIPT)

include/heap.h

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ typedef struct st_heap_share 
  HP_KEYDEF  *keydef;

  ulong min_records,max_records;	/* Params to open */

  ulong data_length,index_length,max_table_size;

  uint key_stat_version;                /* version to indicate insert/delete */

  uint records;				/* records */

  uint blength;				/* records rounded up to 2^n */

  uint deleted;				/* Deleted records in database */

libmysql/libmysql.c

+6 −0
Original line number Diff line number Diff line
@@ -5036,6 +5036,12 @@ my_bool STDCALL mysql_stmt_reset(MYSQL_STMT *stmt) 
{

  DBUG_ENTER("mysql_stmt_reset");

  DBUG_ASSERT(stmt != 0);

  if (!stmt->mysql)

  {

    /* mysql can be reset in mysql_close called from mysql_reconnect */

    set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate);

    DBUG_RETURN(1);

  }

  /* Reset the client and server sides of the prepared statement */

  DBUG_RETURN(reset_stmt_handle(stmt, RESET_SERVER_SIDE | RESET_LONG_DATA));

}

mysql-test/r/kill.result

+13 −1
Original line number Diff line number Diff line 
drop table if exists t1;

drop table if exists t1, t2, t3;

create table t1 (kill_id int);

insert into t1 values(connection_id());

select ((@id := kill_id) - kill_id) from t1;
@@ -27,3 +27,15 @@ select 1; 
select RELEASE_LOCK("a");

RELEASE_LOCK("a")

1

create table t1 (id int primary key);

create table t2 (id int unsigned not null);

insert into t2 select id from t1;

create table t3 (kill_id int);

insert into t3 values(connection_id());

 select id from t1 where id in (select distinct id from t2);

select ((@id := kill_id) - kill_id) from t3;

((@id := kill_id) - kill_id)

0

kill @id;

ERROR 08S01: Server shutdown in progress

drop table t1, t2, t3;

mysql-test/r/myisam.result

+1 −1
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ Warnings: 
Note	1031	Table storage engine for 't1' doesn't have this option

show keys from t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	1	a	1	a	NULL	1000	NULL	NULL	YES	HASH	

t1	1	a	1	a	NULL	500	NULL	NULL	YES	HASH	

drop table t1,t2;

create table t1 ( a tinytext, b char(1), index idx (a(1),b) );

insert into t1 values (null,''), (null,'');