Added --warnings to mysqld (34b528f1) · Commits · Software / OSDI20 Artifacts / mariadb

Docs/manual.texi

+25 −3

Original line number	Diff line number	Diff line
		@@ -10531,6 +10531,9 @@ Run @code{mysqld} daemon as user @code{user_name}. This option is
		@item -V, --version
		Output version information and exit.

		@item -W, --warnings
		Print out warnings like @code{Aborted connection...} to the @code{.err} file.
		@xref{Communication errors}.
		@end table

		@cindex default options
		@@ -25795,8 +25798,8 @@ in its own lock table and rolls back the transaction. If you use
		than InnoDB in the same transaction, then a deadlock may arise which
		InnoDB cannot notice. In cases like this the timeout is useful to
		resolve the situation.
		@item @code{innodb_unix_file_flush_method} @tab
		(Available from 3.23.39 up.)
		@item @code{innodb_flush_method} @tab
		(Available from 3.23.40 up.)
		The default value for this is @code{fdatasync}.
		Another option is @code{O_DSYNC}.
		Options @code{littlesync} and @code{nosync} have the
		@@ -26406,7 +26409,7 @@ In some versions of Linux and Unix, flushing files to disk with the Unix
		@code{fdatasync} and other similar methods is surprisingly slow.
		The default method InnoDB uses is the @code{fdatasync} function.
		If you are not satisfied with the database write performance, you may
		try setting @code{innodb_unix_file_flush_method} in @file{my.cnf}
		try setting @code{innodb_flush_method} in @file{my.cnf}
		to @code{O_DSYNC}, though O_DSYNC seems to be slower on most systems.
		You can also try setting it to @code{littlesync}, which means that
		InnoDB does not call the file flush for every write it does to a
		@@ -38212,6 +38215,9 @@ option.
		@node Communication errors, Full table, Packet too large, Common errors
		@subsection Communication Errors / Aborted Connection

		Starting with @code{MySQL 3.23.40} you only get the @code{Aborted
		connection} error of you start @code{mysqld} with @code{--warnings}.

		If you find errors like the following in your error log.

		@example
		@@ -46298,6 +46304,16 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.
		Added support for symbolic links to @code{MyISAM} tables. Symlink handling is
		now enabled by default for Windows.
		@item
		@code{LOAD DATA FROM MASTER} "auto-magically" sets up a slave.
		@item
		A new @code{HANDLER} interface to @code{MyISAM} tables.
		@item
		@code{COUNT(DISTINCT)} is about 30% faster.
		@item
		Creating full text indexes are now much faster.
		@item
		Searching on packed (@code{CHAR}/@code{VARCHAR}) keys are now much faster.
		@item
		Added @code{SQL_CALC_FOUND_ROWS} and @code{FOUND_ROWS()}. This makes it
		possible to know how many rows a query would have returned
		without a @code{LIMIT} clause.
		@@ -46406,6 +46422,12 @@ not yet 100% confident in this code.
		@appendixsubsec Changes in release 3.23.40
		@itemize @bullet
		@item
		Added option @code{--warnings} to @code{mysqld}. Now @code{mysqld}
		only prints the error @code{Aborted connection} if this option is used.
		@item
		Fixed properly the rename of @code{innodb_unix_file_flush_method} to
		@code{innodb_flush_method}.
		@item
		Fixed bug when converting @code{UNSIGNED BIGINT} to @code{DOUBLE}. This caused
		a problem when doing comparisons with @code{BIGINT}'s outside of the
		signed range.

sql/mysql_priv.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -533,7 +533,7 @@ extern ulong keybuff_size,sortbuff_size,max_item_sort_length,table_cache_size,
		binlog_cache_size, max_binlog_cache_size;
		extern ulong specialflag, current_pid;
		extern bool low_priority_updates, using_update_log;
		extern bool opt_sql_bin_update, opt_safe_show_db;
		extern bool opt_sql_bin_update, opt_safe_show_db, opt_warnings;
		extern char language[LIBLEN],reg_ext[FN_EXTLEN],blob_newline;
		extern const char *errmesg; / Error messages */
		extern const char *default_tx_isolation_name;

sql/mysqld.cc

+13 −8

