bk commit into 5.0 tree (msvensson:1.2356)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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-14 21:47:28+01:00, msvensson@neptunus.(none) +2 -0
  Put the DBUG_DUMP inside ifdef DEBUG_DATA_PACKETS

  mysql-test/t/information_schema.test@stripped, 2006-12-12 11:43:33+01:00,
msvensson@neptunus.(none) +2 -2
    *** empty log message ***

  sql/net_serv.cc@stripped, 2006-12-14 21:47:26+01:00, msvensson@neptunus.(none) +4 -1
    Put the DBUG_DUMP inside ifdef DEBUG_DATA_PACKETS

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint

--- 1.93/sql/net_serv.cc	2006-12-14 21:47:33 +01:00
+++ 1.94/sql/net_serv.cc	2006-12-14 21:47:33 +01:00
@@ -597,7 +597,10 @@ net_real_write(NET *net,const char *pack
   }
 #endif /* HAVE_COMPRESS */
 
-  /* DBUG_DUMP("net",packet,len); */
+#ifdef DEBUG_DATA_PACKETS
+  DBUG_DUMP("data",packet,len);
+#endif
+
 #ifndef NO_ALARM
   thr_alarm_init(&alarmed);
   if (net_blocking)

--- 1.88/mysql-test/t/information_schema.test	2006-12-14 21:47:33 +01:00
+++ 1.89/mysql-test/t/information_schema.test	2006-12-14 21:47:33 +01:00
@@ -1,6 +1,6 @@
 # This test  uses grants, which can't get tested for embedded server
--- source include/not_embedded.inc
-
+#-- source include/not_embedded.inc
+create user have_grants;
 # Test for information_schema.schemata &
 # show databases