Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/M41/mysql-4.1


sql/mysqld.cc:
  Auto merged

client/mysqltest.c

@@ -280,6 +280,7 @@ Q_DISPLAY_VERTICAL_RESULTS, Q_DISPLAY_HORIZONTAL_RESULTS,
 Q_QUERY_VERTICAL, Q_QUERY_HORIZONTAL,
 Q_START_TIMER, Q_END_TIMER,
 Q_CHARACTER_SET, Q_DISABLE_PS_PROTOCOL, Q_ENABLE_PS_PROTOCOL,
+Q_DISABLE_RECONNECT, Q_ENABLE_RECONNECT,
 
 Q_UNKNOWN,			       /* Unknown command.   */
 Q_COMMENT,			       /* Comments, ignored. */
@@ -365,6 +366,8 @@ const char *command_names[]=
   "character_set",
   "disable_ps_protocol",
   "enable_ps_protocol",
+  "disable_reconnect",
+  "enable_reconnect",
   0
 };
 
@@ -3624,6 +3627,12 @@ int main(int argc, char **argv)
       case Q_ENABLE_PS_PROTOCOL:
         ps_protocol_enabled= ps_protocol;
         break;
+      case Q_DISABLE_RECONNECT:
+        cur_con->mysql.reconnect= 0;
+        break;
+      case Q_ENABLE_RECONNECT:
+        cur_con->mysql.reconnect= 1;
+        break;
 
       default: processed = 0; break;
       }

mysql-test/mysql-test-run.sh

@@ -239,7 +239,6 @@ STOP_WAIT_TIMEOUT=10
 MYSQL_TEST_SSL_OPTS=""
 USE_TIMER=""
 USE_EMBEDDED_SERVER=""
-RESULT_EXT=""
 TEST_MODE=""
 
 NDB_MGM_EXTRA_OPTS=
@@ -252,7 +251,6 @@ while test $# -gt 0; do
       USE_EMBEDDED_SERVER=1
       USE_MANAGER=0 NO_SLAVE=1
       USE_RUNNING_SERVER=""
-      RESULT_EXT=".es"
       TEST_MODE="$TEST_MODE embedded" ;;
     --purify)
       USE_PURIFY=1
@@ -740,13 +738,6 @@ show_failed_diff ()
   result_file=r/$1.result
   eval_file=r/$1.eval
 
-  # If we have an special externsion for result files we use it if we are recording
-  # or a result file with that extension exists.
-  if [ -n "$RESULT_EXT" -a \( x$RECORD = x1 -o -f "$result_file$RESULT_EXT" \) ]
-  then
-    result_file="$result_file$RESULT_EXT"
-  fi
-
   if [ -f $eval_file ]
   then
     result_file=$eval_file
@@ -1481,9 +1472,6 @@ run_testcase ()
  result_file="r/$tname.result"
  echo $tname > $CURRENT_TEST
  SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0`
- if [ -n "$RESULT_EXT" -a \( x$RECORD = x1 -o -f "$result_file$RESULT_EXT" \) ] ; then
-   result_file="$result_file$RESULT_EXT"
- fi
  if [ -f "$TESTDIR/$tname.disabled" ]
  then
    comment=`$CAT $TESTDIR/$tname.disabled`;
@@ -1531,33 +1519,8 @@ run_testcase ()
  # script soon anyway so it is not worth it spending the time
  if [ "x$USE_EMBEDDED_SERVER" = "x1" -a -z "$DO_TEST" ] ; then
    for t in \
-        "alter_table" \
-	"bdb-deadlock" \
-	"connect" \
-        "ctype_latin1_de" \
-        "ctype_ucs" \
-	"flush_block_commit" \
-	"grant2" \
-	"grant_cache" \
-	"grant" \
-	"init_connect" \
-	"init_file" \
-        "innodb" \
-	"innodb-deadlock" \
-	"innodb-lock" \
-	"mix_innodb_myisam_binlog" \
-	"mysqlbinlog2" \
-	"mysqlbinlog" \
-	"mysqldump" \
-	"mysql_protocols" \
-        "packet" \
-	"ps_1general" \
-	"rename" \
-	"show_check" \
-        "system_mysql_db_fix" \
-        "timezone2" \
-	"user_var" \
-	"variables"
+       "init_connect" \
+       "init_file"
    do
      if [ "$tname" = "$t" ] ; then
        skip_test $tname
@@ -1581,10 +1544,8 @@ run_testcase ()
        --result-file=*)
          result_file=`$ECHO "$EXTRA_MASTER_OPT" | $SED -e "s;--result-file=;;"`
          result_file="r/$result_file.result"
-         if [ -n "$RESULT_EXT" -a \( x$RECORD = x1 -o -f "$result_file$RESULT_EXT" \) ] ; then
-	   result_file="$result_file$RESULT_EXT"
-	 fi
-	 # Note that this must be set to space, not "" for test-reset to work
+         # Note that this must be set to space, not "" for test-reset to
+# work
 	 EXTRA_MASTER_OPT=" "
          ;;
      esac

mysql-test/r/alter_table.result

@@ -52,9 +52,9 @@ KEY NAME (NAME));
 ALTER TABLE t1 CHANGE NAME NAME CHAR(80) not null;
 SHOW FULL COLUMNS FROM t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-GROUP_ID	int(10) unsigned	NULL		PRI	0		select,insert,update,references	
-LANG_ID	smallint(5) unsigned	NULL		PRI	0		select,insert,update,references	
-NAME	char(80)	latin1_swedish_ci		MUL			select,insert,update,references	
+GROUP_ID	int(10) unsigned	NULL		PRI	0		#	
+LANG_ID	smallint(5) unsigned	NULL		PRI	0		#	
+NAME	char(80)	latin1_swedish_ci		MUL			#	
 DROP TABLE t1;
 create table t1 (n int);
 insert into t1 values(9),(3),(12),(10);
@@ -117,14 +117,6 @@ name
 mysqltest
 drop table t1;
 drop database mysqltest;
-create database mysqltest;
-create table mysqltest.t1 (a int,b int,c int);
-grant all on mysqltest.t1 to mysqltest_1@localhost;
-alter table t1 rename t2;
-ERROR 42000: INSERT,CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2'
-revoke all privileges on mysqltest.t1 from mysqltest_1@localhost;
-delete from mysql.user where user=_binary'mysqltest_1';
-drop database mysqltest;
 create table t1 (n1 int not null, n2 int, n3 int, n4 float,
 unique(n1),
 key (n1, n2, n3, n4),

mysql-test/r/ctype_ucs.result

@@ -510,21 +510,6 @@ prepare stmt1 from @str2;
 execute stmt1 using @ivar;
 ?
 1234
-SET TIMESTAMP=10000;
-create table t2 (c char(30)) charset=ucs2;
-set @v=convert('abc' using ucs2);
-reset master;
-insert into t2 values (@v);
-show binlog events from 79;
-Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
-master-bin.000001	79	User var	1	79	@`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci
-master-bin.000001	119	Query	1	119	use `test`; insert into t2 values (@v)
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
-SET @`v`:=_ucs2 0x006100620063 COLLATE `ucs2_general_ci`;
-use test;
-SET TIMESTAMP=10000;
-insert into t2 values (@v);
-drop table t2;
 set names latin1;
 create table t1 (a enum('x','y','z') character set ucs2);
 show create table t1;

mysql-test/r/ctype_ucs_binlog.result

