bk commit into 4.1 tree (holyfoot:1.2587)

[holyfoot]

Below is the list of changes that have just been committed into a local
4.1 repository of hf. When hf 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@stripped, 2006-12-29 20:44:27+04:00, holyfoot@stripped +2 -0
  two tests disabled in embedded server

  mysql-test/t/distinct.test@stripped, 2006-12-29 20:44:26+04:00, holyfoot@stripped +3 -0
    temporary disabled for embedded server

  mysql-test/t/mysqladmin.test@stripped, 2006-12-29 20:44:26+04:00, holyfoot@stripped +2 -0
    tools can't be tested with the embedded server yet

# 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:	holyfoot
# Host:	hfmain.(none)
# Root:	/d2/hf/opt/my41-embt

--- 1.20/mysql-test/t/distinct.test	2006-12-29 20:44:30 +04:00
+++ 1.21/mysql-test/t/distinct.test	2006-12-29 20:44:30 +04:00
@@ -1,3 +1,6 @@
+# mysqltest should be fixed to work properly here
+#
+-- source include/not_embedded.inc
 #
 # Bug with distinct and INSERT INTO
 # Bug with group by and not used fields

--- 1.1/mysql-test/t/mysqladmin.test	2006-12-29 20:44:30 +04:00
+++ 1.2/mysql-test/t/mysqladmin.test	2006-12-29 20:44:30 +04:00
@@ -1,3 +1,5 @@
+# This test should work in embedded server after mysqltest is fixed
+-- source include/not_embedded.inc
 #
 # Test "mysqladmin ping"
 #