bk commit into 5.0 tree (kent:1.2366) BUG#18441

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-07 03:52:29+01:00, kent@stripped +3 -0
  mysqld.cc, sql_parse.cc, mysql_priv.h:
    On Windows, only open dialog window if '--console' is given (bug#18441)

  sql/mysql_priv.h@stripped, 2007-01-07 03:49:49+01:00, kent@stripped +1 -0
    On Windows, only open dialog window if '--console' is given (bug#18441)

  sql/mysqld.cc@stripped, 2007-01-07 03:49:48+01:00, kent@stripped +6 -3
    On Windows, only open dialog window if '--console' is given (bug#18441)

  sql/sql_parse.cc@stripped, 2007-01-07 03:49:48+01:00, kent@stripped +2 -1
    On Windows, only open dialog window if '--console' is given (bug#18441)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	kent-amd64.(none)
# Root:	/home/kent/bk/tmp/mysql-5.0-build

--- 1.426/sql/mysql_priv.h	2007-01-07 03:52:33 +01:00
+++ 1.427/sql/mysql_priv.h	2007-01-07 03:52:33 +01:00
@@ -1261,6 +1261,7 @@
 extern my_bool opt_log_slow_admin_statements;
 extern my_bool sp_automatic_privileges, opt_noacl;
 extern my_bool opt_old_style_user_limits, trust_function_creators;
+extern my_bool opt_console;
 extern uint opt_crash_binlog_innodb;
 extern char *shared_memory_base_name, *mysqld_unix_port;
 extern my_bool opt_enable_shared_memory;

--- 1.585/sql/mysqld.cc	2007-01-07 03:52:33 +01:00
+++ 1.586/sql/mysqld.cc	2007-01-07 03:52:33 +01:00
@@ -308,7 +308,7 @@
 static bool lower_case_table_names_used= 0;
 static bool volatile select_thread_in_use, signal_thread_in_use;
 static bool volatile ready_to_exit;
-static my_bool opt_debugging= 0, opt_external_locking= 0, opt_console= 0;
+static my_bool opt_debugging= 0, opt_external_locking= 0;
 static my_bool opt_bdb, opt_isam, opt_ndbcluster, opt_merge;
 static my_bool opt_short_log_format= 0;
 static uint kill_cached_threads, wake_thread;
@@ -374,6 +374,7 @@
 my_bool opt_large_pages= 0;
 uint    opt_large_page_size= 0;
 my_bool opt_old_style_user_limits= 0, trust_function_creators= 0;
+my_bool opt_console= 0;
 /*
   True if there is at least one per-hour limit for some user, so we should
   check them before each query (and possibly reset counters when hour is
@@ -1522,8 +1523,10 @@
 		      FORMAT_MESSAGE_FROM_SYSTEM,
 		      NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
 		      (LPTSTR) &lpMsgBuf, 0, NULL );
-	MessageBox(NULL, (LPTSTR) lpMsgBuf, "Error from CreateNamedPipe",
-		    MB_OK|MB_ICONINFORMATION);
+	sql_print_error("Error from CreateNamedPipe '%s'", lpMsgBuf);
+	if (opt_console)
+	  MessageBox(NULL, (LPTSTR) lpMsgBuf, "Error from CreateNamedPipe",
+		     MB_OK|MB_ICONINFORMATION);
 	LocalFree(lpMsgBuf);
 	unireg_abort(1);
       }

--- 1.597/sql/sql_parse.cc	2007-01-07 03:52:33 +01:00
+++ 1.598/sql/sql_parse.cc	2007-01-07 03:52:33 +01:00
@@ -96,7 +96,8 @@
 static void  test_signal(int sig_ptr)
 {
 #if !defined( DBUG_OFF)
-  MessageBox(NULL,"Test signal","DBUG",MB_OK);
+  if (opt_console)
+    MessageBox(NULL,"Test signal","DBUG",MB_OK);
 #endif
 #if defined(OS2)
   fprintf(stderr, "Test signal %d\n", sig_ptr);