database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Ensure that BEGIN / COMMIT is handled properly if slave dies

Browse Source 
Added syntax support for
CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;


Docs/internals.texi:
  Update binary protocol description
innobase/include/db0err.h:
  Merge from 3.23
mysql-test/r/insert.result:
  Updated test result from 3.23
sql/log.cc:
  Fixed bug in replication and log rotation
sql/log_event.cc:
  Ensure that BEGIN / COMMIT is handled properly if slave dies
sql/slave.cc:
  Fixed bug in replication and log rotation
sql/slave.h:
  Ensure that BEGIN / COMMIT is handled properly if slave dies
sql/sql_analyse.cc:
  Moved usage of res before res is destroyed (by bzero(&s...))
sql/sql_yacc.yy:
  Added syntax support for
  
  CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;
  
  To be able to read MySQL 4.1 dump files.
This commit is contained in:
unknown
2002-12-11 15:46:39 +02:00
parent 3c9b877b19
commit 934f5cc466
9 changed files with 93 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/log.cc
View File

@ -654,7 +654,12 @@ int MYSQL_LOG::purge_first_log(struct st_relay_log_info* rli)
rli->linfo.log_file_name);
goto err;
}
/*
Reset position to current log. This involves setting both of the
position variables:
*/
rli->relay_log_pos = BIN_LOG_HEADER_SIZE;
rli->pending = 0;
strmake(rli->relay_log_name,rli->linfo.log_file_name,
sizeof(rli->relay_log_name)-1);