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

Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge

Browse Source 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge


BitKeeper/triggers/post-commit:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/slave.cc:
  Manual merge
This commit is contained in:
unknown
2006-11-13 17:59:51 +01:00
parent 173d093a2b 1613ad2c98
commit 739a761399
8 changed files with 109 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_repl.cc
View File

@@ -431,6 +431,12 @@ impossible position";
goto err;
}
packet->set("\0", 1, &my_charset_bin);
/*
Adding MAX_LOG_EVENT_HEADER_LEN, since a binlog event can become
this larger than the corresponding packet (query) sent
from client to master.
*/
thd->variables.max_allowed_packet+= MAX_LOG_EVENT_HEADER;
/*
We can set log_lock now, it does not move (it's a member of