Merge bk-internal:/home/bk/mysql-5.1-new (10a0474e) · Commits · Software / OSDI20 Artifacts / mariadb

config/ac-macros/plugins.m4

+4 −1

Original line number	Diff line number	Diff line
		@@ -750,7 +750,10 @@ dnl ---------------------------------------------------------------------------
		AC_DEFUN([_MYSQL_INCLUDE_LIST],[
		ifelse([$1], [], [], [
		m4_define([__mysql_include__],[$1])
		sinclude($1)
		dnl We have to use builtin(), because sinclude would generate an error
		dnl "file $1 does not exists" in aclocal-1.8 - which is a bug, clearly
		dnl violating m4 specs, and which is fixed in aclocal-1.9
		builtin([include],$1)
		m4_undefine([__mysql_include__])
		_MYSQL_INCLUDE_LIST(m4_shift($@))
		])

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
		AC_CANONICAL_SYSTEM
		# The Docs Makefile.am parses this line!
		# remember to also change ndb version below and update version.c in ndb
		AM_INIT_AUTOMAKE(mysql, 5.1.10-beta)
		AM_INIT_AUTOMAKE(mysql, 5.1.11-beta)
		AM_CONFIG_HEADER(config.h)

		PROTOCOL_VERSION=10

+1 −1

Original line number	Diff line number	Diff line
		@@ -340,7 +340,7 @@ enum ha_base_keytype {
		#define HA_ERR_WRONG_COMMAND 131 /* Command not supported */
		#define HA_ERR_OLD_FILE 132 /* old databasfile */
		#define HA_ERR_NO_ACTIVE_RECORD 133 /* No record read in update() */
		#define HA_ERR_RECORD_DELETED 134 /* Intern error-code */
		#define HA_ERR_RECORD_DELETED 134 /* A record is not there */
		#define HA_ERR_RECORD_FILE_FULL 135 /* No more room in file */
		#define HA_ERR_INDEX_FILE_FULL 136 /* No more room in file */
		#define HA_ERR_END_OF_FILE 137 /* end in next/prev/first/last */

+85 −76

Original line number	Diff line number	Diff line
		@@ -4306,7 +4306,8 @@ TRP_ROR_INTERSECT get_best_covering_ror_intersect(PARAM param,
		DBUG_EXECUTE("info", print_ror_scans_arr(param->table,
		"building covering ROR-I",
		ror_scan_mark, ror_scans_end););
		do {
		do
		{
		/*
		Update changed sorting info:
		#covered fields,
		@@ -7387,11 +7388,14 @@ int QUICK_ROR_INTERSECT_SELECT::get_next()
		uint last_rowid_count=0;
		DBUG_ENTER("QUICK_ROR_INTERSECT_SELECT::get_next");

		do
		{
		/* Get a rowid for first quick and save it as a 'candidate' */
		quick= quick_it++;
		if (cpk_quick)
		{
		do {
		do
		{
		error= quick->get_next();
		}while (!error && !cpk_quick->row_in_ranges());
		}
		@@ -7413,7 +7417,8 @@ int QUICK_ROR_INTERSECT_SELECT::get_next()
		quick= quick_it++;
		}

		do {
		do
		{
		if ((error= quick->get_next()))
		DBUG_RETURN(error);
		quick->file->position(quick->record);
		@@ -7445,6 +7450,7 @@ int QUICK_ROR_INTERSECT_SELECT::get_next()
		/* We get here iff we got the same row ref in all scans. */
		if (need_to_fetch_row)
		error= head->file->rnd_pos(head->record[0], last_rowid);
		} while (error == HA_ERR_RECORD_DELETED);
		DBUG_RETURN(error);
		}

		@@ -7471,6 +7477,8 @@ int QUICK_ROR_UNION_SELECT::get_next()
		byte *tmp;
		DBUG_ENTER("QUICK_ROR_UNION_SELECT::get_next");

		do
		{
		do
		{
		if (!queue.elements)
		@@ -7508,6 +7516,7 @@ int QUICK_ROR_UNION_SELECT::get_next()
		prev_rowid= tmp;

		error= head->file->rnd_pos(quick->record, prev_rowid);
		} while (error == HA_ERR_RECORD_DELETED);
		DBUG_RETURN(error);
		}

+2 −0