From: Jim Winstead
Date: April 2 2005 12:43am
Subject: bk commit into 4.1 tree (jimw:1.2158)
List-Archive: http://lists.mysql.com/internals/23576
Message-Id: <20050402004339.44F86A8AAE@rama.trainedmonkey.com>

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw 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.2158 05/04/01 16:43:35 jimw@stripped +18 -0
  Merge embedded-server testing changes.

  mysql-test/t/ps_1general.test
    1.14 05/04/01 16:43:33 jimw@stripped +1 -2
    Merge changes

  mysql-test/mysql-test-run.sh
    1.248 05/04/01 16:43:33 jimw@stripped +6 -0
    Merge changes

  sql/sql_select.cc
    1.393 05/04/01 16:41:50 jimw@stripped +0 -0
    Auto merged

  mysql-test/t/variables.test
    1.46 05/04/01 16:41:50 jimw@stripped +0 -0
    Auto merged

  mysql-test/t/user_var.test
    1.19 05/04/01 16:41:50 jimw@stripped +0 -0
    Auto merged

  mysql-test/t/type_float.test
    1.18 05/04/01 16:41:50 jimw@stripped +0 -0
    Auto merged

  mysql-test/t/show_check.test
    1.41 05/04/01 16:41:50 jimw@stripped +0 -0
    Auto merged

  mysql-test/t/select.test
    1.35 05/04/01 16:41:50 jimw@stripped +0 -0
    Auto merged

  mysql-test/t/mysqldump.test
    1.28 05/04/01 16:41:49 jimw@stripped +0 -0
    Auto merged

  mysql-test/t/grant2.test
    1.11 05/04/01 16:41:49 jimw@stripped +0 -0
    Auto merged

  mysql-test/t/ctype_ucs.test
    1.21 05/04/01 16:41:49 jimw@stripped +0 -0
    Auto merged

  mysql-test/r/variables.result
    1.58 05/04/01 16:41:49 jimw@stripped +0 -0
    Auto merged

  mysql-test/r/user_var.result
    1.26 05/04/01 16:41:49 jimw@stripped +0 -0
    Auto merged

  mysql-test/r/type_float.result
    1.31 05/04/01 16:41:49 jimw@stripped +0 -0
    Auto merged

  mysql-test/r/type_blob.result
    1.45 05/04/01 16:41:49 jimw@stripped +0 -0
    Auto merged

  mysql-test/r/select.result
    1.51 05/04/01 16:41:49 jimw@stripped +0 -0
    Auto merged

  mysql-test/r/ps_1general.result
    1.19 05/04/01 16:41:49 jimw@stripped +0 -0
    Auto merged

  mysql-test/r/ctype_ucs.result
    1.23 05/04/01 16:41:49 jimw@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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-clean/RESYNC

--- 1.247/mysql-test/mysql-test-run.sh	2005-03-30 17:20:39 -08:00
+++ 1.248/mysql-test/mysql-test-run.sh	2005-04-01 16:43:33 -08:00
@@ -201,7 +201,6 @@
 MASTER_RUNNING=0
 MASTER1_RUNNING=0
 MASTER_MYPORT=9306
-MASTER_MYPORT1=9307
 SLAVE_RUNNING=0
 SLAVE_MYPORT=9308 # leave room for 2 masters for cluster tests
 MYSQL_MANAGER_PORT=9305 # needs to be out of the way of slaves
@@ -218,7 +217,7 @@
 EXTRA_MYSQLDUMP_OPT=""
 EXTRA_MYSQLBINLOG_OPT=""
 USE_RUNNING_SERVER=""
-USE_NDBCLUSTER=""
+USE_NDBCLUSTER=@USE_NDBCLUSTER@
 USE_RUNNING_NDBCLUSTER=""
 USE_PURIFY=""
 PURIFY_LOGS=""
@@ -232,7 +231,7 @@
 SLEEP_TIME_FOR_FIRST_MASTER=400		# Enough time to create innodb tables
 SLEEP_TIME_FOR_SECOND_MASTER=400
 SLEEP_TIME_FOR_FIRST_SLAVE=400
