Merge bk-internal:/home/bk/mysql-4.0/ (d6b91f6c) · Commits · Software / OSDI20 Artifacts / mariadb

BUILD/compile-pentium-debug-max

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings"
		cxx_warnings="$cxx_warnings $debug_extra_warnings"
		extra_configs="$pentium_configs $debug_configs"

		extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-embedded-server --with-openssl"
		extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-embedded-server --with-openssl --with-vio --with-raid"

		. "$path/FINISH.sh"

acinclude.m4

+0 −1

Original line number	Diff line number	Diff line
		@@ -1231,7 +1231,6 @@ dnl circular references.
		\$(top_builddir)/innobase/page/libpage.a\
		\$(top_builddir)/innobase/rem/librem.a\
		\$(top_builddir)/innobase/thr/libthr.a\
		\$(top_builddir)/innobase/com/libcom.a\
		\$(top_builddir)/innobase/sync/libsync.a\
		\$(top_builddir)/innobase/data/libdata.a\
		\$(top_builddir)/innobase/mach/libmach.a\

client/mysql.cc

+6 −0

Original line number	Diff line number	Diff line
		@@ -2676,6 +2676,8 @@ static const char* construct_prompt()
		processed_prompt.append(' ');
		break;
		case 'R':
		if (t->tm_hour < 10)
		processed_prompt.append('0');
		add_int_to_prompt(t->tm_hour);
		break;
		case 'r':
		@@ -2683,6 +2685,8 @@ static const char* construct_prompt()
		getHour = t->tm_hour % 12;
		if (getHour == 0)
		getHour=12;
		if (getHour < 10)
		processed_prompt.append('0');
		add_int_to_prompt(getHour);
		break;
		case 'm':
		@@ -2708,6 +2712,8 @@ static const char* construct_prompt()
		processed_prompt.append(strtok(dateTime,"\n"));
		break;
		case 's':
		if (t->tm_sec < 10)
		processed_prompt.append('0');
		add_int_to_prompt(t->tm_sec);
		break;
		case 'w':

client/mysqlbinlog.cc

+6 −5

Original line number	Diff line number	Diff line
		@@ -306,6 +306,7 @@ int process_event(ulonglong rec_count, char last_db, Log_event *ev,
		my_off_t pos, int old_format)
		{
		char ll_buff[21];

		if ((*rec_count) >= offset)
		{
		if (!short_form)
		@@ -437,9 +438,9 @@ static struct my_option my_long_options[] =
		{"user", 'u', "Connect to the remote server as username.",
		(gptr) &user, (gptr) &user, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0,
		0, 0},
		{"local-load", 'l', "Prepare files for local load in directory.",
		{"local-load", 'l', "Prepare local temporary files for LOAD DATA INFILE in the specified directory.",
		(gptr) &dirname_for_local_load, (gptr) &dirname_for_local_load, 0,
		GET_STR_ALLOC, OPT_ARG, 0, 0, 0, 0, 0, 0},
		GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
		{"version", 'V', "Print version and exit.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0,
		0, 0, 0, 0, 0},
		{0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
		@@ -566,8 +567,6 @@ static MYSQL* safe_connect()
		if(!local_mysql)
		die("Failed on mysql_init");

		mysql_options(local_mysql, MYSQL_INIT_COMMAND,
		"/!32210 SET @@session.max_insert_delayed_threads=0/");
		if (!mysql_real_connect(local_mysql, host, user, pass, 0, port, sock, 0))
		die("failed on connect: %s", mysql_error(local_mysql));

		@@ -948,10 +947,12 @@ int main(int argc, char** argv)
		exit(1);
		if (dirname_for_local_load)
		load_processor.init_by_dir_name(dirname_for_local_load);
		else
		else /* my_malloc() failed in my_strdup() */
		load_processor.init_by_cur_dir();

		exit_value= 0;
		fprintf(result_file,
		"/!40019 SET @@session.max_insert_delayed_threads=0/;\n");
		while (--argc >= 0)
		{
		if (dump_log_entries(*(argv++)))

client/mysqltest.c

+34 −24

Original line number	Diff line number	Diff line
		@@ -867,6 +867,15 @@ int do_exec(struct st_query* q)
		if (!*cmd)
		die("Missing argument in exec\n");

		if (disable_result_log)
		{
		if (!(res_file= popen(cmd, "r")) && q->abort_on_error)
		die("popen() failed\n");
		while (fgets(buf, sizeof(buf), res_file));
		pclose(res_file);
		}
		else
		{
		if (q->record_file[0])
		{
		init_dynamic_string(&ds_tmp, "", 16384, 65536);
		@@ -897,6 +906,7 @@ int do_exec(struct st_query* q)
		}
		if (ds == &ds_tmp)
		dynstr_free(&ds_tmp);
		}

		return error;
		}
		@@ -2251,7 +2261,7 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
		{
		if (i)
		dynstr_append_mem(ds, "\t", 1);
		dynstr_append(ds, fields[i].name);
		replace_dynstr_append_mem(ds, fields[i].name, strlen(fields[i].name));
		}
		dynstr_append_mem(ds, "\n", 1);
		append_result(ds, res);