+SET TIMESTAMP=10000;
+create table t2 (c char(30)) charset=ucs2;
+set @v=convert('abc' using ucs2);
+reset master;
+insert into t2 values (@v);
+show binlog events from 79;
+Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
+master-bin.000001	79	User var	1	79	@`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci
+master-bin.000001	119	Query	1	119	use `test`; insert into t2 values (@v)
+/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+SET @`v`:=_ucs2 0x006100620063 COLLATE `ucs2_general_ci`;
+use test;
+SET TIMESTAMP=10000;
+insert into t2 values (@v);
+drop table t2;

mysql-test/r/drop_temp_table.result.es

-reset master;
-create database `drop-temp+table-test`;
-use `drop-temp+table-test`;
-create temporary table `table:name` (a int);
-select get_lock("a",10);
-get_lock("a",10)
-1
-select get_lock("a",10);
-get_lock("a",10)
-1
-show binlog events;
-drop database `drop-temp+table-test`;

mysql-test/r/grant.result

@@ -427,3 +427,11 @@ delete from mysql.columns_priv where user="mysqltest_3";
 flush privileges;
 drop database mysqltest_1;
 drop database mysqltest_2;
+create database mysqltest;
+create table mysqltest.t1 (a int,b int,c int);
+grant all on mysqltest.t1 to mysqltest_1@localhost;
+alter table t1 rename t2;
+ERROR 42000: INSERT,CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2'
+revoke all privileges on mysqltest.t1 from mysqltest_1@localhost;
+delete from mysql.user where user=_binary'mysqltest_1';
+drop database mysqltest;

mysql-test/r/innodb-replace.result

+create table t1 (c1 char(5) unique not null, c2 int, stamp timestamp) engine=innodb;
+select * from t1;
+c1	c2	stamp
+replace delayed into t1 (c1, c2)  values ( "text1","11"),( "text2","12");
+ERROR HY000: Table storage engine for 't1' doesn't have this option
+select * from t1;
+c1	c2	stamp
+replace delayed into t1 (c1, c2)  values ( "text1","12"),( "text2","13"),( "text3","14", "a" ),( "text4","15", "b" );
+ERROR HY000: Table storage engine for 't1' doesn't have this option
+select * from t1;
+c1	c2	stamp
+drop table t1;

mysql-test/r/innodb.result

@@ -1401,18 +1401,6 @@ id	label
 3524	Societe Test
 3525	Fournisseur Test
 drop table t1,t2;
-create table t1 (c1 char(5) unique not null, c2 int, stamp timestamp) engine=innodb;
-select * from t1;
-c1	c2	stamp
-replace delayed into t1 (c1, c2)  values ( "text1","11"),( "text2","12");
-ERROR HY000: Table storage engine for 't1' doesn't have this option
-select * from t1;
-c1	c2	stamp
-replace delayed into t1 (c1, c2)  values ( "text1","12"),( "text2","13"),( "text3","14", "a" ),( "text4","15", "b" );
-ERROR HY000: Table storage engine for 't1' doesn't have this option
-select * from t1;
-c1	c2	stamp
-drop table t1;
 create table t1 (a int, b varchar(200), c text not null) checksum=1 engine=myisam;
 create table t2 (a int, b varchar(200), c text not null) checksum=0 engine=innodb;
 create table t3 (a int, b varchar(200), c text not null) checksum=1 engine=innodb;

mysql-test/r/insert_select-binlog.result

+create table t1(a int, unique(a));
+insert into t1 values(2);
+create table t2(a int);
+insert into t2 values(1),(2);
+reset master;
+insert into t1 select * from t2;
+ERROR 23000: Duplicate entry '2' for key 1
+show binlog events;
+Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
+master-bin.000001	4	Start	1	4	Server ver: VERSION, Binlog ver: 3
+master-bin.000001	79	Query	1	79	use `test`; insert into t1 select * from t2
+select * from t1;
+a
+1
+2
+drop table t1, t2;
+create table t1(a int);
+insert into t1 values(1),(1);
+reset master;
+create table t2(unique(a)) select a from t1;
+ERROR 23000: Duplicate entry '1' for key 1
+show binlog events;
+Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
+master-bin.000001	4	Start	1	4	Server ver: VERSION, Binlog ver: 3
+drop table t1;

mysql-test/r/insert_select.result

@@ -65,31 +65,6 @@ INSERT INTO t1 (numeropost,icone,contenu,pseudo,date,signature,ip)
 SELECT 1718,icone,contenu,pseudo,date,signature,ip FROM t2
 WHERE numeropost=9 ORDER BY numreponse ASC;
 DROP TABLE t1,t2;
-create table t1(a int, unique(a));
-insert into t1 values(2);
-create table t2(a int);
-insert into t2 values(1),(2);
-reset master;
-insert into t1 select * from t2;
-ERROR 23000: Duplicate entry '2' for key 1
-show binlog events;
-Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
-master-bin.000001	4	Start	1	4	Server ver: VERSION, Binlog ver: 3
-master-bin.000001	79	Query	1	79	use `test`; insert into t1 select * from t2
-select * from t1;
-a
-1
-2
-drop table t1, t2;
-create table t1(a int);
-insert into t1 values(1),(1);
-reset master;
-create table t2(unique(a)) select a from t1;
-ERROR 23000: Duplicate entry '1' for key 1
-show binlog events;
-Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
-master-bin.000001	4	Start	1	4	Server ver: VERSION, Binlog ver: 3
-drop table t1;
 create table t1 (a int not null);
 create table t2 (a int not null);
 insert into t1 values (1);

mysql-test/r/insert_select.result.es

-drop table if exists t1,t2;
-create table t1 (bandID MEDIUMINT UNSIGNED NOT NULL PRIMARY KEY, payoutID SMALLINT UNSIGNED NOT NULL);
-insert into t1 (bandID,payoutID) VALUES (1,6),(2,6),(3,4),(4,9),(5,10),(6,1),(7,12),(8,12);
-create table t2 (payoutID SMALLINT UNSIGNED NOT NULL PRIMARY KEY);
-insert into t2 (payoutID) SELECT DISTINCT payoutID FROM t1;
-insert into t2 (payoutID) SELECT payoutID+10 FROM t1;
-ERROR 23000: Duplicate entry '16' for key 1
-insert ignore into t2 (payoutID) SELECT payoutID+10 FROM t1;
-select * from t2;
-payoutID
-1
-4
-6
-9
-10
-11
-12
-14
-16
-19
-20
-22
-drop table t1,t2;
-CREATE TABLE `t1` (
-`numeropost` bigint(20) unsigned NOT NULL default '0',
-`icone` tinyint(4) unsigned NOT NULL default '0',
-`numreponse` bigint(20) unsigned NOT NULL auto_increment,
-`contenu` text NOT NULL,
-`pseudo` varchar(50) NOT NULL default '',
-`date` datetime NOT NULL default '0000-00-00 00:00:00',
-`ip` bigint(11) NOT NULL default '0',
-`signature` tinyint(1) unsigned NOT NULL default '0',
-PRIMARY KEY  (`numeropost`,`numreponse`)
-,KEY `ip` (`ip`),
-KEY `date` (`date`),
-KEY `pseudo` (`pseudo`),
-KEY `numreponse` (`numreponse`)
-) ENGINE=MyISAM;
-CREATE TABLE `t2` (
-`numeropost` bigint(20) unsigned NOT NULL default '0',
-`icone` tinyint(4) unsigned NOT NULL default '0',
-`numreponse` bigint(20) unsigned NOT NULL auto_increment,
-`contenu` text NOT NULL,
-`pseudo` varchar(50) NOT NULL default '',
-`date` datetime NOT NULL default '0000-00-00 00:00:00',
-`ip` bigint(11) NOT NULL default '0',
-`signature` tinyint(1) unsigned NOT NULL default '0',
-PRIMARY KEY  (`numeropost`,`numreponse`),
-KEY `ip` (`ip`),
-KEY `date` (`date`),
-KEY `pseudo` (`pseudo`),
-KEY `numreponse` (`numreponse`)
-) ENGINE=MyISAM;
-INSERT INTO t2
-(numeropost,icone,numreponse,contenu,pseudo,date,ip,signature) VALUES
-(9,1,56,'test','joce','2001-07-25 13:50:53'
-,3649052399,0);
-INSERT INTO t1 (numeropost,icone,contenu,pseudo,date,signature,ip)
-SELECT 1618,icone,contenu,pseudo,date,signature,ip FROM t2
-WHERE numeropost=9 ORDER BY numreponse ASC;
-show variables like '%bulk%';
-Variable_name	Value
-bulk_insert_buffer_size	8388608
-INSERT INTO t1 (numeropost,icone,contenu,pseudo,date,signature,ip)
-SELECT 1718,icone,contenu,pseudo,date,signature,ip FROM t2
-WHERE numeropost=9 ORDER BY numreponse ASC;
-DROP TABLE t1,t2;
-create table t1(a int, unique(a));
-insert into t1 values(2);
-create table t2(a int);
-insert into t2 values(1),(2);
-reset master;
-insert into t1 select * from t2;
-ERROR 23000: Duplicate entry '2' for key 1
-show binlog events;
-select * from t1;
-a
-1
-2
-drop table t1, t2;
-create table t1(a int);
-insert into t1 values(1),(1);
-reset master;
-create table t2(unique(a)) select a from t1;
-ERROR 23000: Duplicate entry '1' for key 1
-show binlog events;
-drop table t1;
-create table t1 (a int not null);
-create table t2 (a int not null);
-insert into t1 values (1);
-insert into t1 values (a+2);
-insert into t1 values (a+3);
-insert into t1 values (4),(a+5);
-insert into t1 select * from t1;
-select * from t1;
-a
-1
-2
-3
-4
-5
-1
-2
-3
-4
-5
-insert into t1 select * from t1 as t2;
-select * from t1;
-a
-1
-2
-3
-4
-5
-1
-2
-3
-4
-5
-1
-2
-3
-4
-5
-1
-2
-3
-4
-5
-insert into t2 select * from t1 as t2;
-select * from t1;
-a
-1
-2
-3
-4
-5
-1
-2
-3
-4
-5
-1
-2
-3
-4
-5
-1
-2
-3
-4
-5
-insert into t1 select t2.a from t1,t2;
-select * from t1;
-a
-1
-2
-3
-4
-5
-1
-2
-3
-4
-5
-1
-2
-3
-4
-5
-1
-2
-3
-4
-5
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-3
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-4
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-5
-insert into t1 select * from t1,t1;
-ERROR 42000: Not unique table/alias: 't1'
-drop table t1,t2;
-create table t1 (a int not null primary key, b char(10));
-create table t2 (a int not null, b char(10));
-insert into t1 values (1,"t1:1"),(3,"t1:3");
-insert into t2 values (2,"t2:2"), (3,"t2:3");
-insert into t1 select * from t2;
-ERROR 23000: Duplicate entry '3' for key 1
-select * from t1;
-a	b
-1	t1:1
-3	t1:3
-2	t2:2
-replace into t1 select * from t2;
-select * from t1;
-a	b
-1	t1:1
-3	t2:3
-2	t2:2
-drop table t1,t2;
-CREATE TABLE t1 ( USID INTEGER UNSIGNED, ServerID TINYINT UNSIGNED, State ENUM ('unknown', 'Access-Granted', 'Session-Active', 'Session-Closed' ) NOT NULL DEFAULT 'unknown', SessionID CHAR(32), User CHAR(32) NOT NULL DEFAULT '<UNKNOWN>', NASAddr INTEGER UNSIGNED, NASPort INTEGER UNSIGNED, NASPortType INTEGER UNSIGNED, ConnectSpeed INTEGER UNSIGNED, CarrierType CHAR(32), CallingStationID CHAR(32), CalledStationID CHAR(32), AssignedAddr INTEGER UNSIGNED, SessionTime INTEGER UNSIGNED, PacketsIn INTEGER UNSIGNED, OctetsIn INTEGER UNSIGNED, PacketsOut INTEGER UNSIGNED, OctetsOut INTEGER UNSIGNED, TerminateCause INTEGER UNSIGNED, UnauthTime TINYINT UNSIGNED, AccessRequestTime DATETIME, AcctStartTime DATETIME, AcctLastTime DATETIME, LastModification TIMESTAMP NOT NULL);
-CREATE TABLE t2 ( USID INTEGER UNSIGNED AUTO_INCREMENT, ServerID TINYINT UNSIGNED, State ENUM ('unknown', 'Access-Granted', 'Session-Active', 'Session-Closed' ) NOT NULL DEFAULT 'unknown', SessionID CHAR(32), User TEXT NOT NULL, NASAddr INTEGER UNSIGNED, NASPort INTEGER UNSIGNED, NASPortType INTEGER UNSIGNED, ConnectSpeed INTEGER UNSIGNED, CarrierType CHAR(32), CallingStationID CHAR(32), CalledStationID CHAR(32), AssignedAddr INTEGER UNSIGNED, SessionTime INTEGER UNSIGNED, PacketsIn INTEGER UNSIGNED, OctetsIn INTEGER UNSIGNED, PacketsOut INTEGER UNSIGNED, OctetsOut INTEGER UNSIGNED, TerminateCause INTEGER UNSIGNED, UnauthTime TINYINT UNSIGNED, AccessRequestTime DATETIME, AcctStartTime DATETIME, AcctLastTime DATETIME, LastModification TIMESTAMP NOT NULL, INDEX(USID,ServerID,NASAddr,SessionID), INDEX(AssignedAddr));
-INSERT INTO t1 VALUES (39,42,'Access-Granted','46','491721000045',2130706433,17690,NULL,NULL,'Localnet','491721000045','49172200000',754974766,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2003-07-18 00:11:21',NULL,NULL,20030718001121);
-INSERT INTO t2 SELECT USID, ServerID, State, SessionID, User, NASAddr, NASPort, NASPortType, ConnectSpeed, CarrierType, CallingStationID, CalledStationID, AssignedAddr, SessionTime, PacketsIn, OctetsIn, PacketsOut, OctetsOut, TerminateCause, UnauthTime, AccessRequestTime, AcctStartTime, AcctLastTime, LastModification from t1 LIMIT 1;
-drop table t1,t2;
-CREATE TABLE t1(
-Month date NOT NULL,
-Type tinyint(3) unsigned NOT NULL auto_increment,
-Field int(10) unsigned NOT NULL,
-Count int(10) unsigned NOT NULL,
-UNIQUE KEY Month (Month,Type,Field)
-);
-insert into t1 Values
-(20030901, 1, 1, 100),
-(20030901, 1, 2, 100),
-(20030901, 2, 1, 100),
-(20030901, 2, 2, 100),
-(20030901, 3, 1, 100);
-select * from t1;
-Month	Type	Field	Count
-2003-09-01	1	1	100
-2003-09-01	1	2	100
-2003-09-01	2	1	100
-2003-09-01	2	2	100
-2003-09-01	3	1	100
-Select null, Field, Count From t1 Where Month=20030901 and Type=2;
-NULL	Field	Count
-NULL	1	100
-NULL	2	100
-create table t2(No int not null, Field int not null, Count int not null);
-insert into t2 Select null, Field, Count From t1 Where Month=20030901 and Type=2;
-Warnings:
-Warning	1263	Data truncated; NULL supplied to NOT NULL column 'No' at row 1
-Warning	1263	Data truncated; NULL supplied to NOT NULL column 'No' at row 2
-select * from t2;
-No	Field	Count
-0	1	100
-0	2	100
-drop table t1, t2;
-CREATE TABLE t1 (
-ID           int(11) NOT NULL auto_increment,
-NO           int(11) NOT NULL default '0',
-SEQ          int(11) NOT NULL default '0',
-PRIMARY KEY  (ID),
-KEY t1$NO    (SEQ,NO)
-) ENGINE=MyISAM;
-INSERT INTO t1 (SEQ, NO) SELECT "1" AS SEQ, IF(MAX(NO) IS NULL, 0, MAX(NO)) + 1 AS NO FROM t1 WHERE (SEQ = 1);
-select SQL_BUFFER_RESULT * from t1 WHERE (SEQ = 1);
-ID	NO	SEQ
-1	1	1
-drop table t1;

mysql-test/r/join_outer.result

@@ -864,3 +864,22 @@ a	b	a	b
 3	1	NULL	NULL
 4	2	NULL	NULL
 DROP TABLE t1,t2;
+set group_concat_max_len=5;
+create table t1 (a int, b varchar(20));
+create table t2 (a int, c varchar(20));
+insert into t1 values (1,"aaaaaaaaaa"),(2,"bbbbbbbbbb");
+insert into t2 values (1,"cccccccccc"),(2,"dddddddddd");
+select group_concat(t1.b,t2.c) from t1 left join t2 using(a) group by t1.a;
+group_concat(t1.b,t2.c)
+aaaaa
+bbbbb
+Warnings:
+Warning	1260	2 line(s) were cut by GROUP_CONCAT()
+select group_concat(t1.b,t2.c) from t1 inner join t2 using(a) group by t1.a;
+group_concat(t1.b,t2.c)
+aaaaa
+bbbbb
+Warnings:
+Warning	1260	2 line(s) were cut by GROUP_CONCAT()
+drop table t1, t2;
+set group_concat_max_len=default;

mysql-test/r/kill.result

@@ -5,6 +5,14 @@ select ((@id := kill_id) - kill_id) from t1;
 ((@id := kill_id) - kill_id)
 0
 kill @id;
+select 1;
+ERROR HY000: MySQL server has gone away
+select ((@id := kill_id) - kill_id) from t1;
+((@id := kill_id) - kill_id)
+0
+select @id != connection_id();
+@id != connection_id()
+1
 select 4;
 4
 4

mysql-test/r/myisam-blob.result.es

-drop table if exists t1;
-CREATE TABLE t1 (data LONGBLOB) ENGINE=myisam;
-INSERT INTO t1 (data) VALUES (NULL);
-UPDATE t1 set data=repeat('a',18*1024*1024);
-Warnings:
-Warning	1301	Result of repeat() was larger than max_allowed_packet (24) - truncated
-select length(data) from t1;
-length(data)
-NULL
-delete from t1 where left(data,1)='a';
-check table t1;
-Table	Op	Msg_type	Msg_text
-test.t1	check	status	OK
-truncate table t1;
-INSERT INTO t1 (data) VALUES (repeat('a',1*1024*1024));
-Warnings:
-Warning	1301	Result of repeat() was larger than max_allowed_packet (24) - truncated
-INSERT INTO t1 (data) VALUES (repeat('b',16*1024*1024-1024));
-Warnings:
-Warning	1301	Result of repeat() was larger than max_allowed_packet (24) - truncated
-delete from t1 where left(data,1)='b';
-check table t1;
-Table	Op	Msg_type	Msg_text
-test.t1	check	status	OK
-UPDATE t1 set data=repeat('c',17*1024*1024);
-Warnings:
-Warning	1301	Result of repeat() was larger than max_allowed_packet (24) - truncated
-Warning	1301	Result of repeat() was larger than max_allowed_packet (24) - truncated
-check table t1;
-Table	Op	Msg_type	Msg_text
-test.t1	check	status	OK
-delete from t1 where left(data,1)='c';
-check table t1;
-Table	Op	Msg_type	Msg_text
-test.t1	check	status	OK
-INSERT INTO t1 set data=repeat('a',18*1024*1024);
-Warnings:
-Warning	1301	Result of repeat() was larger than max_allowed_packet (24) - truncated
-select length(data) from t1;
-length(data)
-NULL
-NULL
-NULL
-alter table t1 modify data blob;
-select length(data) from t1;
-length(data)
-NULL
-NULL
-NULL
-drop table t1;
-CREATE TABLE t1 (data BLOB) ENGINE=myisam;
-INSERT INTO t1 (data) VALUES (NULL);
-UPDATE t1 set data=repeat('a',18*1024*1024);
-Warnings:
-Warning	1301	Result of repeat() was larger than max_allowed_packet (24) - truncated
-select length(data) from t1;
-length(data)
-NULL
-drop table t1;

mysql-test/r/packet.result.es

-set global max_allowed_packet=100;
-set max_allowed_packet=100;
-set global net_buffer_length=100;
-set net_buffer_length=100;
-SELECT length("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") as len;
-len
-1024
-select repeat('a',2000);
-repeat('a',2000)
-NULL
-Warnings:
-Warning	1301	Result of repeat() was larger than max_allowed_packet (1024) - truncated
-select @@net_buffer_length, @@max_allowed_packet;
-@@net_buffer_length	@@max_allowed_packet
-1024	1024
-SELECT length("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") as len;
-set global max_allowed_packet=default;
-set max_allowed_packet=default;
-set global net_buffer_length=default;
-set net_buffer_length=default;
-SELECT length("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") as len;
-len
-100
-select length(repeat('a',2000));
-length(repeat('a',2000))
-2000

mysql-test/r/ps_1general.result

@@ -289,10 +289,6 @@ Variable_name	Value
 sql_mode	
 prepare stmt4 from ' show engine bdb logs ';
 execute stmt4;
-prepare stmt4 from ' show full processlist ';
-execute stmt4;
-Id	User	Host	db	Command	Time	State	Info
-number	root	localhost	test	Query	time	NULL	show full processlist
 prepare stmt4 from ' show grants for user ';
 prepare stmt4 from ' show create table t2 ';
 ERROR HY000: This command is not supported in the prepared statement protocol yet
@@ -808,81 +804,3 @@ execute stmt1 ;
 prepare stmt1 from ' select * from t5 ' ;
 execute stmt1 ;
 drop table t5 ;
-test_sequence
------- grant/revoke/drop affects a parallel session test ------
-show grants for second_user@localhost ;
-ERROR 42000: There is no such grant defined for user 'second_user' on host 'localhost'
-create database mysqltest;
-use mysqltest;
-use test;
-grant usage on mysqltest.* to second_user@localhost
-identified by 'looser' ;
-grant select on mysqltest.t9 to second_user@localhost
-identified by 'looser' ;
-show grants for second_user@localhost ;
-Grants for second_user@localhost
-GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
-GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
-select current_user();
-current_user()
-second_user@localhost
-show grants for current_user();
-Grants for second_user@localhost
-GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
-GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
-prepare s_t9 from 'select c1 as my_col 
-                                 from t9 where c1= 1' ;
-execute s_t9 ;
-my_col
-1
-select a as my_col from t1;
-ERROR 42000: SELECT command denied to user 'second_user'@'localhost' for table 't1'
-grant select on mysqltest.t1 to second_user@localhost
-identified by 'looser' ;
-show grants for second_user@localhost ;
-Grants for second_user@localhost
-GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
-GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
-GRANT SELECT ON `mysqltest`.`t1` TO 'second_user'@'localhost'
-drop table mysqltest.t9 ;
-show grants for second_user@localhost ;
-Grants for second_user@localhost
-GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
-GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
-GRANT SELECT ON `mysqltest`.`t1` TO 'second_user'@'localhost'
-show grants for second_user@localhost ;
-Grants for second_user@localhost
-GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
-GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
-GRANT SELECT ON `mysqltest`.`t1` TO 'second_user'@'localhost'
-prepare s_t1 from 'select a as my_col from t1' ;
-execute s_t1 ;
-my_col
-1
-2
-3
-4
-execute s_t9 ;
-ERROR 42S02: Table 'mysqltest.t9' doesn't exist
-revoke all privileges on mysqltest.t1 from second_user@localhost
-identified by 'looser' ;
-show grants for second_user@localhost ;
-Grants for second_user@localhost
-GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
-GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
-show grants for second_user@localhost ;
-Grants for second_user@localhost
-GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
-GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
-execute s_t1 ;
-ERROR 42000: SELECT command denied to user 'second_user'@'localhost' for table 't1'
-revoke all privileges, grant option from second_user@localhost ;
-show grants for second_user@localhost ;
-Grants for second_user@localhost
-GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
-drop user second_user@localhost ;
-commit ;
-show grants for second_user@localhost ;
-ERROR 42000: There is no such grant defined for user 'second_user' on host 'localhost'
-drop table t1,t9 ;
-drop database mysqltest;

mysql-test/r/ps_grant.result

+prepare stmt4 from ' show full processlist ';
+execute stmt4;
+Id	User	Host	db	Command	Time	State	Info
+number	root	localhost	test	Query	time	NULL	show full processlist
+test_sequence
+------ grant/revoke/drop affects a parallel session test ------
+show grants for second_user@localhost ;
+ERROR 42000: There is no such grant defined for user 'second_user' on host 'localhost'
+create database mysqltest;
+use mysqltest;
+use test;
+grant usage on mysqltest.* to second_user@localhost
+identified by 'looser' ;
+grant select on mysqltest.t9 to second_user@localhost
+identified by 'looser' ;
+show grants for second_user@localhost ;
+Grants for second_user@localhost
+GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
+GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
+select current_user();
+current_user()
+second_user@localhost
+show grants for current_user();
+Grants for second_user@localhost
+GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
+GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
+prepare s_t9 from 'select c1 as my_col 
+                                 from t9 where c1= 1' ;
+execute s_t9 ;
+my_col
+1
+select a as my_col from t1;
+ERROR 42000: SELECT command denied to user 'second_user'@'localhost' for table 't1'
+grant select on mysqltest.t1 to second_user@localhost
+identified by 'looser' ;
+show grants for second_user@localhost ;
+Grants for second_user@localhost
+GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
+GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
+GRANT SELECT ON `mysqltest`.`t1` TO 'second_user'@'localhost'
+drop table mysqltest.t9 ;
+show grants for second_user@localhost ;
+Grants for second_user@localhost
+GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
+GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
+GRANT SELECT ON `mysqltest`.`t1` TO 'second_user'@'localhost'
+show grants for second_user@localhost ;
+Grants for second_user@localhost
+GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
+GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
+GRANT SELECT ON `mysqltest`.`t1` TO 'second_user'@'localhost'
+prepare s_t1 from 'select a as my_col from t1' ;
+execute s_t1 ;
+my_col
+1
+2
+3
+4
+execute s_t9 ;
+ERROR 42S02: Table 'mysqltest.t9' doesn't exist
+revoke all privileges on mysqltest.t1 from second_user@localhost
+identified by 'looser' ;
+show grants for second_user@localhost ;
+Grants for second_user@localhost
+GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
+GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
+show grants for second_user@localhost ;
+Grants for second_user@localhost
+GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
+GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
+execute s_t1 ;
+ERROR 42000: SELECT command denied to user 'second_user'@'localhost' for table 't1'
+revoke all privileges, grant option from second_user@localhost ;
+show grants for second_user@localhost ;
+Grants for second_user@localhost
+GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
+drop user second_user@localhost ;
+commit ;
+show grants for second_user@localhost ;
+ERROR 42000: There is no such grant defined for user 'second_user' on host 'localhost'
+drop database mysqltest;

mysql-test/r/rpl_variables.result

+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+set global slave_net_timeout=100;
+set global sql_slave_skip_counter=100;

mysql-test/r/select.result

@@ -2033,20 +2033,20 @@ show tables from test like "t?";
 Tables_in_test (t?)
 show full columns from t2;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-auto	int(11)	NULL		PRI	NULL	auto_increment	select,insert,update,references	
-fld1	int(6) unsigned zerofill	NULL		UNI	000000		select,insert,update,references	
-companynr	tinyint(2) unsigned zerofill	NULL			00		select,insert,update,references	
-fld3	char(30)	latin1_swedish_ci		MUL			select,insert,update,references	
-fld4	char(35)	latin1_swedish_ci					select,insert,update,references	
-fld5	char(35)	latin1_swedish_ci					select,insert,update,references	
-fld6	char(4)	latin1_swedish_ci					select,insert,update,references	
+auto	int(11)	NULL		PRI	NULL	auto_increment	#	
+fld1	int(6) unsigned zerofill	NULL		UNI	000000		#	
+companynr	tinyint(2) unsigned zerofill	NULL			00		#	
+fld3	char(30)	latin1_swedish_ci		MUL			#	
+fld4	char(35)	latin1_swedish_ci					#	
+fld5	char(35)	latin1_swedish_ci					#	
+fld6	char(4)	latin1_swedish_ci					#	
 show full columns from t2 from test like 'f%';
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-fld1	int(6) unsigned zerofill	NULL		UNI	000000		select,insert,update,references	
-fld3	char(30)	latin1_swedish_ci		MUL			select,insert,update,references	
-fld4	char(35)	latin1_swedish_ci					select,insert,update,references	
-fld5	char(35)	latin1_swedish_ci					select,insert,update,references	
-fld6	char(4)	latin1_swedish_ci					select,insert,update,references	
+fld1	int(6) unsigned zerofill	NULL		UNI	000000		#	
+fld3	char(30)	latin1_swedish_ci		MUL			#	
+fld4	char(35)	latin1_swedish_ci					#	
+fld5	char(35)	latin1_swedish_ci					#	
+fld6	char(4)	latin1_swedish_ci					#	
 show full columns from t2 from test like 's%';
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
 show keys from t2;

mysql-test/r/timezone2.result

@@ -251,58 +251,6 @@ select convert_tz(ts, @@time_zone, 'Japan') from t1;
 convert_tz(ts, @@time_zone, 'Japan')
 2001-09-09 10:46:40
 drop table t1;
-delete from mysql.user where user like 'mysqltest\_%';
-delete from mysql.db where user like 'mysqltest\_%';
-delete from mysql.tables_priv where user like 'mysqltest\_%';
-delete from mysql.columns_priv where user like 'mysqltest\_%';
-flush privileges;
-create table t1 (a int, b datetime);
-create table t2 (c int, d datetime);
-grant all privileges on test.* to mysqltest_1@localhost;
-show grants for current_user();
-Grants for mysqltest_1@localhost
-GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
-GRANT ALL PRIVILEGES ON `test`.* TO 'mysqltest_1'@'localhost'
-set time_zone= '+00:00';
-set time_zone= 'Europe/Moscow';
-select convert_tz('2004-10-21 19:00:00', 'Europe/Moscow', 'UTC');
-convert_tz('2004-10-21 19:00:00', 'Europe/Moscow', 'UTC')
-2004-10-21 15:00:00
-select convert_tz(b, 'Europe/Moscow', 'UTC') from t1;
-convert_tz(b, 'Europe/Moscow', 'UTC')
-update t1, t2 set t1.b = convert_tz('2004-10-21 19:00:00', 'Europe/Moscow', 'UTC')
-where t1.a = t2.c and t2.d = (select max(d) from t2);
-select * from mysql.time_zone_name;
-ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'mysql'
-select Name, convert_tz('2004-10-21 19:00:00', Name, 'UTC') from mysql.time_zone_name;
-ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'mysql'
-delete from mysql.db where user like 'mysqltest\_%';
-flush privileges;
-grant all privileges on test.t1 to mysqltest_1@localhost;
-grant all privileges on test.t2 to mysqltest_1@localhost;
-show grants for current_user();
-Grants for mysqltest_1@localhost
-GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
-GRANT ALL PRIVILEGES ON `test`.`t2` TO 'mysqltest_1'@'localhost'
-GRANT ALL PRIVILEGES ON `test`.`t1` TO 'mysqltest_1'@'localhost'
-set time_zone= '+00:00';
-set time_zone= 'Europe/Moscow';
-select convert_tz('2004-11-31 12:00:00', 'Europe/Moscow', 'UTC');
-convert_tz('2004-11-31 12:00:00', 'Europe/Moscow', 'UTC')
-2004-12-01 09:00:00
-select convert_tz(b, 'Europe/Moscow', 'UTC') from t1;
-convert_tz(b, 'Europe/Moscow', 'UTC')
-update t1, t2 set t1.b = convert_tz('2004-11-30 12:00:00', 'Europe/Moscow', 'UTC')
-where t1.a = t2.c and t2.d = (select max(d) from t2);
-select * from mysql.time_zone_name;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'
-select Name, convert_tz('2004-11-30 12:00:00', Name, 'UTC') from mysql.time_zone_name;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'
-delete from mysql.user where user like 'mysqltest\_%';
-delete from mysql.db where user like 'mysqltest\_%';
-delete from mysql.tables_priv where user like 'mysqltest\_%';
-flush privileges;
-drop table t1, t2;
 select convert_tz('2005-01-14 17:00:00', 'UTC', custTimeZone) from (select 'UTC' as custTimeZone) as tmp;
 convert_tz('2005-01-14 17:00:00', 'UTC', custTimeZone)
 2005-01-14 17:00:00

mysql-test/r/timezone_grant.result

+delete from mysql.user where user like 'mysqltest\_%';
+delete from mysql.db where user like 'mysqltest\_%';
+delete from mysql.tables_priv where user like 'mysqltest\_%';
+delete from mysql.columns_priv where user like 'mysqltest\_%';
+flush privileges;
+create table t1 (a int, b datetime);
+create table t2 (c int, d datetime);
+grant all privileges on test.* to mysqltest_1@localhost;
+show grants for current_user();
+Grants for mysqltest_1@localhost
+GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
+GRANT ALL PRIVILEGES ON `test`.* TO 'mysqltest_1'@'localhost'
+set time_zone= '+00:00';
+set time_zone= 'Europe/Moscow';
+select convert_tz('2004-10-21 19:00:00', 'Europe/Moscow', 'UTC');
+convert_tz('2004-10-21 19:00:00', 'Europe/Moscow', 'UTC')
+2004-10-21 15:00:00
+select convert_tz(b, 'Europe/Moscow', 'UTC') from t1;
+convert_tz(b, 'Europe/Moscow', 'UTC')
+update t1, t2 set t1.b = convert_tz('2004-10-21 19:00:00', 'Europe/Moscow', 'UTC')
+where t1.a = t2.c and t2.d = (select max(d) from t2);
+select * from mysql.time_zone_name;
+ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'mysql'
+select Name, convert_tz('2004-10-21 19:00:00', Name, 'UTC') from mysql.time_zone_name;
+ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'mysql'
+delete from mysql.db where user like 'mysqltest\_%';
+flush privileges;
+grant all privileges on test.t1 to mysqltest_1@localhost;
+grant all privileges on test.t2 to mysqltest_1@localhost;
+show grants for current_user();
+Grants for mysqltest_1@localhost
+GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
+GRANT ALL PRIVILEGES ON `test`.`t2` TO 'mysqltest_1'@'localhost'
+GRANT ALL PRIVILEGES ON `test`.`t1` TO 'mysqltest_1'@'localhost'
+set time_zone= '+00:00';
+set time_zone= 'Europe/Moscow';
+select convert_tz('2004-11-31 12:00:00', 'Europe/Moscow', 'UTC');
+convert_tz('2004-11-31 12:00:00', 'Europe/Moscow', 'UTC')
+2004-12-01 09:00:00
+select convert_tz(b, 'Europe/Moscow', 'UTC') from t1;
+convert_tz(b, 'Europe/Moscow', 'UTC')
+update t1, t2 set t1.b = convert_tz('2004-11-30 12:00:00', 'Europe/Moscow', 'UTC')
+where t1.a = t2.c and t2.d = (select max(d) from t2);
+select * from mysql.time_zone_name;
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'
+select Name, convert_tz('2004-11-30 12:00:00', Name, 'UTC') from mysql.time_zone_name;
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'
+delete from mysql.user where user like 'mysqltest\_%';
+delete from mysql.db where user like 'mysqltest\_%';
+delete from mysql.tables_priv where user like 'mysqltest\_%';
+flush privileges;
+drop table t1, t2;

mysql-test/r/type_blob.result

@@ -70,17 +70,17 @@ update t1 set c="",b=null where c="1";
 lock tables t1 READ;
 show full fields from t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-t	text	latin1_swedish_ci	YES		NULL		select,insert,update,references	
-c	varchar(10)	latin1_swedish_ci	YES		NULL		select,insert,update,references	
-b	blob	NULL	YES		NULL		select,insert,update,references	
-d	varbinary(10)	NULL	YES		NULL		select,insert,update,references	
+t	text	latin1_swedish_ci	YES		NULL		#	
+c	varchar(10)	latin1_swedish_ci	YES		NULL		#	
+b	blob	NULL	YES		NULL		#	
+d	varbinary(10)	NULL	YES		NULL		#	
 lock tables t1 WRITE;
 show full fields from t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-t	text	latin1_swedish_ci	YES		NULL		select,insert,update,references	
-c	varchar(10)	latin1_swedish_ci	YES		NULL		select,insert,update,references	
-b	blob	NULL	YES		NULL		select,insert,update,references	
-d	varbinary(10)	NULL	YES		NULL		select,insert,update,references	
+t	text	latin1_swedish_ci	YES		NULL		#	
+c	varchar(10)	latin1_swedish_ci	YES		NULL		#	
+b	blob	NULL	YES		NULL		#	
+d	varbinary(10)	NULL	YES		NULL		#	
 unlock tables;
 select t from t1 where t like "hello";
 t
@@ -513,10 +513,10 @@ select if(imagem is null, "ERROR", "OK"),length(imagem) from t1 where id = 1;
 if(imagem is null, "ERROR", "OK")	length(imagem)
 OK	581
 drop table t1;
-create table t1 select load_file('../../std_data/words.dat');
+create table t1 select load_file('../../std_data/words.dat') l;
 show full fields from t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-load_file('../../std_data/words.dat')	longblob	NULL	YES		NULL		select,insert,update,references	
+l	longblob	NULL	YES		NULL		#	
 drop table t1;
 create table t1 (id integer primary key auto_increment, txt text not null, unique index txt_index (txt (20)));
 insert into t1 (txt) values ('Chevy'), ('Chevy ');

mysql-test/r/type_float.result

@@ -20,8 +20,8 @@ SELECT 2147483647E+02,21474836.47E+06;
 create table t1 (f1 float(24),f2 float(52));
 show full columns from t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-f1	float	NULL	YES		NULL		select,insert,update,references	
-f2	double	NULL	YES		NULL		select,insert,update,references	
+f1	float	NULL	YES		NULL		#	
+f2	double	NULL	YES		NULL		#	
 insert into t1 values(10,10),(1e+5,1e+5),(1234567890,1234567890),(1e+10,1e+10),(1e+15,1e+15),(1e+20,1e+20),(1e+50,1e+50),(1e+150,1e+150);
 Warnings:
 Warning	1264	Data truncated; out of range for column 'f1' at row 7
@@ -106,18 +106,18 @@ drop table t1;
 create table t1 (f float, f2 float(24), f3 float(6,2), d double, d2 float(53), d3 double(10,3), de decimal, de2 decimal(6), de3 decimal(5,2), n numeric, n2 numeric(8), n3 numeric(5,6));
 show full columns from t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-f	float	NULL	YES		NULL		select,insert,update,references	
-f2	float	NULL	YES		NULL		select,insert,update,references	
-f3	float(6,2)	NULL	YES		NULL		select,insert,update,references	
-d	double	NULL	YES		NULL		select,insert,update,references	
-d2	double	NULL	YES		NULL		select,insert,update,references	
-d3	double(10,3)	NULL	YES		NULL		select,insert,update,references	
-de	decimal(10,0)	NULL	YES		NULL		select,insert,update,references	
-de2	decimal(6,0)	NULL	YES		NULL		select,insert,update,references	
-de3	decimal(5,2)	NULL	YES		NULL		select,insert,update,references	
-n	decimal(10,0)	NULL	YES		NULL		select,insert,update,references	
-n2	decimal(8,0)	NULL	YES		NULL		select,insert,update,references	
-n3	decimal(7,6)	NULL	YES		NULL		select,insert,update,references	
+f	float	NULL	YES		NULL		#	
+f2	float	NULL	YES		NULL		#	
+f3	float(6,2)	NULL	YES		NULL		#	
+d	double	NULL	YES		NULL		#	
+d2	double	NULL	YES		NULL		#	
+d3	double(10,3)	NULL	YES		NULL		#	
+de	decimal(10,0)	NULL	YES		NULL		#	
+de2	decimal(6,0)	NULL	YES		NULL		#	
+de3	decimal(5,2)	NULL	YES		NULL		#	
+n	decimal(10,0)	NULL	YES		NULL		#	
+n2	decimal(8,0)	NULL	YES		NULL		#	
+n3	decimal(7,6)	NULL	YES		NULL		#	
 drop table t1;
 create table t1 (a  decimal(7,3) not null, key (a));
 insert into t1 values ("0"),("-0.00"),("-0.01"),("-0.002"),("1");

mysql-test/r/type_float.result.es

-drop table if exists t1;
-SELECT 10,10.0,10.,.1e+2,100.0e-1;
-10	10.0	10.	.1e+2	100.0e-1
-10	10.0	10	10	10
-SELECT 6e-05, -6e-05, --6e-05, -6e-05+1.000000;
-6e-05	-6e-05	--6e-05	-6e-05+1.000000
-6e-05	-6e-05	6e-05	0.99994
-SELECT 1e1,1.e1,1.0e1,1e+1,1.e+1,1.0e+1,1e-1,1.e-1,1.0e-1;
-1e1	1.e1	1.0e1	1e+1	1.e+1	1.0e+1	1e-1	1.e-1	1.0e-1
-10	10	10	10	10	10	0.1	0.1	0.1
-create table t1 (f1 float(24),f2 float(52));
-show full columns from t1;
-Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-f1	float	NULL	YES		NULL			
-f2	double	NULL	YES		NULL			
-insert into t1 values(10,10),(1e+5,1e+5),(1234567890,1234567890),(1e+10,1e+10),(1e+15,1e+15),(1e+20,1e+20),(1e+50,1e+50),(1e+150,1e+150);
-Warnings:
-Warning	1264	Data truncated; out of range for column 'f1' at row 7
-Warning	1264	Data truncated; out of range for column 'f1' at row 8
-insert into t1 values(-10,-10),(1e-5,1e-5),(1e-10,1e-10),(1e-15,1e-15),(1e-20,1e-20),(1e-50,1e-50),(1e-150,1e-150);
-select * from t1;
-f1	f2
-10	10
-100000	100000
-1.23457e+9	1234567890
-1e+10	10000000000
-1e+15	1e+15
-1e+20	1e+20
-3.40282e+38	1e+50
-3.40282e+38	1e+150
--10	-10
-1e-5	1e-5
-1e-10	1e-10
-1e-15	1e-15
-1e-20	1e-20
-0	1e-50
-0	1e-150
-drop table t1;
-create table t1 (datum double);
-insert into t1 values (0.5),(1.0),(1.5),(2.0),(2.5);
-select * from t1;
-datum
-0.5
-1
-1.5
-2
-2.5
-select * from t1 where datum < 1.5;
-datum
-0.5
-1
-select * from t1 where datum > 1.5;
-datum
-2
-2.5
-select * from t1 where datum = 1.5;
-datum
-1.5
-drop table t1;
-create table t1 (a  decimal(7,3) not null, key (a));
-insert into t1 values ("0"),("-0.00"),("-0.01"),("-0.002"),("1");
-select a from t1 order by a;
-a
--0.010
--0.002
--0.000
-0.000
-1.000
-select min(a) from t1;
-min(a)
--0.010
-drop table t1;
-create table t1 (c1 double, c2 varchar(20));
-insert t1 values (121,"16");
-select c1 + c1 * (c2 / 100) as col from t1;
-col
-140.36
-create table t2 select c1 + c1 * (c2 / 100) as col1, round(c1, 5) as col2, round(c1, 35) as col3, sqrt(c1*1e-15) col4 from t1;
-select * from t2;
-col1	col2	col3	col4
-140.36	121.00000	121	3.47850542618522e-07
-show create table t2;
-Table	Create Table
-t2	CREATE TABLE `t2` (
-  `col1` double default NULL,
-  `col2` double(22,5) default NULL,
-  `col3` double default NULL,
-  `col4` double default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-drop table t1,t2;
-create table t1 (a float);
-insert into t1 values (1);
-select max(a),min(a),avg(a) from t1;
-max(a)	min(a)	avg(a)
-1	1	1
-drop table t1;
-create table t1 (f float, f2 float(24), f3 float(6,2), d double, d2 float(53), d3 double(10,3), de decimal, de2 decimal(6), de3 decimal(5,2), n numeric, n2 numeric(8), n3 numeric(5,6));
-show full columns from t1;
-Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-f	float	NULL	YES		NULL			
-f2	float	NULL	YES		NULL			
-f3	float(6,2)	NULL	YES		NULL			
-d	double	NULL	YES		NULL			
-d2	double	NULL	YES		NULL			
-d3	double(10,3)	NULL	YES		NULL			
-de	decimal(10,0)	NULL	YES		NULL			
-de2	decimal(6,0)	NULL	YES		NULL			
-de3	decimal(5,2)	NULL	YES		NULL			
-n	decimal(10,0)	NULL	YES		NULL			
-n2	decimal(8,0)	NULL	YES		NULL			
-n3	decimal(7,6)	NULL	YES		NULL			
-drop table t1;
-create table t1 (a  decimal(7,3) not null, key (a));
-insert into t1 values ("0"),("-0.00"),("-0.01"),("-0.002"),("1");
-select a from t1 order by a;
-a
--0.010
--0.002
--0.000
-0.000
-1.000
-select min(a) from t1;
-min(a)
--0.010
-drop table t1;
-create table t1 (a float(200,100), b double(200,100));
-insert t1 values (1.0, 2.0);
-select * from t1;
-a	b
-1.000000000000000000000000000000	2.000000000000000000000000000000
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` float(200,30) default NULL,
-  `b` double(200,30) default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-drop table t1;
-create table t1 (c20 char);
-insert into t1 values (5000.0);
-Warnings:
-Warning	1265	Data truncated for column 'c20' at row 1
-drop table t1;
-create table t1 (f float(54));
-ERROR 42000: Incorrect column specifier for column 'f'
-drop table if exists t1;
-create table t1 (d1 double, d2 double unsigned);
-insert into t1 set d1 = -1.0;
-update t1 set d2 = d1;
-Warnings:
-Warning	1264	Data truncated; out of range for column 'd2' at row 1
-select * from t1;
-d1	d2
--1	0
-drop table t1;
-create table t1 (f float(4,3));
-insert into t1 values (-11.0),(-11),("-11"),(11.0),(11),("11");
-Warnings:
-Warning	1264	Data truncated; out of range for column 'f' at row 1
-Warning	1264	Data truncated; out of range for column 'f' at row 2
-Warning	1264	Data truncated; out of range for column 'f' at row 3
-Warning	1264	Data truncated; out of range for column 'f' at row 4
-Warning	1264	Data truncated; out of range for column 'f' at row 5
-Warning	1264	Data truncated; out of range for column 'f' at row 6
-select * from t1;
-f
--9.999
--9.999
--9.999
-9.999
-9.999
-9.999
-drop table if exists t1;
-create table t1 (f double(4,3));
-insert into t1 values (-11.0),(-11),("-11"),(11.0),(11),("11");
-Warnings:
-Warning	1264	Data truncated; out of range for column 'f' at row 1
-Warning	1264	Data truncated; out of range for column 'f' at row 2
-Warning	1264	Data truncated; out of range for column 'f' at row 3
-Warning	1264	Data truncated; out of range for column 'f' at row 4
-Warning	1264	Data truncated; out of range for column 'f' at row 5
-Warning	1264	Data truncated; out of range for column 'f' at row 6
-select * from t1;
-f
--9.999
--9.999
--9.999
-9.999
-9.999
-9.999
-drop table if exists t1;
-create table t1 (c char(20));
-insert into t1 values (5e-28);
-select * from t1;
-c
-5e-28
-drop table t1;
-create table t1 (c char(6));
-insert into t1 values (2e5),(2e6),(2e-4),(2e-5);
-select * from t1;
-c
-200000
-2e+06
-0.0002
-2e-05
-drop table t1;

