bk commit into 4.1 tree (msvensson:1.2597)

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 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, 2007-01-17 11:13:03+01:00, msvensson@stripped +5 -0
  Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1
  into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
  MERGE: 1.2581.1.18

  mysql-test/t/mysqladmin.test@stripped, 2007-01-17 11:13:00+01:00, msvensson@stripped
+0 -0
    Auto merged
    MERGE: 1.1.1.1

  mysys/mf_iocache.c@stripped, 2007-01-17 11:13:00+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.51.1.3

  mysys/my_read.c@stripped, 2007-01-17 11:13:00+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.9.1.1

  mysys/my_seek.c@stripped, 2007-01-17 11:13:00+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.12.1.2

  sql/sql_parse.cc@stripped, 2007-01-17 11:13:01+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.489.1.1

# 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:	pilot.mysql.com
# Root:	/home/msvensson/mysql/mysql-4.1-maint/RESYNC

--- 1.52/mysys/mf_iocache.c	2007-01-09 12:30:55 +01:00
+++ 1.53/mysys/mf_iocache.c	2007-01-17 11:13:00 +01:00
@@ -199,11 +199,11 @@
   if (type != READ_NET && type != WRITE_NET)
   {
     /* Retry allocating memory in smaller blocks until we get one */
+    cachesize=(uint) ((ulong) (cachesize + min_cache-1) &
+			(ulong) ~(min_cache-1));
     for (;;)
     {
       uint buffer_block;
-      cachesize=(uint) ((ulong) (cachesize + min_cache-1) &
-			(ulong) ~(min_cache-1));
       if (cachesize < min_cache)
 	cachesize = min_cache;
       buffer_block = cachesize;
@@ -222,7 +222,8 @@
       }
       if (cachesize == min_cache)
 	DBUG_RETURN(2);				/* Can't alloc cache */
-      cachesize= (uint) ((long) cachesize*3/4); /* Try with less memory */
+      /* Try with less memory */
+      cachesize= (uint) ((ulong) cachesize*3/4 & (ulong)~(min_cache-1));
     }
   }
 

--- 1.490/sql/sql_parse.cc	2006-12-07 15:32:39 +01:00
+++ 1.491/sql/sql_parse.cc	2007-01-17 11:13:01 +01:00
@@ -2485,6 +2485,12 @@
       goto unsent_create_error;
 
 #ifndef HAVE_READLINK
+    if (lex->create_info.data_file_name)
+      push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0,
+                   "DATA DIRECTORY option ignored");
+    if (lex->create_info.index_file_name)
+      push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0,
+                   "INDEX DIRECTORY option ignored");
     lex->create_info.data_file_name=lex->create_info.index_file_name=0;
 #else
     /* Fix names if symlinked tables */

--- 1.2/mysql-test/t/mysqladmin.test	2006-12-08 13:37:38 +01:00
+++ 1.3/mysql-test/t/mysqladmin.test	2007-01-17 11:13:00 +01:00
@@ -1,3 +1,5 @@
+# Embedded server doesn't support external clients
+--source include/not_embedded.inc
 #
 # Test "mysqladmin ping"
 #