Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql (cf80b8ae) · Commits · Software / OSDI20 Artifacts / mariadb

Docs/manual.texi

+2 −0

Original line number	Diff line number	Diff line
		@@ -46859,6 +46859,8 @@ as @code{NULL}.
		Fixed problem with @code{myisampack} when using pre-space filled CHAR columns.
		@item
		Applied patch from Yuri Dario for OS2.
		@item
		Fixed bug in @code{--safe-user-create}
		@end itemize

		@node News-3.23.42, News-3.23.41, News-3.23.43, News-3.23.x

isam/_dbug.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ void _nisam_print_key(FILE stream, register N_KEYSEG keyseg, const uchar *key)
		key=end;
		break;
		case HA_KEYTYPE_UINT24:
		VOID(fprintf(stream,"%ld",uint3korr(key)));
		VOID(fprintf(stream,"%ld",(long) uint3korr(key)));
		key=end;
		break;
		case HA_KEYTYPE_FLOAT:

sql/mysqld.cc

+4 −4

Original line number	Diff line number	Diff line
		@@ -2811,13 +2811,13 @@ CHANGEABLE_VAR changeable_vars[] = {
		0, 1, ~0L, 0, 1 },
		{ "max_write_lock_count", (long*) &max_write_lock_count,
		~0L, 1, ~0L, 0, 1 },
		{ "myisam_sort_buffer_size", (long*) &myisam_sort_buffer_size,
		8192*1024, 4, ~0L, 0, 1 },
		{ "myisam_max_extra_sort_file_size",
		(long*) &myisam_max_extra_sort_file_size,
		(long) (MI_MAX_TEMP_LENGTH/(1024L*1024L)), 0, ~0L, 0, 1 },
		{ "myisam_max_sort_file_size", (long*) &myisam_max_sort_file_size,
		(long) (LONG_MAX/(1024L*1024L)), 0, ~0L, 0, 1 },
		{ "myisam_sort_buffer_size", (long*) &myisam_sort_buffer_size,
		8192*1024, 4, ~0L, 0, 1 },
		{ "net_buffer_length", (long*) &net_buffer_length,
		16384, 1024, 1024*1024L, MALLOC_OVERHEAD, 1024 },
		{ "net_retry_count", (long*) &mysqld_net_retry_count,
		@@ -2896,7 +2896,7 @@ struct show_var_st init_vars[]= {
		{"have_innodb", (char*) &have_innodb, SHOW_HAVE},
		{"have_isam", (char*) &have_isam, SHOW_HAVE},
		{"have_raid", (char*) &have_raid, SHOW_HAVE},
		{"have_ssl", (char*) &have_ssl, SHOW_HAVE},
		{"have_openssl", (char*) &have_ssl, SHOW_HAVE},
		{"init_file", (char*) &opt_init_file, SHOW_CHAR_PTR},
		#ifdef HAVE_INNOBASE_DB
		{"innodb_data_file_path", (char*) &innobase_data_file_path, SHOW_CHAR_PTR},
		@@ -2935,10 +2935,10 @@ struct show_var_st init_vars[]= {
		{"max_user_connections", (char*) &max_user_connections, SHOW_LONG},
		{"max_tmp_tables", (char*) &max_tmp_tables, SHOW_LONG},
		{"max_write_lock_count", (char*) &max_write_lock_count, SHOW_LONG},
		{"myisam_recover_options", (char*) &myisam_recover_options, SHOW_LONG},
		{"myisam_max_extra_sort_file_size", (char*) &myisam_max_extra_sort_file_size,
		SHOW_LONG},
		{"myisam_max_sort_file_size",(char*) &myisam_max_sort_file_size, SHOW_LONG},
		{"myisam_recover_options", (char*) &myisam_recover_options, SHOW_LONG},
		{"myisam_sort_buffer_size", (char*) &myisam_sort_buffer_size, SHOW_LONG},
		{"net_buffer_length", (char*) &net_buffer_length, SHOW_LONG},
		{"net_read_timeout", (char*) &net_read_timeout, SHOW_LONG},

sql/net_serv.cc

+0 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@
		#include <signal.h>
		#include <errno.h>
		#include <sys/types.h>
		#include <violite.h>

		#ifdef MYSQL_SERVER
		ulong max_allowed_packet=65536;

sql/sql_acl.cc

+4 −2

Original line number	Diff line number	Diff line
		@@ -1613,6 +1613,7 @@ int mysql_table_grant (THD thd, TABLE_LIST table_list,
		List_iterator <LEX_USER> str_list (user_list);
		LEX_USER *Str;
		TABLE_LIST tables[3];
		bool create_new_users=0;
		DBUG_ENTER("mysql_table_grant");

		if (!initialized)
		@@ -1680,6 +1681,8 @@ int mysql_table_grant (THD thd, TABLE_LIST table_list,
		DBUG_RETURN(-1); /* purecov: deadcode */
		}

		if (!revoke_grant)
		create_new_users= test_if_create_new_users(thd);
		int result=0;
		pthread_mutex_lock(&LOCK_grant);
		MEM_ROOT old_root=my_pthread_getspecific_ptr(MEM_ROOT,THR_MALLOC);
		@@ -1705,8 +1708,7 @@ int mysql_table_grant (THD thd, TABLE_LIST table_list,
		*Str,
		0,
		revoke_grant ? 'N' : 'Y',
		(revoke_grant ? 0 :
		test_if_create_new_users(thd))))
		create_new_users))
		{
		result= -1; // Remember error
		continue; // Add next user