mysql-test/r/user_var-binlog.result

+create table t1 (a varchar(50));
+reset master;
+SET TIMESTAMP=10000;
+SET @`a b`='hello';
+INSERT INTO t1 VALUES(@`a b`);
+set @var1= "';aaa";
+SET @var2=char(ascii('a'));
+insert into t1 values (@var1),(@var2);
+show binlog events from 79;
+Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
+master-bin.000001	79	User var	1	79	@`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci
+master-bin.000001	120	Query	1	120	use `test`; INSERT INTO t1 VALUES(@`a b`)
+master-bin.000001	184	User var	1	184	@`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci
+master-bin.000001	226	User var	1	226	@`var2`=_latin1 0x61 COLLATE latin1_swedish_ci
+master-bin.000001	264	Query	1	264	use `test`; insert into t1 values (@var1),(@var2)
+/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+SET @`a b`:=_latin1 0x68656C6C6F COLLATE `latin1_swedish_ci`;
+use test;
+SET TIMESTAMP=10000;
+INSERT INTO t1 VALUES(@`a b`);
+SET @`var1`:=_latin1 0x273B616161 COLLATE `latin1_swedish_ci`;
+SET @`var2`:=_latin1 0x61 COLLATE `latin1_swedish_ci`;
+SET TIMESTAMP=10000;
+insert into t1 values (@var1),(@var2);
+drop table t1;

