Commit 9ec5da11 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into mysql.com:/home/jimw/my/mysql-5.0-clean
parents 895d88e5 fa4a075b

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ AC_PREREQ(2.50)dnl Minimum Autoconf version required. 
AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM

# Don't forget to also update the NDB lines below.

AM_INIT_AUTOMAKE(mysql, 5.0.3-beta)

AM_INIT_AUTOMAKE(mysql, 5.0.4-beta)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -17,7 +17,7 @@ SHARED_LIB_VERSION=14:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=3

NDB_VERSION_BUILD=4

NDB_VERSION_STATUS="beta"



# Set all version vars based on $VERSION. How do we do this more elegant ?

libmysql/Makefile.shared

+2 −1
Original line number Diff line number Diff line
@@ -96,7 +96,8 @@ clean-local: 
	      `echo $(sql_cmn_objects) | sed "s;\.lo;.c;g"` \

	       $(CHARSET_SRCS) $(CHARSET_OBJS) \

	       $(mystringsextra) $(mysysheaders) $(vioheaders)\

	       ../linked_client_sources net.c

	       ../linked_libmysql_sources ../linked_libmysql_r_sources \

               net.c



conf_to_src_SOURCES = conf_to_src.c

conf_to_src_LDADD=

libmysql/libmysql.c

+11 −0
Original line number Diff line number Diff line
@@ -2862,6 +2862,17 @@ int STDCALL mysql_stmt_execute(MYSQL_STMT *stmt) 
      mysql->status= MYSQL_STATUS_READY;

      stmt->read_row_func= stmt_read_row_from_cursor;

    }

    else if (stmt->flags & CURSOR_TYPE_READ_ONLY)

    {

      /*

        This is a single-row result set, a result set with no rows, EXPLAIN,

        SHOW VARIABLES, or some other command which either a) bypasses the

        cursors framework in the server and writes rows directly to the

        network or b) is more efficient if all (few) result set rows are

        precached on client and server's resources are freed.

      */

      DBUG_RETURN(mysql_stmt_store_result(stmt));

    }

    else

    {

      stmt->mysql->unbuffered_fetch_owner= &stmt->unbuffered_fetch_cancelled;

mysql-test/r/rpl_deadlock.result

+6 −0
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ create table t1 (a int not null, key(a)) engine=innodb; 
create table t2 (a int not null, key(a)) engine=innodb;

create table t3 (a int) engine=innodb;

create table t4 (a int) engine=innodb;

show variables like 'slave_transaction_retries';

Variable_name	Value

slave_transaction_retries	10

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (
@@ -20,6 +23,9 @@ t2 CREATE TABLE `t2` ( 
  `a` int(11) NOT NULL,

  KEY `a` (`a`)

) ENGINE=InnoDB DEFAULT CHARSET=latin1

show variables like 'slave_transaction_retries';

Variable_name	Value

slave_transaction_retries	2

stop slave;

begin;

insert into t3 select * from t2 for update;

mysql-test/r/rpl_timezone.result

+16 −0
Original line number Diff line number Diff line
@@ -65,6 +65,22 @@ SET @@session.time_zone='Europe/Moscow'; 
insert into t1 values ('20040101000000'), ('20040611093902');

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;

delete from t1;

set time_zone='UTC';

load data infile '../../std_data/rpl_timezone.dat' into table t1;

select * from t1;

t

2004-01-01 00:00:00

2004-06-11 09:39:02

set time_zone='UTC';

select * from t1;

t

2004-01-01 00:00:00

2004-06-11 09:39:02

set time_zone='Europe/Moscow';

set time_zone='Europe/Moscow';

delete from t1;

insert into t1 values ('20040101000000'), ('20040611093902');

set time_zone='MET';

insert into t2 (select t from t1);

select * from t1;