-SLEEP_TIME_FOR_SECOND_SLAVE=30
+SLEEP_TIME_FOR_SECOND_SLAVE=300
 CHARACTER_SET=latin1
 DBUSER=""
 START_WAIT_TIMEOUT=10
@@ -424,6 +423,11 @@
       TMP=`$ECHO "$1" | $SED -e "s;--valgrind-options=;;"`
       VALGRIND="$VALGRIND $TMP"
       ;;
+    --skip-ndbcluster | --skip-ndb)
+      USE_NDBCLUSTER=""
+      EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-ndbcluster"
+      EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-ndbcluster"
+      ;;
     --skip-*)
       EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT $1"
       EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT $1"
@@ -442,6 +446,7 @@
        --debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysqldump.trace"
       EXTRA_MYSQLBINLOG_OPT="$EXTRA_MYSQLBINLOG_OPT \
        --debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysqlbinlog.trace"
+      EXTRA_MYSQL_CLIENT_TEST_OPT="--debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysql_client_test.trace"
       ;;
     --fast)
       FAST_START=1
@@ -679,7 +684,7 @@
   EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --user=root"
 fi
 
-MYSQL_CLIENT_TEST="$MYSQL_CLIENT_TEST --no-defaults --testcase --user=root --socket=$MASTER_MYSOCK --port=$MYSQL_TCP_PORT --silent"
+MYSQL_CLIENT_TEST="$MYSQL_CLIENT_TEST --no-defaults --testcase --user=root --socket=$MASTER_MYSOCK --port=$MYSQL_TCP_PORT --silent $EXTRA_MYSQL_CLIENT_TEST_OPT"
 MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT"
 MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR $EXTRA_MYSQLBINLOG_OPT"
 MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD --basedir=$BASEDIR --bindir=$CLIENT_BINDIR --verbose"
@@ -802,6 +807,18 @@
    $ECHO "$RES$RES_SPACE [ skipped ]"
 }
 
