Commit 3763edd3 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


BitKeeper/etc/collapsed:
  auto-union
include/m_ctype.h:
  Auto merged
mysql-test/r/binlog_row_mix_innodb_myisam.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
unittest/mytap/tap.c:
  Auto merged
sql/log_event.cc:
  manual merge
sql/sql_class.cc:
  manual merge
parents dd726470 4c3283b3

BitKeeper/etc/collapsed

+2 −0
Original line number Diff line number Diff line
@@ -15,3 +15,5 @@ 
45214442pBGT9KuZEGixBH71jTzbOA

45214a07hVsIGwvwa-WrO-jpeaSwVw

452a92d0-31-8wSzSfZi165fcGcXPA

452c6c6dAjuNghfc1ObZ_UQ5SCl85g

4538a7b0EbDHHkWPbIwxO6ZIDdg6Dg

client/mysqlbinlog.cc

+15 −0
Original line number Diff line number Diff line
@@ -1360,6 +1360,21 @@ static int dump_local_log_entries(const char* logname) 
  }

  else // reading from stdin;

  {

    /*

      Windows opens stdin in text mode by default. Certain characters

      such as CTRL-Z are interpeted as events and the read() method

      will stop. CTRL-Z is the EOF marker in Windows. to get past this

      you have to open stdin in binary mode. Setmode() is used to set

      stdin in binary mode. Errors on setting this mode result in 

      halting the function and printing an error message to stderr.

    */

#if defined (__WIN__) || (_WIN64)

    if (_setmode(fileno(stdin), O_BINARY) == -1)

    {

       fprintf(stderr, "Could not set binary mode on stdin.\n");

       return 1;

    }

#endif 

    if (init_io_cache(file, fileno(stdin), 0, READ_CACHE, (my_off_t) 0,

		      0, MYF(MY_WME | MY_NABP | MY_DONT_CHECK_FILESIZE)))

      return 1;

include/m_ctype.h

+6 −6
Original line number Diff line number Diff line
@@ -190,8 +190,8 @@ typedef struct my_charset_handler_st 
               const unsigned char *s, const unsigned char *e);

  

  /* Functions for case and sort conversion */

  void    (*caseup_str)(struct charset_info_st *, char *);

  void    (*casedn_str)(struct charset_info_st *, char *);

  uint    (*caseup_str)(struct charset_info_st *, char *);

  uint    (*casedn_str)(struct charset_info_st *, char *);

  uint    (*caseup)(struct charset_info_st *, char *src, uint srclen,

                                              char *dst, uint dstlen);

  uint    (*casedn)(struct charset_info_st *, char *src, uint srclen,
@@ -324,8 +324,8 @@ extern uint my_instr_simple(struct charset_info_st *, 




/* Functions for 8bit */

extern void my_caseup_str_8bit(CHARSET_INFO *, char *);

extern void my_casedn_str_8bit(CHARSET_INFO *, char *);

extern uint my_caseup_str_8bit(CHARSET_INFO *, char *);

extern uint my_casedn_str_8bit(CHARSET_INFO *, char *);

extern uint my_caseup_8bit(CHARSET_INFO *, char *src, uint srclen,

                                           char *dst, uint dstlen);

extern uint my_casedn_8bit(CHARSET_INFO *, char *src, uint srclen,
@@ -415,8 +415,8 @@ int my_mbcharlen_8bit(CHARSET_INFO *, uint c); 




/* Functions for multibyte charsets */

extern void my_caseup_str_mb(CHARSET_INFO *, char *);

extern void my_casedn_str_mb(CHARSET_INFO *, char *);

extern uint my_caseup_str_mb(CHARSET_INFO *, char *);

extern uint my_casedn_str_mb(CHARSET_INFO *, char *);

extern uint my_caseup_mb(CHARSET_INFO *, char *src, uint srclen,

                                         char *dst, uint dstlen);

extern uint my_casedn_mb(CHARSET_INFO *, char *src, uint srclen,

mysql-test/extra/binlog_tests/binlog.test

+13 −0
Original line number Diff line number Diff line
@@ -59,4 +59,17 @@ insert into t1 values(null); 
select * from t1;

drop table t1;



# bug#22027 

create table t1 (a int);

create table if not exists t2 select * from t1;



# bug#22762

create temporary table tt1 (a int);

create table if not exists t3 like tt1;



--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;

drop table t1,t2,t3,tt1;



-- source extra/binlog_tests/binlog_insert_delayed.test

mysql-test/extra/rpl_tests/rpl_deadlock.test

+10 −5
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 
connection master;

eval CREATE TABLE t1 (a INT NOT NULL, KEY(a)) ENGINE=$engine_type;

eval CREATE TABLE t2 (a INT NOT NULL, KEY(a)) ENGINE=$engine_type;

eval CREATE TABLE t3 (a INT) ENGINE=$engine_type;

# requiring 'unique' for the timeout part of the test

eval CREATE TABLE t3 (a INT  UNIQUE) ENGINE=$engine_type;

eval CREATE TABLE t4 (a INT) ENGINE=$engine_type;

show variables like 'slave_transaction_retries';

sync_slave_with_master;
@@ -58,7 +59,7 @@ enable_query_log; 
select * from t1 for update;

start slave;

--real_sleep 3 # hope that slave is blocked now

insert into t2 values(22); # provoke deadlock, slave should be victim

insert into t2 values(201); # provoke deadlock, slave should be victim

commit;

sync_with_master;

select * from t1; # check that slave succeeded finally
@@ -73,11 +74,13 @@ show slave status; 
# 2) Test lock wait timeout



stop slave;

change master to master_log_pos=536; # the BEGIN log event

delete from t3;

change master to master_log_pos=544; # the BEGIN log event

begin;

select * from t2 for update; # hold lock

start slave;

--real_sleep 10 # slave should have blocked, and be retrying

select count(*) from t3  /* must be zero */; # replaying begins after rollback

commit;

sync_with_master;

select * from t1; # check that slave succeeded finally
@@ -96,11 +99,13 @@ set global max_relay_log_size=0; 


# This is really copy-paste of 2) of above

stop slave;

change master to master_log_pos=536;

delete from t3;

change master to master_log_pos=544;

begin;

select * from t2 for update;

start slave;

--real_sleep 10

select count(*) from t3  /* must be zero */; # replaying begins after rollback

commit;

sync_with_master;

select * from t1;
@@ -115,4 +120,4 @@ connection master; 
drop table t1,t2,t3,t4;

sync_slave_with_master;



# End of 4.1 tests
 
--echo End of 5.1 tests