Commit 5dcfa572 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 

into  mysql.com:/users/lthalmann/bk/mysql-5.0-mysqlbinlog-ulong
parents 7b8f2df2 ada1f886

BUILD/compile-pentium64-valgrind-max

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

View file

BitKeeper/etc/config

+1 −0
Original line number Diff line number Diff line
@@ -73,5 +73,6 @@ hours: 
[nick:]checkout:get

[jonas:]checkout:get

[tomas:]checkout:get

[guilhem:]checkout:get

checkout:edit

eoln:unix

include/my_sys.h

+2 −1
Original line number Diff line number Diff line
@@ -158,7 +158,8 @@ extern gptr my_memdup(const byte *from,uint length,myf MyFlags); 
extern char *my_strdup(const char *from,myf MyFlags);

extern char *my_strdup_with_length(const byte *from, uint length,

				   myf MyFlags);

#define my_free(PTR,FG) my_no_flags_free(PTR)

/* we do use FG (as a no-op) in below so that a typo on FG is caught */

#define my_free(PTR,FG) ((void)FG,my_no_flags_free(PTR))

#define CALLER_INFO_PROTO   /* nothing */

#define CALLER_INFO         /* nothing */

#define ORIG_CALLER_INFO    /* nothing */

mysql-test/r/federated.result

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ Table Create Table 
t2	CREATE TABLE `t2` (

  `id` int(20) NOT NULL,

  `name` varchar(32) NOT NULL default ''

) ENGINE=FEDERATED DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:9308/federated/t1'

) ENGINE=FEDERATED DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1'

INSERT INTO federated.t2 (id, name) VALUES (1, 'foo');

INSERT INTO federated.t2 (id, name) VALUES (2, 'fee');

SELECT * FROM federated.t2;

mysql-test/r/rpl_dual_pos_advance.result

0 → 100644
+22 −0
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

reset master;

change master to master_host="127.0.0.1",master_port=SLAVE_PORT,master_user="root";

start slave;

create table t1 (n int);

create table t4 (n int);

create table t5 (n int);

create table t6 (n int);

show tables;

Tables_in_test

t1

t4

t5

t6

stop slave;

reset slave;

drop table t1,t4,t5,t6;