Commit 36c7cfd7 authored by unknown's avatar unknown
Browse files

Bug#20396 Bin Log does not get DELIMETER cmd - Recover StoredProc fails 

Problem: when loading mysqlbinlog dumps, CREATE PROCEDURE having semicolons
in their bodies failed.
Fix: Using safe delimiter "/*!*/;" to dump log entries.


client/mysqlbinlog.cc:
  - Adding PRINT_EVENT_INFO argument to dump_xxx_log_entries()
  - Setting delimiter to "/*!*/;" before calling dump functions
mysql-test/r/ctype_ucs_binlog.result:
  Fixing test results
mysql-test/r/mix_innodb_myisam_binlog.result:
  Fixing test results
mysql-test/r/mysqlbinlog.result:
  Fixing test results
  Adding test case
mysql-test/r/mysqlbinlog2.result:
  Fixing test results
mysql-test/r/rpl_charset.result:
  Fixing test results
mysql-test/r/rpl_timezone.result:
  Fixing test results
mysql-test/r/user_var-binlog.result:
  Fixing test results
mysql-test/t/mix_innodb_myisam_binlog.test:
  Fixing LIKE expression
mysql-test/t/mysqlbinlog.test:
  Adding test case
sql/log_event.cc:
  Using print_event_info->delimiter instead of
  hard-coded semicolon as a query end marker.
sql/log_event.h:
  Adding new member to store delimiter.
parent d553728b

client/mysqlbinlog.cc

+27 −11
Original line number Diff line number Diff line
@@ -94,8 +94,10 @@ static bool stop_passed= 0; 
*/

Format_description_log_event* description_event; 



static int dump_local_log_entries(const char* logname);

static int dump_remote_log_entries(const char* logname);

static int dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,

                                  const char* logname);

static int dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,

                                   const char* logname);

static int dump_log_entries(const char* logname);

static int dump_remote_file(NET* net, const char* fname);

static void die(const char* fmt, ...);
@@ -950,8 +952,22 @@ static MYSQL* safe_connect() 


static int dump_log_entries(const char* logname)

{

  return (remote_opt ? dump_remote_log_entries(logname) :

          dump_local_log_entries(logname));

  int rc;

  PRINT_EVENT_INFO print_event_info;

  /*

     Set safe delimiter, to dump things

     like CREATE PROCEDURE safely

  */

  fprintf(result_file, "DELIMITER /*!*/;\n");

  strcpy(print_event_info.delimiter, "/*!*/;");



  rc= (remote_opt ? dump_remote_log_entries(&print_event_info, logname) :

       dump_local_log_entries(&print_event_info, logname));



  /* Set delimiter back to semicolon */

  fprintf(result_file, "DELIMITER ;\n");

  strcpy(print_event_info.delimiter, ";");

  return rc;

}
@@ -1016,11 +1032,11 @@ static int check_master_version(MYSQL* mysql, 
}





static int dump_remote_log_entries(const char* logname)

static int dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,

                                   const char* logname)



{

  char buf[128];

  PRINT_EVENT_INFO print_event_info;

  ulong len;

  uint logname_len;

  NET* net;
@@ -1143,7 +1159,7 @@ could be out of memory"); 
          len= 1; // fake Rotate, so don't increment old_off

        }

      }

      if ((error= process_event(&print_event_info, ev, old_off)))

      if ((error= process_event(print_event_info, ev, old_off)))

      {

	error= ((error < 0) ? 0 : 1);

        goto err;
@@ -1162,7 +1178,7 @@ could be out of memory"); 
        goto err;

      }

      

      if ((error= process_event(&print_event_info, ev, old_off)))

      if ((error= process_event(print_event_info, ev, old_off)))

      {

 	my_close(file,MYF(MY_WME));

	error= ((error < 0) ? 0 : 1);
@@ -1288,11 +1304,11 @@ at offset %lu ; this could be a log format error or read error", 
}





static int dump_local_log_entries(const char* logname)

static int dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,

                                  const char* logname)

