merge (af01997d) · Commits · Software / OSDI20 Artifacts / mariadb

libmysqld/Makefile.am

+1 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
		spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \
		sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \
		parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
		rpl_filter.cc \
		ha_blackhole.cc ha_archive.cc sql_partition.cc ha_partition.cc

		libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) $(sqlexamplessources)

+6 −2

Original line number	Diff line number	Diff line
		@@ -69,6 +69,10 @@ static PARTITION_SHARE get_share(const char table_name, TABLE * table);

		static handlerton partition_hton = {
		"partition",
		SHOW_OPTION_YES,
		"", /* A comment used by SHOW to describe an engine */
		DB_TYPE_PARTITION_DB,
		0, /* Method that initizlizes a storage engine */
		0, /* slot */
		0, /* savepoint size */
		NULL /ndbcluster_close_connection/,
		@@ -1048,7 +1052,7 @@ THR_LOCK_DATA *ha_partition::store_lock(THD thd,
		}


		int ha_partition::start_stmt(THD *thd)
		int ha_partition::start_stmt(THD *thd, thr_lock_type lock_type)
		{
		int error= 0;
		handler **file;
		@@ -1056,7 +1060,7 @@ int ha_partition::start_stmt(THD *thd)
		file= m_file;
		do
		{
		if ((error= (*file)->start_stmt(thd)))
		if ((error= (*file)->start_stmt(thd, lock_type)))
		break;
		} while (*(++file));
		DBUG_RETURN(error);

+1 −1

Original line number	Diff line number	Diff line
		@@ -228,7 +228,7 @@ class ha_partition :public handler
		When table is locked a statement is started by calling start_stmt
		instead of external_lock
		*/
		virtual int start_stmt(THD * thd);
		virtual int start_stmt(THD * thd, thr_lock_type lock_type);
		/*
		Lock count is number of locked underlying handlers (I assume)
		*/

+0 −0

File moved.

+0 −0

File moved.