Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql (c48abfe6) · Commits · Software / OSDI20 Artifacts / mariadb

Docs/manual.texi

+2 −2

Original line number	Diff line number	Diff line
		@@ -46898,8 +46898,8 @@ Added internal safety checks for InnoDB.
		Some InnoDB variables was always shown in @code{SHOW VARIABLES} as
		@code{OFF} on high-byte-first systems (like sparc).
		@item
		Fixed problem with one threads using an InnoDB table and another
		thread using an @code{ALTER TABLE} on the table.
		Fixed problem with one thread using an InnoDB table and another
		thread doing an @code{ALTER TABLE} on the same table.
		@item
		If inserts to several tables containing an auto-inc column are wrapped
		inside one @code{LOCK TABLES}, InnoDB asserted in @code{lock0lock.c}.

myisam/myisampack.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -283,7 +283,7 @@ static void usage(void)
		-?, --help Display this help and exit.\n\
		-V, --version Output version information and exit.");
		print_defaults("my",load_default_groups);
		};
		}

		/* reads options */
		/* Initiates DEBUG - but no debugging here ! */

sql/handler.cc

+23 −20

Original line number	Diff line number	Diff line
		@@ -257,28 +257,31 @@ int ha_autocommit_or_rollback(THD *thd, int error)
		DBUG_RETURN(error);
		}

		/* This function is called when MySQL writes the log segment of a transaction
		to the binlog. It is called when the LOCK_log mutex is reserved. Here we
		communicate to transactional table handlers whta binlog position corresponds
		to the current transaction. The handler can store it and in recovery print
		to the user, so that the user knows from what position in the binlog to
		start possible roll-forward, for example, if the crashed server was a slave
		in replication. This function also calls the commit of the table handler,
		because the order of trasnactions in the log of the table handler must be
		the same as in the binlog. */

		int ha_report_binlog_offset_and_commit(
		THD thd, / in: user thread */
		char log_file_name, / in: latest binlog file name */
		my_off_t end_offset) /* in: the offset in the binlog file
		up to which we wrote */
		/*
		This function is called when MySQL writes the log segment of a
		transaction to the binlog. It is called when the LOCK_log mutex is
		reserved. Here we communicate to transactional table handlers whta
		binlog position corresponds to the current transaction. The handler
		can store it and in recovery print to the user, so that the user
		knows from what position in the binlog to start possible
		roll-forward, for example, if the crashed server was a slave in
		replication. This function also calls the commit of the table
		handler, because the order of trasnactions in the log of the table
		handler must be the same as in the binlog.

		arguments:
		log_file_name: latest binlog file name
		end_offset: the offset in the binlog file up to which we wrote
		*/

		int ha_report_binlog_offset_and_commit(THD *thd,
		char *log_file_name,
		my_off_t end_offset)
		{
		THD_TRANS *trans;
		int error= 0;

		trans = &thd->transaction.all;

		#ifdef HAVE_INNOBASE_DB
		THD_TRANS *trans;
		trans = &thd->transaction.all;
		if (trans->innobase_tid)
		{
		if ((error=innobase_report_binlog_offset_and_commit(thd,
		@@ -292,10 +295,10 @@ int ha_report_binlog_offset_and_commit(
		trans->innodb_active_trans=0;
		}
		#endif

		return error;
		}


		int ha_commit_trans(THD thd, THD_TRANS trans)
		{
		int error=0;

sql/slave.cc

+0 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,6 @@ static byte* get_table_key(TABLE_RULE_ENT* e, uint* len,
		void init_slave_skip_errors(char* arg)
		{
		char* p;
		my_bool last_was_digit = 0;
		if (bitmap_init(&slave_error_mask,MAX_SLAVE_ERROR,0))
		{
		fprintf(stderr, "Badly out of memory, please check your system status\n");