Commit a2a9f074 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 

into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
parents 2eb3dd20 3cdd6837

BitKeeper/etc/collapsed

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

45214a07hVsIGwvwa-WrO-jpeaSwVw

452a92d0-31-8wSzSfZi165fcGcXPA

452c6c6dAjuNghfc1ObZ_UQ5SCl85g

4538a7b0EbDHHkWPbIwxO6ZIDdg6Dg

454a7ef8gdvE_ddMlJyghvOAkKPNOQ

454f8960jsVT_kMKJtZ9OCgXoba0xQ

BitKeeper/triggers/post-commit

+11 −3
Original line number Diff line number Diff line
@@ -35,9 +35,17 @@ fi 


CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet`

CSETKEY=`bk -R prs -r+ -h -d':KEY:' ChangeSet`

BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/\1/p'`

WL=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Ww][Ll] *# *\([0-9][0-9]*\).*$/ WL#\1/p'`



#

# composing subject lines of commit mails.

# if a fix targets to a WL and there is a bug referred

# then X-Bug mail header will contain the first found bug's number

#

BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | \

     sed -ne 's/[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/BUG#\1/

              s/.*BUG#\([0-9][0-9]*\)/\1/p'`

WL=`bk -R prs -r+ -h -d':C:' ChangeSet | \

     sed -ne 's/[Ww][Ll] *# *\([0-9][0-9]*\).*$/WL#\1/

              s/.*\(WL#[0-9][0-9]*\)/ \1/p'`

if [ "$BUG" = "" ]

then

  TO=dev-public@mysql.com

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