mysql-test/r/user_var.result

@@ -164,31 +164,6 @@ latin2	latin2_bin	2
 select (@a:=_latin2'test' collate latin2_bin) = _latin2'TEST' collate latin2_general_ci;
 (@a:=_latin2'test' collate latin2_bin) = _latin2'TEST' collate latin2_general_ci
 1
-create table t1 (a varchar(50));
-reset master;
-SET TIMESTAMP=10000;
-SET @`a b`='hello';
-INSERT INTO t1 VALUES(@`a b`);
-set @var1= "';aaa";
-SET @var2=char(ascii('a'));
-insert into t1 values (@var1),(@var2);
-show binlog events from 79;
-Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
-master-bin.000001	79	User var	1	79	@`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci
-master-bin.000001	120	Query	1	120	use `test`; INSERT INTO t1 VALUES(@`a b`)
-master-bin.000001	184	User var	1	184	@`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci
-master-bin.000001	226	User var	1	226	@`var2`=_latin1 0x61 COLLATE latin1_swedish_ci
-master-bin.000001	264	Query	1	264	use `test`; insert into t1 values (@var1),(@var2)
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
-SET @`a b`:=_latin1 0x68656C6C6F COLLATE `latin1_swedish_ci`;
-use test;
-SET TIMESTAMP=10000;
-INSERT INTO t1 VALUES(@`a b`);
-SET @`var1`:=_latin1 0x273B616161 COLLATE `latin1_swedish_ci`;
-SET @`var2`:=_latin1 0x61 COLLATE `latin1_swedish_ci`;
-SET TIMESTAMP=10000;
-insert into t1 values (@var1),(@var2);
-drop table t1;
 set @var= NULL ;
 select FIELD( @var,'1it','Hit') as my_column;
 my_column

