Merge bk-internal.mysql.com:/home/bk/mysql-5.0 (fe760a60) · Commits · Software / OSDI20 Artifacts / mariadb

cmd-line-utils/libedit/Makefile.am

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ pkginclude_HEADERS = readline/readline.h

		noinst_HEADERS = chared.h el.h el_term.h histedit.h key.h parse.h refresh.h sig.h \
		sys.h tokenizer.h config.h hist.h map.h prompt.h read.h \
		search.h tty.h libedit_term.h
		search.h tty.h libedit_term.h vis.h

		EXTRA_DIST = makelist.sh np/unvis.c np/strlcpy.c np/vis.c np/vis.h np/strlcat.c np/fgetln.c

+2 −0

Original line number	Diff line number	Diff line
		-- source include/have_innodb.inc

		#
		# Problem with range optimizer
		#

+1 −4

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@ in_rpm=0
		windows=0
		defaults=""
		user=""
		tmp_file=/tmp/mysql_install_db.$$

		case "$1" in
		--no-defaults\|--defaults-file=\|--defaults-extra-file=)
		@@ -223,10 +222,8 @@ then
		then
		echo "Fill help tables"
		fi
		echo "use mysql;" > $tmp_file
		cat $tmp_file $fill_help_tables \| eval "$mysqld_install_cmd_line"
		(echo "use mysql;"; cat $fill_help_tables) \| eval "$mysqld_install_cmd_line"
		res=$?
		rm $tmp_file
		if test $res != 0
		then
		echo ""

+31 −15

Original line number	Diff line number	Diff line
		@@ -2533,6 +2533,28 @@ longlong Item_func_bit_count::val_int()

		#ifdef HAVE_DLOPEN

		void udf_handler::cleanup()
		{
		if (!not_original)
		{
		if (initialized)
		{
		if (u_d->func_deinit != NULL)
		{
		void (deinit)(UDF_INIT ) = (void ()(UDF_INIT))
		u_d->func_deinit;
		(*deinit)(&initid);
		}
		free_udf(u_d);
		initialized= FALSE;
		}
		if (buffers) // Because of bug in ecc
		delete [] buffers;
		buffers= 0;
		}
		}


		bool
		udf_handler::fix_fields(THD thd, TABLE_LIST tables, Item_result_field *func,
		uint arg_count, Item **arguments)
		@@ -2805,6 +2827,13 @@ my_decimal udf_handler::val_decimal(my_bool null_value, my_decimal *dec_buf)
		}


		void Item_udf_func::cleanup()
		{
		udf.cleanup();
		Item_func::cleanup();
		}


		double Item_func_udf_float::val_real()
		{
		DBUG_ASSERT(fixed == 1);
		@@ -2930,21 +2959,8 @@ String Item_func_udf_str::val_str(String str)

		udf_handler::~udf_handler()
		{
		if (!not_original)
		{
		if (initialized)
		{
		if (u_d->func_deinit != NULL)
		{
		void (deinit)(UDF_INIT ) = (void ()(UDF_INIT))
		u_d->func_deinit;
		(*deinit)(&initid);
		}
		free_udf(u_d);
		}
		if (buffers) // Because of bug in ecc
		delete [] buffers;
		}
		/* Everything should be properly cleaned up by this moment. */
		DBUG_ASSERT(not_original \|\| !(initialized \|\| buffers));
		}

		#else

+1 −0

Original line number	Diff line number	Diff line
		@@ -879,6 +879,7 @@ class Item_udf_func :public Item_func
		fixed= 1;
		return res;
		}
		void cleanup();
		Item_result result_type () const { return udf.result_type(); }
		table_map not_null_tables() const { return 0; }
		};