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

client/mysqldump.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -2535,15 +2535,18 @@ static void dump_table(char table, char db)
		plus 2 bytes for '0x' prefix.
		- In non-HEX mode we need up to 2 bytes per character,
		plus 2 bytes for leading and trailing '\'' characters.
		Also we need to reserve 1 byte for terminating '\0'.
		*/
		dynstr_realloc_checked(&extended_row,length * 2+2);
		dynstr_realloc_checked(&extended_row,length * 2 + 2 + 1);
		if (opt_hex_blob && is_blob)
		{
		dynstr_append_checked(&extended_row, "0x");
		extended_row.length+= mysql_hex_string(extended_row.str +
		extended_row.length,
		row[i], length);
		extended_row.str[extended_row.length]= '\0';
		DBUG_ASSERT(extended_row.length+1 <= extended_row.max_length);
		/* mysql_hex_string() already terminated string by '\0' */
		DBUG_ASSERT(extended_row.str[extended_row.length] == '\0');
		}
		else
		{

include/thr_lock.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,11 @@ enum thr_lock_type { TL_IGNORE=-1,
		TL_WRITE_CONCURRENT_INSERT,
		/* Write used by INSERT DELAYED. Allows READ locks */
		TL_WRITE_DELAYED,
		/*
		parser only! Late bound low_priority flag.
		At open_tables() becomes thd->update_lock_default.
		*/
		TL_WRITE_DEFAULT,
		/* WRITE lock that has lower priority than TL_READ */
		TL_WRITE_LOW_PRIORITY,
		/* Normal WRITE lock */

mysql-test/mysql-test-run.pl

+11 −0

Original line number	Diff line number	Diff line
		@@ -1784,6 +1784,17 @@ sub environment_setup () {
		split(':', $ENV{'DYLD_LIBRARY_PATH'}) : ());
		mtr_debug("DYLD_LIBRARY_PATH: $ENV{'DYLD_LIBRARY_PATH'}");

		# The environment variable used for shared libs on AIX
		$ENV{'SHLIB_PATH'}= join(":", @ld_library_paths,
		$ENV{'SHLIB_PATH'} ?
		split(':', $ENV{'SHLIB_PATH'}) : ());
		mtr_debug("SHLIB_PATH: $ENV{'SHLIB_PATH'}");

		# The environment variable used for shared libs on hp-ux
		$ENV{'LIBPATH'}= join(":", @ld_library_paths,
		$ENV{'LIBPATH'} ?
		split(':', $ENV{'LIBPATH'}) : ());
		mtr_debug("LIBPATH: $ENV{'LIBPATH'}");

		# --------------------------------------------------------------------------
		# Also command lines in .opt files may contain env vars

mysql-test/r/alter_table.result

+19 −0

Original line number	Diff line number	Diff line
		@@ -884,3 +884,22 @@ id
		50
		51
		drop table t1;
		set @orig_sql_mode = @@sql_mode;
		set sql_mode="no_zero_date";
		create table t1(f1 int);
		alter table t1 add column f2 datetime not null, add column f21 date not null;
		insert into t1 values(1,'2000-01-01','2000-01-01');
		alter table t1 add column f3 datetime not null;
		ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'f3' at row 1
		alter table t1 add column f3 date not null;
		ERROR 22007: Incorrect date value: '0000-00-00' for column 'f3' at row 1
		alter table t1 add column f4 datetime not null default '2002-02-02',
		add column f41 date not null;
		ERROR 22007: Incorrect date value: '0000-00-00' for column 'f41' at row 1
		alter table t1 add column f4 datetime not null default '2002-02-02',
		add column f41 date not null default '2002-02-02';
		select * from t1;
		f1 f2 f21 f4 f41
		1 2000-01-01 00:00:00 2000-01-01 2002-02-02 00:00:00 2002-02-02
		drop table t1;
		set sql_mode= @orig_sql_mode;

mysql-test/r/analyse.result

+12 −12

Original line number	Diff line number	Diff line
		@@ -39,10 +39,10 @@ t2 CREATE TABLE `t2` (
		`Field_name` varbinary(255) NOT NULL default '',
		`Min_value` varbinary(255) default NULL,
		`Max_value` varbinary(255) default NULL,
		`Min_length` int(11) NOT NULL default '0',
		`Max_length` int(11) NOT NULL default '0',
		`Empties_or_zeros` int(11) NOT NULL default '0',
		`Nulls` int(11) NOT NULL default '0',
		`Min_length` bigint(11) NOT NULL default '0',
		`Max_length` bigint(11) NOT NULL default '0',
		`Empties_or_zeros` bigint(11) NOT NULL default '0',
		`Nulls` bigint(11) NOT NULL default '0',
		`Avg_value_or_avg_length` varbinary(255) NOT NULL default '',
		`Std` varbinary(255) default NULL,
		`Optimal_fieldtype` varbinary(64) NOT NULL default ''
		@@ -58,10 +58,10 @@ t2 CREATE TABLE `t2` (
		`Field_name` varbinary(255) NOT NULL default '',
		`Min_value` varbinary(255) default NULL,
		`Max_value` varbinary(255) default NULL,
		`Min_length` int(11) NOT NULL default '0',
		`Max_length` int(11) NOT NULL default '0',
		`Empties_or_zeros` int(11) NOT NULL default '0',
		`Nulls` int(11) NOT NULL default '0',
		`Min_length` bigint(11) NOT NULL default '0',
		`Max_length` bigint(11) NOT NULL default '0',
		`Empties_or_zeros` bigint(11) NOT NULL default '0',
		`Nulls` bigint(11) NOT NULL default '0',
		`Avg_value_or_avg_length` varbinary(255) NOT NULL default '',
		`Std` varbinary(255) default NULL,
		`Optimal_fieldtype` varbinary(64) NOT NULL default ''
		@@ -81,10 +81,10 @@ t2 CREATE TABLE `t2` (
		`Field_name` varbinary(255) NOT NULL default '',
		`Min_value` varbinary(255) default NULL,
		`Max_value` varbinary(255) default NULL,
		`Min_length` int(11) NOT NULL default '0',
		`Max_length` int(11) NOT NULL default '0',
		`Empties_or_zeros` int(11) NOT NULL default '0',
		`Nulls` int(11) NOT NULL default '0',
		`Min_length` bigint(11) NOT NULL default '0',
		`Max_length` bigint(11) NOT NULL default '0',
		`Empties_or_zeros` bigint(11) NOT NULL default '0',
		`Nulls` bigint(11) NOT NULL default '0',
		`Avg_value_or_avg_length` varbinary(255) NOT NULL default '',
		`Std` varbinary(255) default NULL,
		`Optimal_fieldtype` varbinary(64) NOT NULL default ''