mysql-test/r/variables.result

@@ -324,7 +324,6 @@ set read_buffer_size=100;
 set read_rnd_buffer_size=100;
 set global rpl_recovery_rank=100;
 set global server_id=100;
-set global slave_net_timeout=100;
 set global slow_launch_time=100;
 set sort_buffer_size=100;
 set sql_auto_is_null=1;
@@ -349,7 +348,6 @@ select @@sql_max_join_size,@@max_join_size;
 set sql_quote_show_create=1;
 set sql_safe_updates=1;
 set sql_select_limit=1;
-set global sql_slave_skip_counter=100;
 set sql_warnings=1;
 set global table_cache=100;
 set storage_engine=myisam;

mysql-test/t/bdb-deadlock.test

@@ -5,7 +5,7 @@
 # connection in a separate thread.
 #
 
-#-- source include/not_embedded.inc
+-- source include/not_embedded.inc
 -- source include/have_bdb.inc
 
 connect (con1,localhost,root,,);

mysql-test/t/connect.test

@@ -3,6 +3,9 @@
 # Unfortunately the check is incomplete as we can't handle errors on connect
 # Also we can't connect without database
 
+# This test makes no sense with the embedded server
+--source include/not_embedded.inc
+
 #connect (con1,localhost,root,,"");
 #show tables;
 connect (con1,localhost,root,,mysql);

mysql-test/t/drop_temp_table.test

+# Embedded server doesn't support binlog
+-- source include/not_embedded.inc
+
 connect (con1,localhost,root,,);
 connect (con2,localhost,root,,);
 connection con1;

mysql-test/t/grant2.test

+# Grant tests not performed with embedded server
+-- source include/not_embedded.inc
+
 SET NAMES binary;
 
 #