bk commit into 5.1 tree (rburnett:1.2198)

[reggie]

Below is the list of changes that have just been committed into a local
5.1 repository of rburnett. When rburnett 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
  1.2198 06/06/20 14:51:32 rburnett@stripped +3 -0
  Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
  into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt

  sql/sql_show.cc
    1.352 06/06/20 14:51:24 rburnett@stripped +0 -0
    Auto merged

  sql/sql_lex.cc
    1.188 06/06/20 14:51:23 rburnett@stripped +0 -0
    Auto merged

  sql/mysqld.cc
    1.561 06/06/20 14:51:23 rburnett@stripped +0 -0
    Auto merged

# 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:	rburnett
# Host:	bk-internal.mysql.com
# Root:	/data0/bk/mysql-5.1-kt/RESYNC

--- 1.560/sql/mysqld.cc	2006-06-19 16:58:48 +02:00
+++ 1.561/sql/mysqld.cc	2006-06-20 14:51:23 +02:00
@@ -302,16 +302,15 @@
  {&Arg_comparator::compare_row,        &Arg_comparator::compare_e_row},
  {&Arg_comparator::compare_decimal,    &Arg_comparator::compare_e_decimal}};
 
-const char *log_output_names[] =
-{ "NONE", "FILE", "TABLE", NullS};
+const char *log_output_names[] = { "NONE", "FILE", "TABLE", NullS};
+static const unsigned int log_output_names_len[]= { 4, 4, 5, 0 };
 TYPELIB log_output_typelib= {array_elements(log_output_names)-1,"",
-				 log_output_names, NULL};
+                             log_output_names, 
+                             (unsigned int *) log_output_names_len};
 
 /* static variables */
 
 /* the default log output is log tables */
-static const char *log_output_str= "TABLE";
-static ulong log_output_options= LOG_TABLE;
 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;
@@ -342,7 +341,9 @@
 
 /* Global variables */
 
-bool opt_log, opt_update_log, opt_bin_log, opt_slow_log;
+bool opt_update_log, opt_bin_log;
+my_bool opt_log, opt_slow_log;
+uint log_output_options;
 my_bool opt_log_queries_not_using_indexes= 0;
 bool opt_error_log= IF_WIN(1,0);
 bool opt_disable_networking=0, opt_skip_show_db=0;
@@ -520,6 +521,7 @@
 ulong slow_launch_threads = 0, sync_binlog_period;
 ulong expire_logs_days = 0;
 ulong rpl_recovery_rank=0;
+const char *log_output_str= "TABLE";
 
 double log_10[32];			/* 10 potences */
 time_t start_time;
@@ -1229,6 +1231,8 @@
     free_defaults(defaults_argv);
   my_free(sys_init_connect.value, MYF(MY_ALLOW_ZERO_PTR));
   my_free(sys_init_slave.value, MYF(MY_ALLOW_ZERO_PTR));
+  my_free(sys_var_general_log_path.value, MYF(MY_ALLOW_ZERO_PTR));
+  my_free(sys_var_slow_log_path.value, MYF(MY_ALLOW_ZERO_PTR));
   free_tmpdir(&mysql_tmpdir_list);
 #ifdef HAVE_REPLICATION
   my_free(slave_load_tmpdir,MYF(MY_ALLOW_ZERO_PTR));
@@ -2607,6 +2611,7 @@
 static int init_common_variables(const char *conf_file_name, int argc,
 				 char **argv, const char **groups)
 {
+  char buff[FN_REFLEN];
   umask(((~my_umask) & 0666));
   my_decimal_set_zero(&decimal_zero); // set decimal_zero constant;
   tzset();			// Set tzname
@@ -2763,6 +2768,16 @@
   else
     sys_init_slave.value=my_strdup("",MYF(0));
 
+  if (!opt_logname)
+    opt_logname= make_default_log_name(buff, ".log");
+  sys_var_general_log_path.value= my_strdup(opt_logname, MYF(0));
+  sys_var_general_log_path.value_length= strlen(opt_logname);
+
+  if (!opt_slow_logname)
+    opt_slow_logname= make_default_log_name(buff, "-slow.log");
+  sys_var_slow_log_path.value= my_strdup(opt_slow_logname, MYF(0));
+  sys_var_slow_log_path.value_length= strlen(opt_slow_logname);
+
   if (use_temp_pool && bitmap_init(&temp_pool,0,1024,1))
     return 1;
   if (my_database_names_init())
@@ -4816,7 +4831,9 @@
   OPT_TABLE_LOCK_WAIT_TIMEOUT,
   OPT_PLUGIN_DIR,
   OPT_LOG_OUTPUT,
-  OPT_PORT_OPEN_TIMEOUT
+  OPT_PORT_OPEN_TIMEOUT,
+  OPT_GENERAL_LOG,
+  OPT_SLOW_LOG
 };
 
 
