merge

BitKeeper/etc/logging_ok

 heikki@donna.mysql.fi
+jcole@abel.spaceapes.com
 jcole@tetra.spaceapes.com
 monty@donna.mysql.fi
+monty@tik.mysql.fi
 mwagner@evoq.mwagner.org
 sasha@mysql.sashanet.com
 sasha@work.mysql.com
 serg@serg.mysql.com
 tim@threads.polyesthetic.msg
 tim@work.mysql.com
-jcole@abel.spaceapes.com

include/mysql_com.h

@@ -90,7 +90,7 @@ enum enum_server_command {COM_SLEEP,COM_QUIT,COM_INIT_DB,COM_QUERY,
 #define CLIENT_INTERACTIVE	1024	/* This is an interactive client */
 #define CLIENT_SSL              2048     /* Switch to SSL after handshake */
 #define CLIENT_IGNORE_SIGPIPE   4096     /* IGNORE sigpipes */
-#define CLIENT_TRANSACTIONS	8196	/* Client knows about transactions */
+#define CLIENT_TRANSACTIONS	8192	/* Client knows about transactions */
 
 #define SERVER_STATUS_IN_TRANS  1	/* Transaction has started */
 #define SERVER_STATUS_AUTOCOMMIT 2	/* Server in auto_commit mode */

sql/mysqld.cc

@@ -2717,12 +2717,12 @@ struct show_var_st init_vars[]= {
   {"have_ssl",		      (char*) &have_ssl,		    SHOW_HAVE},
   {"init_file",               (char*) &opt_init_file,               SHOW_CHAR_PTR},
 #ifdef HAVE_INNOBASE_DB
-  {"innobase_data_file_path", innobase_data_file_path,		    SHOW_CHAR},
-  {"innobase_data_home_dir",  innobase_data_home_dir,		    SHOW_CHAR},
+  {"innobase_data_file_path", (char*) &innobase_data_file_path,	    SHOW_CHAR_PTR},
+  {"innobase_data_home_dir",  (char*) &innobase_data_home_dir,	    SHOW_CHAR_PTR},
   {"innobase_flush_log_at_trx_commit", (char*) &innobase_flush_log_at_trx_commit, SHOW_MY_BOOL},
-  {"innobase_log_arch_dir",   innobase_log_arch_dir, SHOW_CHAR},
+  {"innobase_log_arch_dir",   (char*) &innobase_log_arch_dir, 	    SHOW_CHAR_PTR},
   {"innobase_log_archive",    (char*) &innobase_log_archive, 	    SHOW_MY_BOOL},
-  {"innobase_log_group_home_dir", innobase_log_group_home_dir,      SHOW_CHAR},
+  {"innobase_log_group_home_dir", (char*) &innobase_log_group_home_dir, SHOW_CHAR_PTR},
 #endif
   {"interactive_timeout",     (char*) &net_interactive_timeout,     SHOW_LONG},
   {"join_buffer_size",        (char*) &join_buff_size,              SHOW_LONG},