+
+disable_test() {
+   USERT="    ...."
+   SYST="    ...."
+   REALT="    ...."
+   pname=`$ECHO "$1                        "|$CUT -c 1-24`
+   RES="$pname"
+   skip_inc
+   $ECHO "$RES$RES_SPACE [ disabled ]  $2"
+}
+
+
 report_current_test () {
    tname=$1
    echo "CURRENT_TEST: $tname" >> $MASTER_MYERR
@@ -823,7 +840,7 @@
 	whole=`$PRINTF %.2s $raw`
 	xwhole=`$EXPR $whole \* 100`
 	deci=`$EXPR $raw - $xwhole`
-	$ECHO  "Failed ${TOT_FAIL}/${TOT_TEST} tests, ${whole}.${deci}% successful."
+	$ECHO  "Failed ${TOT_FAIL}/${TOT_TEST} tests, ${whole}.${deci}% were successful."
 	$ECHO ""
         $ECHO "The log files in $MY_LOG_DIR may give you some hint"
 	$ECHO "of what when wrong."
@@ -1108,6 +1125,8 @@
    id=`$EXPR $1 + 101`;
    this_master_myport=`$EXPR $MASTER_MYPORT + $1`
    NOT_FIRST_MASTER_EXTRA_OPTS="--skip-innodb"
+   eval "MASTER_MYPORT$1=$this_master_myport"
+   export MASTER_MYPORT$1
   else
    id=1;
    this_master_myport=$MASTER_MYPORT
@@ -1453,6 +1472,12 @@
  result_file="r/$tname.result"
  echo $tname > $CURRENT_TEST
  SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0`
+ if [ -f "$TESTDIR/$tname.disabled" ]
+ then
+   comment=`$CAT $TESTDIR/$tname.disabled`;
+   disable_test $tname "$comment"
+   return
+ fi
  if [ "$USE_MANAGER" = 1 ] ; then
   many_slaves=`$EXPR \( \( $tname : rpl_failsafe \) != 0 \) \| \( \( $tname : rpl_chain_temp_table \) != 0 \)`
  fi
@@ -1685,7 +1710,7 @@
     $MYSQLADMIN --no-defaults --socket=$MASTER_MYSOCK1 -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1
     $MYSQLADMIN --no-defaults --socket=$SLAVE_MYSOCK -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1
     $MYSQLADMIN --no-defaults --host=$hostname --port=$MASTER_MYPORT -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1
-    $MYSQLADMIN --no-defaults --host=$hostname --port=$MASTER_MYPORT1 -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1
+    $MYSQLADMIN --no-defaults --host=$hostname --port=$MASTER_MYPORT+1 -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1
     $MYSQLADMIN --no-defaults --host=$hostname --port=$SLAVE_MYPORT -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1
     $MYSQLADMIN --no-defaults --host=$hostname --port=`expr $SLAVE_MYPORT + 1` -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1
     sleep_until_file_deleted 0 $MASTER_MYPID

--- 1.392/sql/sql_select.cc	2005-03-31 23:05:14 -08:00
+++ 1.393/sql/sql_select.cc	2005-04-01 16:41:50 -08:00
@@ -4485,7 +4485,7 @@
 	  (thd->options & OPTION_AUTO_IS_NULL) &&
 	  thd->insert_id())
       {
-#ifndef EMBEDDED_LIBRARY
+#ifdef HAVE_QUERY_CACHE
 	query_cache_abort(&thd->net);
 #endif
 	COND *new_cond;

--- 1.22/mysql-test/r/ctype_ucs.result	2005-02-10 18:07:10 -08:00
+++ 1.23/mysql-test/r/ctype_ucs.result	2005-04-01 16:41:49 -08:00
@@ -598,3 +598,17 @@
 ucs2_bin	0061
 ucs2_bin	00610020
 drop table t1;
+SET NAMES latin1;
+SET collation_connection='ucs2_swedish_ci';
+CREATE TABLE t1 (Field1 int(10) default '0');
+INSERT INTO t1 VALUES ('-1');
+SELECT * FROM t1;
+Field1
+-1
+DROP TABLE t1;
+CREATE TABLE t1 (Field1 int(10) unsigned default '0');
+INSERT INTO t1 VALUES ('-1');
+Warnings:
+Warning	1265	Data truncated for column 'Field1' at row 1
+DROP TABLE t1;
+SET NAMES latin1;

--- 1.20/mysql-test/t/ctype_ucs.test	2005-02-10 18:07:03 -08:00
+++ 1.21/mysql-test/t/ctype_ucs.test	2005-04-01 16:41:49 -08:00
@@ -373,3 +373,24 @@
 SET NAMES latin1;
 SET collation_connection='ucs2_bin';
 -- source include/ctype_filesort.inc
+
+SET NAMES latin1;
+#
+# Bug#8235
+#
+# This bug also helped to find another problem that
+# INSERT of a UCS2 string containing a negative number
+# into a unsigned int column didn't produce warnings.
+# This test covers both problems.
+#
+SET collation_connection='ucs2_swedish_ci';
+CREATE TABLE t1 (Field1 int(10) default '0');
+# no warnings, negative numbers are allowed
+INSERT INTO t1 VALUES ('-1');
+SELECT * FROM t1;
+DROP TABLE t1;
+CREATE TABLE t1 (Field1 int(10) unsigned default '0');
+# this should generate a "Data truncated" warning
+INSERT INTO t1 VALUES ('-1');
+DROP TABLE t1;
+SET NAMES latin1;

--- 1.18/mysql-test/r/ps_1general.result	2005-03-26 10:49:09 -08:00
+++ 1.19/mysql-test/r/ps_1general.result	2005-04-01 16:41:49 -08:00
@@ -289,10 +289,6 @@
 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 @@
 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;

--- 1.13/mysql-test/t/ps_1general.test	2005-02-22 02:51:19 -08:00
+++ 1.14/mysql-test/t/ps_1general.test	2005-04-01 16:43:33 -08:00
@@ -317,9 +317,6 @@
 --disable_result_log
 execute stmt4;
 --enable_result_log
-prepare stmt4 from ' show full processlist ';
---replace_column 1 number 6 time 3 localhost
-execute stmt4;
 prepare stmt4 from ' show grants for user ';
 --error 1295
 prepare stmt4 from ' show create table t2 ';
@@ -600,7 +597,8 @@
 prepare stmt1 from ' rename table t5 to t6, t7 to t8 ' ;
 create table t5 (a int) ;
 # rename must fail, t7 does not exist
---replace_result \\ /
+# Clean up the filename here because embedded server reports whole path
+--replace_result \\ / $MYSQL_TEST_DIR . /var/master-data/ /
 --error 1017
 execute stmt1 ;
 create table t7 (a int) ;
@@ -842,117 +840,6 @@
 --horizontal_results
 
 drop table t5 ;
-
-
-################ GRANT/REVOKE/DROP affecting a parallel session ################
---disable_query_log
-select '------ grant/revoke/drop affects a parallel session test ------'
-  as test_sequence ;
---enable_query_log
-
-#---------------------------------------------------------------------#
-#  Here we test that:
-#  1. A new GRANT will be visible within another sessions.            #
-#                                                                     #
-#  Let's assume there is a parallel session with an already prepared  #
-#  statement for a table.                                             #
-#  A DROP TABLE will affect the EXECUTE properties.                   #
-#  A REVOKE will affect the EXECUTE properties.                       #
-#---------------------------------------------------------------------#
-
-# Who am I ?
-# this is different across different systems:
-# select current_user(), user() ;
-
-#### create a new user account ####
-## There should be no grants for that non existing user
---error 1141
-show grants for second_user@localhost ;
-## create a new user account by using GRANT statements on t9
-create database mysqltest;
-# create the tables (t1 and t9) used in many tests
-use mysqltest;
---disable_query_log
---source include/ps_create.inc
---source include/ps_renew.inc
---enable_query_log
-eval use $DB;
-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 ;
-
-
-#### establish a second session to the new user account
-connect (con3,localhost,second_user,looser,mysqltest);
-## switch to the second session
-connection con3;
-# Who am I ?
-select current_user();
-## check the access rights
-show grants for current_user();
-prepare s_t9 from 'select c1 as my_col 
-                                 from t9 where c1= 1' ;
-execute s_t9 ;
-# check that we cannot do a SELECT on the table t1;
---error 1142
-select a as my_col from t1;
-
-
-#### give access rights to t1 and drop table t9
-## switch back to the first session
-connection default;
-grant select on mysqltest.t1 to second_user@localhost
-identified by 'looser' ;
-show grants for second_user@localhost ;
-drop table mysqltest.t9 ;
-show grants for second_user@localhost ;
-
-
-#### check the access as new user
-## switch to the second session
-connection con3;
-######## Question 1: The table t1 should be now accessible. ########
-show grants for second_user@localhost ;
-prepare s_t1 from 'select a as my_col from t1' ;
-execute s_t1 ;
-######## Question 2: The table t9 does not exist. ########
---error 1146
-execute s_t9 ;
-
-
-#### revoke the access rights to t1
-## switch back to the first session
-connection default;
-revoke all privileges on mysqltest.t1 from second_user@localhost
-identified by 'looser' ;
-show grants for second_user@localhost ;
-
-#### check the access as new user
-## switch to the second session
-connection con3;
-show grants for second_user@localhost ;
-######## Question 2: The table t1 should be now not accessible. ########
---error 1142
-execute s_t1 ;
-
-## cleanup
-## switch back to the first session
-connection default;
-## disconnect the second session
-disconnect con3 ;
-## remove all rights of second_user@localhost
-revoke all privileges, grant option from second_user@localhost ;
-show grants for second_user@localhost ;
-drop user second_user@localhost ;
-commit ;
---error 1141
-show grants for second_user@localhost ;
-
-drop table t1,t9 ;
-drop database mysqltest;
-
 
 ##### RULES OF THUMB TO PRESERVE THE SYSTEMATICS OF THE PS TEST CASES #####
 #

--- 1.50/mysql-test/r/select.result	2005-03-09 06:50:57 -08:00
+++ 1.51/mysql-test/r/select.result	2005-04-01 16:41:49 -08:00
@@ -2033,20 +2033,20 @@
 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;

--- 1.44/mysql-test/r/type_blob.result	2005-03-29 02:42:55 -08:00
+++ 1.45/mysql-test/r/type_blob.result	2005-04-01 16:41:49 -08:00
@@ -70,17 +70,17 @@
 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 @@
 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 ');

--- 1.30/mysql-test/r/type_float.result	2005-02-22 02:51:19 -08:00
+++ 1.31/mysql-test/r/type_float.result	2005-04-01 16:41:49 -08:00
@@ -20,8 +20,8 @@
 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 @@
 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");

--- 1.57/mysql-test/r/variables.result	2005-02-17 03:04:00 -08:00
+++ 1.58/mysql-test/r/variables.result	2005-04-01 16:41:49 -08:00
@@ -324,7 +324,6 @@
 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 @@
 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;

--- 1.34/mysql-test/t/select.test	2005-03-09 06:50:57 -08:00
+++ 1.35/mysql-test/t/select.test	2005-04-01 16:41:50 -08:00
@@ -1742,8 +1742,12 @@
 show tables;
 show tables from test like "s%";
 show tables from test like "t?";
+# We mask out the Privileges column because it differs with embedded server
+--replace_column 8 #
 show full columns from t2;
+--replace_column 8 #
 show full columns from t2 from test like 'f%';
+--replace_column 8 #
 show full columns from t2 from test like 's%';
 show keys from t2;
 

--- 1.40/mysql-test/t/show_check.test	2005-02-28 07:49:32 -08:00
+++ 1.41/mysql-test/t/show_check.test	2005-04-01 16:41:50 -08:00
@@ -1,3 +1,7 @@
+# Requires use of multiple simultaneous connections, not supported with
+# embedded server testing
+-- source include/not_embedded.inc
+
 #
 # Test of some show commands
 #

--- 1.17/mysql-test/t/type_float.test	2005-02-22 02:51:19 -08:00
+++ 1.18/mysql-test/t/type_float.test	2005-04-01 16:41:50 -08:00
@@ -16,6 +16,8 @@
 SELECT 2147483647E+02,21474836.47E+06;
 
 create table t1 (f1 float(24),f2 float(52));
+# We mask out Privileges column because it differs for embedded server
+--replace_column 8 #
 show full columns from t1;
 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);
 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);
@@ -66,6 +68,8 @@
 #
 
 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));
+# We mask out Privileges column because it differs for embedded server
+--replace_column 8 #
 show full columns from t1;
 drop table t1;
 

--- 1.45/mysql-test/t/variables.test	2005-02-17 03:04:00 -08:00
+++ 1.46/mysql-test/t/variables.test	2005-04-01 16:41:50 -08:00
@@ -218,7 +218,6 @@
 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;
@@ -237,7 +236,6 @@
 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;

--- 1.27/mysql-test/t/mysqldump.test	2005-03-08 10:06:00 -08:00
+++ 1.28/mysql-test/t/mysqldump.test	2005-04-01 16:41:49 -08:00
@@ -1,3 +1,6 @@
+# Embedded server doesn't support external clients
+--source include/not_embedded.inc
+
 --disable_warnings
 DROP TABLE IF EXISTS t1, `"t"1`;
 --enable_warnings

--- 1.25/mysql-test/r/user_var.result	2005-03-28 01:01:53 -08:00
+++ 1.26/mysql-test/r/user_var.result	2005-04-01 16:41:49 -08:00
@@ -164,31 +164,6 @@
 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

--- 1.18/mysql-test/t/user_var.test	2005-03-28 01:01:53 -08:00
+++ 1.19/mysql-test/t/user_var.test	2005-04-01 16:41:50 -08:00
@@ -98,24 +98,6 @@
 select charset(@a),collation(@a),coercibility(@a);
 select (@a:=_latin2'test' collate latin2_bin) = _latin2'TEST' collate latin2_general_ci;
 
-# Check that user variables are binlogged correctly (BUG#3875)
-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;
-# more important than SHOW BINLOG EVENTS, mysqlbinlog (where we
-# absolutely need variables names to be quoted and strings to be
-# escaped).
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001 
-drop table t1;
-
-
 #
 # Bug #6321 strange error:
 #   string function FIELD(<uservariable content NULL>, ...)

--- 1.10/mysql-test/t/grant2.test	2005-03-27 05:46:00 -08:00
+++ 1.11/mysql-test/t/grant2.test	2005-04-01 16:41:49 -08:00
@@ -1,3 +1,6 @@
+# Grant tests not performed with embedded server
+-- source include/not_embedded.inc
+
 SET NAMES binary;
 
 #