{

  File fd = -1;

  IO_CACHE cache,*file= &cache;

  PRINT_EVENT_INFO print_event_info;

  byte tmp_buff[BIN_LOG_HEADER_SIZE];

  int error= 0;
@@ -1364,7 +1380,7 @@ static int dump_local_log_entries(const char* logname) 
      // file->error == 0 means EOF, that's OK, we break in this case

      break;

    }

    if ((error= process_event(&print_event_info, ev, old_off)))

    if ((error= process_event(print_event_info, ev, old_off)))

    {

      if (error < 0)

        error= 0;

mysql-test/r/ctype_ucs_binlog.result

+11 −9
Original line number Diff line number Diff line
@@ -9,15 +9,17 @@ master-bin.000001 98 User var 1 138 @`v`=_ucs2 0x006100620063 COLLATE ucs2_gener 
master-bin.000001	138	Query	1	227	use `test`; insert into t2 values (@v)

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

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

ROLLBACK;

SET @`v`:=_ucs2 0x006100620063 COLLATE `ucs2_general_ci`;

use test;

SET TIMESTAMP=10000;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;

SET @@session.sql_mode=0;

/*!\C latin1 */;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t2 values (@v);

DELIMITER /*!*/;

ROLLBACK/*!*/;

SET @`v`:=_ucs2 0x006100620063 COLLATE `ucs2_general_ci`/*!*/;

use test/*!*/;

SET TIMESTAMP=10000/*!*/;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/;

SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

insert into t2 values (@v)/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

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

mysql-test/r/mix_innodb_myisam_binlog.result

+2 −2
Original line number Diff line number Diff line
@@ -275,8 +275,8 @@ is not null; 
is not null

1

select

@a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%",

@a like "%#%error_code=0%ROLLBACK/*!*/;%ROLLBACK /* added by mysqlbinlog */;%",

@a not like "%#%error_code=%error_code=%";

@a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%"	@a not like "%#%error_code=%error_code=%"

@a like "%#%error_code=0%ROLLBACK/*!*/;%ROLLBACK /* added by mysqlbinlog */;%"	@a not like "%#%error_code=%error_code=%"

1	1

drop table t1, t2;

mysql-test/r/mysqlbinlog.result

+148 −93
Original line number Diff line number Diff line
@@ -15,31 +15,33 @@ flush logs; 
--- Local --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

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

ROLLBACK;

use test;

SET TIMESTAMP=1000000000;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;

SET @@session.sql_mode=0;

/*!\C latin1 */;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

drop table if exists t1,t2;

SET TIMESTAMP=1000000000;

create table t1 (word varchar(20));

SET TIMESTAMP=1000000000;

create table t2 (id int auto_increment not null primary key);

SET TIMESTAMP=1000000000;

insert into t1 values ("abirvalg");

SET INSERT_ID=1;

SET TIMESTAMP=1000000000;

insert into t2 values ();

SET TIMESTAMP=1000000000;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-1-0' INTO table t1;

SET TIMESTAMP=1000000000;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-2-0' INTO table t1;

SET TIMESTAMP=1000000000;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-3-0' INTO table t1;

SET TIMESTAMP=1000000000;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-4-0' INTO table t1;

DELIMITER /*!*/;

ROLLBACK/*!*/;

use test/*!*/;

SET TIMESTAMP=1000000000/*!*/;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/;

SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

drop table if exists t1,t2/*!*/;

SET TIMESTAMP=1000000000/*!*/;

create table t1 (word varchar(20))/*!*/;

SET TIMESTAMP=1000000000/*!*/;

create table t2 (id int auto_increment not null primary key)/*!*/;

SET TIMESTAMP=1000000000/*!*/;

insert into t1 values ("abirvalg")/*!*/;

SET INSERT_ID=1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

insert into t2 values ()/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-1-0' INTO table t1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-2-0' INTO table t1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-3-0' INTO table t1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-4-0' INTO table t1/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
@@ -47,13 +49,15 @@ ROLLBACK /* added by mysqlbinlog */; 
--- Broken LOAD DATA --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

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

use test;

SET TIMESTAMP=1000000000;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;

SET @@session.sql_mode=0;

/*!\C latin1 */;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values ("Alas");

DELIMITER /*!*/;

use test/*!*/;

SET TIMESTAMP=1000000000/*!*/;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/;

SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

insert into t1 values ("Alas")/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
@@ -61,8 +65,10 @@ ROLLBACK /* added by mysqlbinlog */; 
--- --database --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

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

ROLLBACK;

SET INSERT_ID=1;

DELIMITER /*!*/;

ROLLBACK/*!*/;

SET INSERT_ID=1/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
@@ -70,13 +76,15 @@ ROLLBACK /* added by mysqlbinlog */; 
--- --position --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

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

use test;

SET TIMESTAMP=1000000000;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;

SET @@session.sql_mode=0;

/*!\C latin1 */;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values ("Alas");

DELIMITER /*!*/;

use test/*!*/;

SET TIMESTAMP=1000000000/*!*/;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/;

SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

insert into t1 values ("Alas")/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
@@ -84,31 +92,33 @@ ROLLBACK /* added by mysqlbinlog */; 
--- Remote --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

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

ROLLBACK;

use test;

SET TIMESTAMP=1000000000;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;

SET @@session.sql_mode=0;

/*!\C latin1 */;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

drop table if exists t1,t2;

SET TIMESTAMP=1000000000;

create table t1 (word varchar(20));

SET TIMESTAMP=1000000000;

create table t2 (id int auto_increment not null primary key);

SET TIMESTAMP=1000000000;

insert into t1 values ("abirvalg");

SET INSERT_ID=1;

SET TIMESTAMP=1000000000;

insert into t2 values ();

SET TIMESTAMP=1000000000;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-1-2' INTO table t1;

SET TIMESTAMP=1000000000;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-2-2' INTO table t1;

SET TIMESTAMP=1000000000;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-3-2' INTO table t1;

SET TIMESTAMP=1000000000;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-4-2' INTO table t1;

DELIMITER /*!*/;

ROLLBACK/*!*/;

use test/*!*/;

SET TIMESTAMP=1000000000/*!*/;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/;

SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

drop table if exists t1,t2/*!*/;

SET TIMESTAMP=1000000000/*!*/;

create table t1 (word varchar(20))/*!*/;

SET TIMESTAMP=1000000000/*!*/;

create table t2 (id int auto_increment not null primary key)/*!*/;

SET TIMESTAMP=1000000000/*!*/;

insert into t1 values ("abirvalg")/*!*/;

SET INSERT_ID=1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

insert into t2 values ()/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-1-2' INTO table t1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-2-2' INTO table t1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-3-2' INTO table t1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-4-2' INTO table t1/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
@@ -116,13 +126,15 @@ ROLLBACK /* added by mysqlbinlog */; 
--- Broken LOAD DATA --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

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

use test;

SET TIMESTAMP=1000000000;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;

SET @@session.sql_mode=0;

/*!\C latin1 */;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values ("Alas");

DELIMITER /*!*/;

use test/*!*/;

SET TIMESTAMP=1000000000/*!*/;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/;

SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

insert into t1 values ("Alas")/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
@@ -130,8 +142,10 @@ ROLLBACK /* added by mysqlbinlog */; 
--- --database --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

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

ROLLBACK;

SET INSERT_ID=1;

DELIMITER /*!*/;

ROLLBACK/*!*/;

SET INSERT_ID=1/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
@@ -139,13 +153,15 @@ ROLLBACK /* added by mysqlbinlog */; 
--- --position --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

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

use test;

SET TIMESTAMP=1000000000;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;

SET @@session.sql_mode=0;

/*!\C latin1 */;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values ("Alas");

DELIMITER /*!*/;

use test/*!*/;

SET TIMESTAMP=1000000000/*!*/;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/;

SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

insert into t1 values ("Alas")/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
@@ -153,22 +169,26 @@ ROLLBACK /* added by mysqlbinlog */; 
--- reading stdin --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

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

ROLLBACK;

use test;

SET TIMESTAMP=1108844556;

BEGIN;

SET TIMESTAMP=1108844555;

insert t1 values (1);

DELIMITER /*!*/;

ROLLBACK/*!*/;

use test/*!*/;

SET TIMESTAMP=1108844556/*!*/;

BEGIN/*!*/;

SET TIMESTAMP=1108844555/*!*/;

insert t1 values (1)/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

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

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

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

use test;

SET TIMESTAMP=1108844556;

BEGIN;

SET TIMESTAMP=1108844555;

insert t1 values (1);

DELIMITER /*!*/;

use test/*!*/;

SET TIMESTAMP=1108844556/*!*/;

BEGIN/*!*/;

SET TIMESTAMP=1108844555/*!*/;

insert t1 values (1)/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
@@ -194,4 +214,39 @@ select * from t5 /* must be (1),(1) */; 
a

1

1

drop procedure if exists p1;

flush logs;

create procedure p1()

begin

select 1;

end;

//

flush logs;

call p1();

1

1

drop procedure p1;

call p1();

ERROR 42000: PROCEDURE test.p1 does not exist

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

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

DELIMITER /*!*/;

use test/*!*/;

SET TIMESTAMP=1000000000/*!*/;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/;

SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

CREATE DEFINER=`root`@`localhost` procedure p1()

begin

select 1;

end/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

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

call p1();

1

1

drop procedure p1;

drop table t1, t2, t03, t04, t3, t4, t5;

mysql-test/r/mysqlbinlog2.result

+578 −508

File changed.

Preview size limit exceeded, changes collapsed.