Original line number	Diff line number	Diff line
		@@ -275,7 +275,7 @@ ulong max_tmp_tables,max_heap_table_size;
		ulong bytes_sent = 0L, bytes_received = 0L;

		bool opt_endinfo,using_udf_functions,low_priority_updates, locked_in_memory;
		bool opt_using_transactions, using_update_log;
		bool opt_using_transactions, using_update_log, opt_warnings=0;
		bool volatile abort_loop,select_thread_in_use,grant_option;
		bool volatile ready_to_exit,shutdown_in_progress;
		ulong refresh_version=1L,flush_version=1L; /* Increments on each reload */
		@@ -2455,7 +2455,7 @@ enum options {
		OPT_INNODB_LOG_ARCH_DIR,
		OPT_INNODB_LOG_ARCHIVE,
		OPT_INNODB_FLUSH_LOG_AT_TRX_COMMIT,
		OPT_INNODB_UNIX_FILE_FLUSH_METHOD,
		OPT_innodb_flush_method,
		OPT_SAFE_SHOW_DB,
		OPT_GEMINI_SKIP, OPT_INNODB_SKIP,
		OPT_TEMP_POOL, OPT_TX_ISOLATION,
		@@ -2516,7 +2516,7 @@ static struct option long_options[] = {
		OPT_INNODB_LOG_ARCHIVE},
		{"innodb_flush_log_at_trx_commit", optional_argument, 0,
		OPT_INNODB_FLUSH_LOG_AT_TRX_COMMIT},
		{"innodb_unix_file_flush_method", required_argument, 0,
		{"innodb_flush_method", required_argument, 0,
		OPT_INNODB_UNIX_FILE_FLUSH_METHOD},
		#endif
		{"help", no_argument, 0, '?'},
		@@ -2603,6 +2603,7 @@ static struct option long_options[] = {
		#endif
		{"user", required_argument, 0, 'u'},
		{"version", no_argument, 0, 'V'},
		{"warnings", no_argument, 0, 'W'},
		{0, 0, 0, 0}
		};

		@@ -2796,7 +2797,7 @@ struct show_var_st init_vars[]= {
		{"innodb_log_arch_dir", (char*) &innobase_log_arch_dir, SHOW_CHAR_PTR},
		{"innodb_log_archive", (char*) &innobase_log_archive, SHOW_MY_BOOL},
		{"innodb_log_group_home_dir", (char*) &innobase_log_group_home_dir, SHOW_CHAR_PTR},
		{"innodb_unix_file_flush_method", (char*) &innobase_unix_file_flush_method, SHOW_CHAR_PTR},
		{"innodb_flush_method", (char*) &innobase_unix_file_flush_method, SHOW_CHAR_PTR},
		#endif
		{"interactive_timeout", (char*) &net_interactive_timeout, SHOW_LONG},
		{"join_buffer_size", (char*) &join_buff_size, SHOW_LONG},
		@@ -3033,7 +3034,8 @@ static void usage(void)
		Default transaction isolation level\n\
		--temp-pool Use a pool of temporary files\n\
		-u, --user=user_name Run mysqld daemon as user\n\
		-V, --version output version information and exit");
		-V, --version output version information and exit\n\
		-W, --warnings Log some not critical warnings to the log file\n");
		#ifdef __WIN__
		puts("NT and Win32 specific options:\n\
		--console Don't remove the console window\n\
		@@ -3073,7 +3075,7 @@ static void usage(void)
		puts("\
		--innodb_data_home_dir=dir The common part for Innodb table spaces\n\
		--innodb_data_file_path=dir Path to individual files and their sizes\n\
		--innodb_unix_file_flush_method=# With which method to flush data\n\
		--innodb_flush_method=# With which method to flush data\n\
		--innodb_flush_log_at_trx_commit[=#]\n\
		Set to 0 if you don't want to flush logs\n\
		--innodb_log_arch_dir=dir Where full logs should be archived\n\
		@@ -3167,7 +3169,7 @@ static void get_options(int argc,char **argv)
		int c,option_index=0;

		myisam_delay_key_write=1; // Allow use of this
		while ((c=getopt_long(argc,argv,"ab:C:h:#::T::?l::L:O:P:sS::t:u:noVvI?",
		while ((c=getopt_long(argc,argv,"ab:C:h:#::T::?l::L:O:P:sS::t:u:noVvWI?",
		long_options, &option_index)) != EOF)
		{
		switch(c) {
		@@ -3177,6 +3179,9 @@ static void get_options(int argc,char **argv)
		#endif
		opt_endinfo=1; /* unireg: memory allocation */
		break;
		case 'W':
		opt_warnings=1;
		break;
		case 'a':
		opt_ansi_mode=1;
		thd_startup_options\|=OPTION_ANSI_MODE;

sql/sql_parse.cc

+1 −0

Original line number	Diff line number	Diff line
		@@ -554,6 +554,7 @@ pthread_handler_decl(handle_one_connection,arg)
		free_root(&thd->mem_root,MYF(0));
		if (net->error && net->vio != 0)
		{
		if (!thd->killed && ! opt_warnings)
		sql_print_error(ER(ER_NEW_ABORTING_CONNECTION),
		thd->thread_id,(thd->db ? thd->db : "unconnected"),
		thd->user ? thd->user : "unauthenticated",