@@ -5046,6 +5063,9 @@
    "Set up signals usable for debugging",
    (gptr*) &opt_debugging, (gptr*) &opt_debugging,
    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"general-log", OPT_GENERAL_LOG,
+   "Enable|disable general log", (gptr*) &opt_log,
+   (gptr*) &opt_log, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
 #ifdef HAVE_LARGE_PAGES
   {"large-pages", OPT_ENABLE_LARGE_PAGES, "Enable support for large pages. \
 Disable with --skip-large-pages.",
@@ -5621,6 +5641,9 @@
    "Tells the slave thread to continue replication when a query returns an error from the
provided list.",
    0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #endif
+  {"slow-query-log", OPT_SLOW_LOG,
+   "Enable|disable slow query log", (gptr*) &opt_slow_log,
+   (gptr*) &opt_slow_log, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
   {"socket", OPT_SOCKET, "Socket file to use for connection.",
    (gptr*) &mysqld_unix_port, (gptr*) &mysqld_unix_port, 0, GET_STR,
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -6931,6 +6954,7 @@
   opt_skip_slave_start= opt_reckless_slave = 0;
   mysql_home[0]= pidfile_name[0]= log_error_file[0]= 0;
   opt_log= opt_update_log= opt_slow_log= 0;
+  log_output_options= find_bit_type(log_output_str, &log_output_typelib);
   opt_bin_log= 0;
   opt_disable_networking= opt_skip_show_db=0;
   opt_logname= opt_update_logname= opt_binlog_index_name= opt_slow_logname= 0;

--- 1.187/sql/sql_lex.cc	2006-06-20 11:02:48 +02:00
+++ 1.188/sql/sql_lex.cc	2006-06-20 14:51:23 +02:00
@@ -777,8 +777,6 @@
 	int length;
 	if ((length= my_mbcharlen(cs, c)) == 1)
 	{
-	  if (c == (uchar) NAMES_SEP_CHAR)
-	    break; /* Old .frm format can't handle this char */
 	  if (c == quote_char)
 	  {
 	    if (yyPeek() != quote_char)

--- 1.351/sql/sql_show.cc	2006-06-19 17:31:27 +02:00
+++ 1.352/sql/sql_show.cc	2006-06-20 14:51:24 +02:00
@@ -438,6 +438,7 @@
   uint col_access=thd->col_access;
 #endif
   TABLE_LIST table_list;
+  char tbbuff[FN_REFLEN];
   DBUG_ENTER("mysql_find_files");
 
   if (wild && !wild[0])
@@ -454,6 +455,8 @@
     DBUG_RETURN(-1);
   }
 
+  VOID(tablename_to_filename(tmp_file_prefix, tbbuff, sizeof(tbbuff)));
+
   for (i=0 ; i < (uint) dirp->number_off_files  ; i++)
   {
     char uname[NAME_LEN*3+1];                   /* Unencoded name */
@@ -491,7 +494,7 @@
     {
         // Return only .frm files which aren't temp files.
       if (my_strcasecmp(system_charset_info, ext=fn_rext(file->name),reg_ext) ||
-          is_prefix(file->name,tmp_file_prefix))
+          is_prefix(file->name,tbbuff))
         continue;
       *ext=0;
       VOID(filename_to_tablename(file->name, uname, sizeof(uname)));