Merge work.mysql.com:/home/bk/mysql

into central.snake.net:/home/paul/mysql


BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged

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
+paul@central.snake.net
 sasha@mysql.sashanet.com
 sasha@work.mysql.com
 serg@serg.mysql.com
 tim@threads.polyesthetic.msg
 tim@work.mysql.com
-jcole@abel.spaceapes.com
-paul@central.snake.net

client/mysqltest.c

@@ -43,7 +43,7 @@
 
 **********************************************************************/
 
-#define MTEST_VERSION "1.6"
+#define MTEST_VERSION "1.7"
 
 #include <global.h>
 #include <my_sys.h>
@@ -156,6 +156,7 @@ struct st_query
          Q_SYNC_WITH_MASTER, Q_ERROR, 
          Q_SEND,             Q_REAP, 
          Q_DIRTY_CLOSE,      Q_REPLACE,
+	 Q_PING,
          Q_UNKNOWN,                             /* Unknown command.   */
          Q_COMMENT,                             /* Comments, ignored. */
          Q_COMMENT_WITH_COMMAND
@@ -174,6 +175,7 @@ const char *command_names[] = {
   "sync_with_master", "error",
   "send",             "reap", 
   "dirty_close",      "replace_result",
+  "ping",
   0
 };
 
@@ -1662,6 +1664,9 @@ int main(int argc, char** argv)
       case Q_SYNC_WITH_MASTER: do_sync_with_master(q); break;	
       case Q_COMMENT:				/* Ignore row */
       case Q_COMMENT_WITH_COMMAND:
+      case Q_PING:
+	(void) mysql_ping(&cur_con->mysql);
+	break;
       default: processed = 0; break;
       }
     }

configure.in

@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
-AM_INIT_AUTOMAKE(mysql, 3.23.34a)
+AM_INIT_AUTOMAKE(mysql, 3.23.35)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10

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 */

mysql-test/r/user_var.result

 @a - connection_id()
 3
+i
+1
+2
+i	@vv1:=if(sv1.i,1,0)	@vv2:=if(sv2.i,1,0)	@vv3:=if(sv3.i,1,0)	@vv1+@vv2+@vv3
+1	1	0	1	2
+2	1	0	0	1

mysql-test/t/kill.test

@@ -3,21 +3,24 @@ connect (con2, localhost, root,,test,0, mysql-master.sock);
 
 #remember id of con1
 connection con1;
-drop table if exists connection_kill;
-create table connection_kill (kill_id int);
-insert into connection_kill values(connection_id());
+drop table if exists t1;
+create table t1 (kill_id int);
+insert into t1 values(connection_id());
 
 #kill con1
 connection con2;
-select ((@id := kill_id) - kill_id) from connection_kill; 
+select ((@id := kill_id) - kill_id) from t1; 
 kill @id;
 
-# verify that con1 is really dead
+# Wait for thread to do.
+--sleep 5
+# verify that con1 is doning a reconnect
 connection con1;
-error 2013;
-select 1;
+ping
+ping
+select @id != connection_id();
 
 #make sure the server is still alive
 connection con2;
 select 4;
-drop table connection_kill;
+drop table t1;

mysql-test/t/user_var.test

@@ -3,3 +3,13 @@ set @a := foo;
 set @a := connection_id() + 3;
 select @a - connection_id();
 
+# Check using and setting variables with SELECT DISTINCT
+
+drop table if exists t1,t2;
+CREATE TABLE t1 ( i int not null, v int not null,index (i));
+insert into t1 values (1,1),(1,3),(2,1); 
+create table t2 (i int not null, unique (i));
+insert into t2 select distinct i from t1;
+select * from t2; 
+select distinct t2.i,@vv1:=if(sv1.i,1,0),@vv2:=if(sv2.i,1,0),@vv3:=if(sv3.i,1,0), @vv1+@vv2+@vv3 from t2 left join t1 as sv1 on sv1.i=t2.i and sv1.v=1 left join t1 as sv2 on sv2.i=t2.i and sv2.v=2 left join t1 as sv3 on sv3.i=t2.i and sv3.v=3;
+drop table t1,t2;

sql-bench/run-all-tests.sh

@@ -37,6 +37,7 @@ use DBI;
 
 $opt_silent=1;			# Don't write header
 
+@ORG_ARGV=@ARGV;
 chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
 require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
 $opt_silent=0;
@@ -46,7 +47,7 @@ $redirect= !($machine =~ /windows/i || $machine =~ "^NT\s") ? "2>&1" : "";
 $dir= ($pwd =~ /\\/) ? '\\' : '/';	# directory symbol for shell
 
 $prog_args="";
-foreach $arg (@ARGV)
+foreach $arg (@ORG_ARGV)
 {
   if ($redirect)
   {

sql/item_func.h

@@ -835,6 +835,8 @@ public:
   void fix_length_and_dec();
   enum Item_result result_type() const;
   const char *func_name() const { return "get_user_var"; }
+  bool const_item() const { return 0; }
+  table_map used_tables() const { return RAND_TABLE_BIT; }
 };
 
 class Item_func_inet_aton : public Item_int_func

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},