Commit c34940a0 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


include/my_sys.h:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
parents ef0ee764 3f3ffdcc

client/mysqlbinlog.cc

+29 −6
Original line number Diff line number Diff line
@@ -476,6 +476,30 @@ static bool check_database(const char *log_dbname) 
}







static int

write_event_header_and_base64(Log_event *ev, FILE *result_file,

                              PRINT_EVENT_INFO *print_event_info)

{

  DBUG_ENTER("write_event_header_and_base64");

  /* Write header and base64 output to cache */

  IO_CACHE result_cache;

  if (init_io_cache(&result_cache, -1, 0, WRITE_CACHE, 0L, FALSE,

                    MYF(MY_WME | MY_NABP)))

  {

    return 1;

  }



  ev->print_header(&result_cache, print_event_info, FALSE);

  ev->print_base64(&result_cache, print_event_info, FALSE);



  /* Read data from cache and write to result file */

  my_b_copy_to_file(&result_cache, result_file);

  end_io_cache(&result_cache);

  DBUG_RETURN(0);

}





/*

  Process an event
@@ -538,18 +562,18 @@ int process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev, 


    print_event_info->base64_output= opt_base64_output;



    DBUG_PRINT("debug", ("event_type: %s", ev->get_type_str()));



    switch (ev_type) {

    case QUERY_EVENT:

      if (check_database(((Query_log_event*)ev)->db))

        goto end;

      if (opt_base64_output)

      {

        ev->print_header(result_file, print_event_info);

        ev->print_base64(result_file, print_event_info);

      }

        write_event_header_and_base64(ev, result_file, print_event_info);

      else

        ev->print(result_file, print_event_info);

      break;



    case CREATE_FILE_EVENT:

    {

      Create_file_log_event* ce= (Create_file_log_event*)ev;
@@ -570,8 +594,7 @@ int process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev, 
      */

      if (opt_base64_output)

      {

        ce->print_header(result_file, print_event_info);

        ce->print_base64(result_file, print_event_info);

        write_event_header_and_base64(ce, result_file, print_event_info);

      }

      else

        ce->print(result_file, print_event_info, TRUE);

include/base64.h

+2 −1
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ int base64_encode(const void *src, size_t src_len, char *dst); 
/*

  Decode a base64 string into data

*/

int base64_decode(const char *src, size_t src_len, void *dst);

int base64_decode(const char *src, size_t src_len,

                  void *dst, const char **end_ptr);





#ifdef __cplusplus

include/my_sys.h

+1 −0
Original line number Diff line number Diff line
@@ -517,6 +517,7 @@ typedef int (*qsort2_cmp)(const void *, const void *, const void *); 
			 (uint) (*(info)->current_pos - (info)->request_pos))



/* tell write offset in the SEQ_APPEND cache */

int      my_b_copy_to_file(IO_CACHE *cache, FILE *file);

my_off_t my_b_append_tell(IO_CACHE* info);

my_off_t my_b_safe_tell(IO_CACHE* info); /* picks the correct tell() */

mysql-test/r/binlog_row_mix_innodb_myisam.result

+0 −18
Original line number Diff line number Diff line
@@ -359,15 +359,6 @@ show binlog events from 102; 
Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	use `test`; BEGIN

master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE `t2` (

  `a` int(11) NOT NULL DEFAULT '0',

  `b` int(11) DEFAULT NULL,

  PRIMARY KEY (`a`)

) ENGINE=InnoDB

master-bin.000001	#	Table_map	1	#	table_id: # (test.t2)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Xid	1	#	COMMIT /* xid= */

master-bin.000001	#	Query	1	#	use `test`; DROP TABLE if exists t2

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
@@ -375,15 +366,6 @@ master-bin.000001 # Query 1 # use `test`; DROP TABLE IF EXISTS t2 
master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE t2 (a int, b int, primary key (a)) engine=innodb

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	use `test`; BEGIN

master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE `t2` (

  `a` int(11) NOT NULL DEFAULT '0',

  `b` int(11) DEFAULT NULL,

  PRIMARY KEY (`a`)

) ENGINE=InnoDB

master-bin.000001	#	Table_map	1	#	table_id: # (test.t2)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Xid	1	#	COMMIT /* xid= */

master-bin.000001	#	Query	1	#	use `test`; TRUNCATE table t2

master-bin.000001	#	Xid	1	#	COMMIT /* xid= */

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

mysql-test/t/view.test

+10 −10
Original line number Diff line number Diff line
@@ -347,13 +347,13 @@ create view v3 (x,y,z) as select b, a, b from t1; 
create view v4 (x,y,z) as select c+1, b, a from t1;

create algorithm=temptable view v5 (x,y,z) as select c, b, a from t1;

# try insert to VIEW with fields duplicate

-- error 1573

-- error ER_NON_INSERTABLE_TABLE

insert into v3 values (-60,4,30);

# try insert to VIEW with expression in SELECT list

-- error 1573

-- error ER_NON_INSERTABLE_TABLE

insert into v4 values (-60,4,30);

# try insert to VIEW using temporary table algorithm

-- error 1573

-- error ER_NON_INSERTABLE_TABLE

insert into v5 values (-60,4,30);

insert into v1 values (-60,4,30);

insert into v1 (z,y,x) values (50,6,-100);
@@ -375,13 +375,13 @@ create view v3 (x,y,z) as select b, a, b from t1; 
create view v4 (x,y,z) as select c+1, b, a from t1;

create algorithm=temptable view v5 (x,y,z) as select c, b, a from t1;

# try insert to VIEW with fields duplicate

-- error 1573

-- error ER_NON_INSERTABLE_TABLE

insert into v3 select c, b, a from t2;

# try insert to VIEW with expression in SELECT list

-- error 1573

-- error ER_NON_INSERTABLE_TABLE

insert into v4 select c, b, a from t2;

# try insert to VIEW using temporary table algorithm

-- error 1573

-- error ER_NON_INSERTABLE_TABLE

insert into v5 select c, b, a from t2;

insert into v1 select c, b, a from t2;

insert into v1 (z,y,x) select a+20,b+2,-100 from t2;
@@ -1249,14 +1249,14 @@ drop table t1; 
#

create table t1 (s1 smallint);

create view v1 as select * from t1 where 20 < (select (s1) from t1);

-- error 1573

-- error ER_NON_INSERTABLE_TABLE

insert into v1 values (30);

create view v2 as select * from t1;

create view v3 as select * from t1 where 20 < (select (s1) from v2);

-- error 1573

-- error ER_NON_INSERTABLE_TABLE

insert into v3 values (30);

create view v4 as select * from v2 where 20 < (select (s1) from t1);

-- error 1573

-- error ER_NON_INSERTABLE_TABLE

insert into v4 values (30);

drop view v4, v3, v2, v1;

drop table t1;
@@ -2861,7 +2861,7 @@ DROP TABLE t1; 
#

create table t1 (s1 int);

create view v1 as select s1 as a, s1 as b from t1;

--error 1573

--error ER_NON_INSERTABLE_TABLE

insert into v1 values (1,1); 

update v1 set a = 5;

drop view v1;