mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-09 08:34:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
storage/heap/hp_hash.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/include/dict0dict.h:
  Auto merged
storage/myisam/Makefile.am:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisammrg/myrg_open.c:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
This commit is contained in:
unknown 2005-05-02 13:18:26 +02:00
commit 5326bdc616
158 changed files with 5637 additions and 2067 deletions
Download patch file Download diff file Expand all files Collapse all files

24
sql/sql_repl.cc
View file

@ -386,6 +386,9 @@ impossible position";
goto err;
}
if (thd->variables.sync_replication)
ha_repl_report_sent_binlog(thd, log_file_name, pos);
/*
We need to start a packet with something other than 255
to distinguish it from error
@ -471,6 +474,10 @@ impossible position";
my_errno= ER_UNKNOWN_ERROR;
goto err;
}
if (thd->variables.sync_replication)
ha_repl_report_sent_binlog(thd, log_file_name, my_b_tell(&log));
/*
No need to save this event. We are only doing simple reads
(no real parsing of the events) so we don't need it. And so
@ -528,6 +535,10 @@ impossible position";
my_errno= ER_UNKNOWN_ERROR;
goto err;
}
if (thd->variables.sync_replication)
ha_repl_report_sent_binlog(thd, log_file_name, my_b_tell(&log));
DBUG_PRINT("info", ("log event code %d",
(*packet)[LOG_EVENT_OFFSET+1] ));
if ((*packet)[LOG_EVENT_OFFSET+1] == LOAD_EVENT)
@ -641,6 +652,9 @@ impossible position";
goto err;
}
if (thd->variables.sync_replication)
ha_repl_report_sent_binlog(thd, log_file_name, my_b_tell(&log));
if ((*packet)[LOG_EVENT_OFFSET+1] == LOAD_EVENT)
{
if (send_file(thd))
@ -705,12 +719,19 @@ impossible position";
my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG;
goto err;
}
if (thd->variables.sync_replication)
ha_repl_report_sent_binlog(thd, log_file_name, 0);
packet->length(0);
packet->append('\0');
}
}
end:
if (thd->variables.sync_replication)
ha_repl_report_replication_stop(thd);
end_io_cache(&log);
(void)my_close(file, MYF(MY_WME));
@ -722,6 +743,9 @@ end:
DBUG_VOID_RETURN;
err:
if (thd->variables.sync_replication)
ha_repl_report_replication_stop(thd);
thd->proc_info = "Waiting to finalize termination";
end_io_cache(&log);
/*