Merge maint1.mysql.com:/data/localhome/tsmith/bk/50 (f1e600a7) · 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.44)
		AM_INIT_AUTOMAKE(mysql, 5.0.46)
		AM_CONFIG_HEADER(config.h)

		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=44
		NDB_VERSION_BUILD=46
		NDB_VERSION_STATUS=""

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

mysql-test/t/greedy_optimizer.test

+2 −2

Original line number	Diff line number	Diff line
		@@ -145,11 +145,11 @@ select @@optimizer_prune_level;
		#
		# These are the values for the parameters that control the greedy optimizer
		# (total 6 combinations - 3 for optimizer_search_depth, 2 for optimizer_prune_level):
		--
		# 3:
		# set optimizer_search_depth=0; - automatic
		# set optimizer_search_depth=1; - min
		# set optimizer_search_depth=62; - max (default)
		--
		# 2:
		# set optimizer_prune_level=0 - exhaustive;
		# set optimizer_prune_level=1 - heuristic; # default

mysql-test/t/join.test

+4 −2

Original line number	Diff line number	Diff line
		@@ -512,10 +512,12 @@ select * from v1a join (t3 natural join t4) on a = y;
		#--------------------------------------------------------------------
		# Negative tests (tests for errors)
		#--------------------------------------------------------------------
		# works in Oracle - bug
		-- error 1052
		select * from t1 natural join (t3 cross join t4); -- works in Oracle - bug
		select * from t1 natural join (t3 cross join t4);
		# works in Oracle - bug
		-- error 1052
		select * from (t3 cross join t4) natural join t1; -- works in Oracle - bug
		select * from (t3 cross join t4) natural join t1;
		-- error 1052
		select * from t1 join (t2, t3) using (b);
		-- error 1052

mysql-test/t/ndb_index_ordered.test

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ update t1 set c = 13 where b <= 3;
		select * from t1 order by a;
		update t1 set b = b + 1 where b > 4 and b < 7;
		select * from t1 order by a;
		-- Update primary key
		# Update primary key
		update t1 set a = a + 10 where b > 1 and b < 7;
		select * from t1 order by a;

sql/field.cc

+14 −10

Original line number	Diff line number	Diff line
		@@ -4254,7 +4254,7 @@ Field_timestamp::Field_timestamp(char *ptr_arg, uint32 len_arg,
		const char *field_name_arg,
		struct st_table *table_arg,
		CHARSET_INFO *cs)
		:Field_str(ptr_arg, 19, null_ptr_arg, null_bit_arg,
		:Field_str(ptr_arg, MAX_DATETIME_WIDTH, null_ptr_arg, null_bit_arg,
		unireg_check_arg, field_name_arg, table_arg, cs)
		{
		/* For 4.0 MYD and 4.0 InnoDB compatibility */
		@@ -4272,7 +4272,8 @@ Field_timestamp::Field_timestamp(char *ptr_arg, uint32 len_arg,
		Field_timestamp::Field_timestamp(bool maybe_null_arg,
		const char *field_name_arg,
		struct st_table table_arg, CHARSET_INFO cs)
		:Field_str((char) 0, 19, maybe_null_arg ? (uchar) "": 0, 0,
		:Field_str((char*) 0, MAX_DATETIME_WIDTH,
		maybe_null_arg ? (uchar*) "": 0, 0,
		NONE, field_name_arg, table_arg, cs)
		{
		/* For 4.0 MYD and 4.0 InnoDB compatibility */
		@@ -4803,7 +4804,7 @@ String Field_time::val_str(String val_buffer,
		String *val_ptr __attribute__((unused)))
		{
		MYSQL_TIME ltime;
		val_buffer->alloc(19);
		val_buffer->alloc(MAX_DATE_STRING_REP_LENGTH);
		long tmp=(long) sint3korr(ptr);
		ltime.neg= 0;
		if (tmp < 0)
		@@ -5339,7 +5340,7 @@ int Field_newdate::store_time(MYSQL_TIME *ltime, timestamp_type time_type)
		(MODE_NO_ZERO_IN_DATE \| MODE_NO_ZERO_DATE \|
		MODE_INVALID_DATES))), &error))
		{
		char buff[12];
		char buff[MAX_DATE_STRING_REP_LENGTH];
		String str(buff, sizeof(buff), &my_charset_latin1);
		make_date((DATE_TIME_FORMAT *) 0, ltime, &str);
		set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED,
		@@ -5564,7 +5565,7 @@ int Field_datetime::store_time(MYSQL_TIME *ltime,timestamp_type time_type)
		(MODE_NO_ZERO_IN_DATE \| MODE_NO_ZERO_DATE \|
		MODE_INVALID_DATES))), &error))
		{
		char buff[19];
		char buff[MAX_DATE_STRING_REP_LENGTH];
		String str(buff, sizeof(buff), &my_charset_latin1);
		make_datetime((DATE_TIME_FORMAT *) 0, ltime, &str);
		set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED,
		@@ -5638,7 +5639,7 @@ String Field_datetime::val_str(String val_buffer,
		part1=(long) (tmp/LL(1000000));
		part2=(long) (tmp - (ulonglong) part1*LL(1000000));

		pos=(char*) val_buffer->ptr()+19;
		pos= (char*) val_buffer->ptr() + MAX_DATETIME_WIDTH;
		*pos--=0;
		*pos--= (char) ('0'+(char) (part2%10)); part2/=10;
		*pos--= (char) ('0'+(char) (part2%10)); part3= (int) (part2 / 10);
		@@ -8537,15 +8538,18 @@ bool create_field::init(THD thd, char fld_name, enum_field_types fld_type,
		break;
		case FIELD_TYPE_TIMESTAMP:
		if (!fld_length)
		length= 14; /* Full date YYYYMMDDHHMMSS */
		else if (length != 19)
		{
		/* Compressed date YYYYMMDDHHMMSS */
		length= MAX_DATETIME_COMPRESSED_WIDTH;
		}
		else if (length != MAX_DATETIME_WIDTH)
		{
		/*
		We support only even TIMESTAMP lengths less or equal than 14
		and 19 as length of 4.1 compatible representation.
		*/
		length= ((length+1)/2)2; / purecov: inspected */
		length= min(length,14); /* purecov: inspected */
		length= min(length, MAX_DATETIME_COMPRESSED_WIDTH); /* purecov: inspected */
		}
		flags\|= ZEROFILL_FLAG \| UNSIGNED_FLAG;
		if (fld_default_value)
		@@ -8598,7 +8602,7 @@ bool create_field::init(THD thd, char fld_name, enum_field_types fld_type,
		length= 10;
		break;
		case FIELD_TYPE_DATETIME:
		length= 19;
		length= MAX_DATETIME_WIDTH;
		break;
		case FIELD_TYPE_SET:
		{