Merge ramayana.hindu.god:/home/tsmith/m/bk/50 (5a1284cc) · Commits · Software / OSDI20 Artifacts / mariadb

configure.in

+2 −2

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.0.50)
		AM_INIT_AUTOMAKE(mysql, 5.0.52)
		AM_CONFIG_HEADER([include/config.h:config.h.in])

		PROTOCOL_VERSION=10
		@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
		# ndb version
		NDB_VERSION_MAJOR=5
		NDB_VERSION_MINOR=0
		NDB_VERSION_BUILD=50
		NDB_VERSION_BUILD=52
		NDB_VERSION_STATUS=""

		# Set all version vars based on $VERSION. How do we do this more elegant ?

+1 −1

Original line number	Diff line number	Diff line
		@@ -4699,7 +4699,7 @@ int cli_read_binary_rows(MYSQL_STMT *stmt)
		if (!mysql)
		{
		set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate);
		return 1;
		DBUG_RETURN(1);
		}

		net = &mysql->net;

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,5 +3,5 @@
		#
		--require r/have_bug25714.require
		disable_query_log;
		eval select LENGTH("MYSQL_BUG25714") > 0 as "have_bug25714_exe";
		eval select LENGTH("$MYSQL_BUG25714") > 0 as "have_bug25714_exe";
		enable_query_log;

+22 −0

Original line number	Diff line number	Diff line
		@@ -110,3 +110,25 @@ Carsten 16.09.2005
		4. Fixed datadict_<engine>.result files after the change that added 2 columns to
		the VIEWS table (DEFINER varchar(77), SECURITY_TYPE varchar(7)).
		===================================================================
		Matthias 25.08.2007
		-------------------
		Fixes for Bugs 30418,30420,30438,30440
		1. Replace error numbers with error names
		2. Replace static "InnoDB" (not all time available) used within an
		"alter table" by $OTHER_ENGINE_TYPE (set to MEMORY or MyISAM).
		Minor adjustment of column data type.
		3. Use mysqltest result set sorting in several cases.
		4. Avoid any statistics about help tables, because their content
		depends on configuration:
		developer release - help tables are empty
		build release - help tables have content + growing with version
		5. Add two help table related tests (one for build, one for developer)
		to ensure that informations about help tables within
		INFORMATION_SCHEMA.TABLES/STATISTICS are checked.
		General note:
		Most INFORMATION_SCHEMA properties (table layout, permissions etc.)
		are not affected by our variation of the storage engines except
		that some properties of our tables using a specific storage
		engine become visible. So it makes sense to decompose
		this test into a storage engine specific part and a non
		storage engine specific part in future.

+242 −206

File changed.

Preview size limit exceeded, changes collapsed.