bk commit into 5.0 tree (jimw:1.1931)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 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.1931 05/08/31 19:12:16 jimw@stripped +8 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-clean
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  sql/examples/ha_tina.cc
    1.14 05/08/31 19:12:14 jimw@stripped +0 -2
    Resolve conflict

  BitKeeper/deleted/.del-extra.c~706f29d72beb2565
    1.14 05/08/31 19:11:41 jimw@stripped +0 -0
    Auto merged

  mysys/my_access.c
    1.7 05/08/31 19:11:41 jimw@stripped +0 -0
    Auto merged

  mysql-test/t/lowercase_table.test
    1.20 05/08/31 19:11:41 jimw@stripped +0 -0
    Auto merged

  mysql-test/r/lowercase_table.result
    1.17 05/08/31 19:11:41 jimw@stripped +0 -0
    Auto merged

  myisam/mi_extra.c
    1.46 05/08/31 19:11:41 jimw@stripped +0 -0
    Auto merged

  include/my_global.h
    1.102 05/08/31 19:11:41 jimw@stripped +0 -0
    Auto merged

  configure.in
    1.341 05/08/31 19:11:41 jimw@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-extra.c~706f29d72beb2565
    1.12.1.2 05/08/31 19:11:41 jimw@stripped +0 -0
    Merge rename: isam/extra.c -> BitKeeper/deleted/.del-extra.c~706f29d72beb2565

# 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-5.0-clean/RESYNC

--- 1.340/configure.in	2005-08-30 18:44:37 -07:00
+++ 1.341/configure.in	2005-08-31 19:11:41 -07:00
@@ -1957,6 +1957,13 @@
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
 
+# Test whether madvise() is declared in C++ code -- it is not on some
+# systems, such as Solaris
+AC_CHECK_DECLS(madvise, [], [], [#if HAVE_SYS_MMAN_H
+#include <sys/types.h>
+#include <sys/mman.h>
+#endif])
+
 # Do not treat warnings as errors if we are linking against other libc
 # this is to work around gcc not being permissive on non-system includes
 # with respect to ANSI C++

--- 1.45/myisam/mi_extra.c	2005-07-19 05:13:37 -07:00
+++ 1.46/myisam/mi_extra.c	2005-08-31 19:11:41 -07:00
@@ -62,7 +62,7 @@
     }
     if (share->base.blobs)
       mi_alloc_rec_buff(info, -1, &info->rec_buff);
-#if defined(HAVE_MMAP) && defined(HAVE_MADVICE)
+#if defined(HAVE_MMAP) && defined(HAVE_MADVISE)
     if (info->opt_flag & MEMMAP_USED)
       madvise(share->file_map,share->state.state.data_file_length,MADV_RANDOM);
 #endif
@@ -93,7 +93,7 @@
       my_errno=EACCES;
       break;
     }
-#if defined(HAVE_MMAP) && defined(HAVE_MADVICE)
+#if defined(HAVE_MMAP) && defined(HAVE_MADVISE)
     if ((share->options & HA_OPTION_COMPRESS_RECORD))
     {
       pthread_mutex_lock(&share->intern_lock);
@@ -177,7 +177,7 @@
       error=end_io_cache(&info->rec_cache);
       /* Sergei will insert full text index caching here */
     }
-#if defined(HAVE_MMAP) && defined(HAVE_MADVICE)
+#if defined(HAVE_MMAP) && defined(HAVE_MADVISE)
     if (info->opt_flag & MEMMAP_USED)
       madvise(share->file_map,share->state.state.data_file_length,MADV_RANDOM);
 #endif

--- 1.13/sql/examples/ha_tina.cc	2005-08-24 15:47:12 -07:00
+++ 1.14/sql/examples/ha_tina.cc	2005-08-31 19:12:14 -07:00
@@ -650,7 +650,7 @@
   current_position= next_position= 0;
   records= 0;
   chain_ptr= chain;
-#ifdef MADV_SEQUENTIAL
+#ifdef HAVE_MADVISE
   (void)madvise(share->mapped_file,share->file_stat.st_size,MADV_SEQUENTIAL);
 #endif
 

--- 1.101/include/my_global.h	2005-08-25 13:04:21 -07:00
+++ 1.102/include/my_global.h	2005-08-31 19:11:41 -07:00
@@ -331,6 +331,10 @@
 #undef setrlimit
 #define setrlimit cma_setrlimit64
 #endif
+/* Declare madvise where it is not declared for C++, like Solaris */
+#if HAVE_MADVISE && !HAVE_DECL_MADVISE && defined(__cplusplus)
+extern "C" int madvise(void *addr, size_t len, int behav);
+#endif
 
 #ifdef __QNXNTO__
 /* This has to be after include limits.h */

--- 1.16/mysql-test/r/lowercase_table.result	2005-05-23 15:31:26 -07:00
+++ 1.17/mysql-test/r/lowercase_table.result	2005-08-31 19:11:41 -07:00
@@ -84,9 +84,3 @@
 drop table t1, t2;
 show tables;
 Tables_in_test
-use lpt1;
-ERROR 42000: Unknown database 'lpt1'
-use com1;
-ERROR 42000: Unknown database 'com1'
-use prn;
-ERROR 42000: Unknown database 'prn'

--- 1.19/mysql-test/t/lowercase_table.test	2005-07-28 06:12:34 -07:00
+++ 1.20/mysql-test/t/lowercase_table.test	2005-08-31 19:11:41 -07:00
@@ -84,14 +84,4 @@
 
 show tables;
 
-#
-#Bug 9148: Denial of service
-#
---error 1049
-use lpt1;
---error 1049
-use com1;
---error 1049
-use prn;
-
 # End of 4.1 tests

--- 1.6/mysys/my_access.c	2005-07-03 04:17:45 -07:00
+++ 1.7/mysys/my_access.c	2005-08-31 19:11:41 -07:00
@@ -105,7 +105,7 @@
     {
       if (*reserved != my_toupper(&my_charset_latin1, *name))
         break;
-      if (++name == end)
+      if (++name == end && !reserved[1])
         DBUG_RETURN(1);                         /* Found wrong path */
     } while (*++reserved);
   }