bk commit into 5.0 tree (rburnett:1.1899)

[reggie]

Below is the list of changes that have just been committed into a local
5.0 repository of rburnett. When rburnett 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.1899 05/05/25 23:21:34 rburnett@stripped +4 -0
  patching fix for merge table problems from mainline 5.0 back to 5.0.6

  BitKeeper/etc/logging_ok
    1.317 05/05/25 23:21:34 rburnett@stripped +1 -0
    Logging to logging@stripped accepted

  sql/ha_myisammrg.cc
    1.63 05/05/25 23:20:56 rburnett@stripped +1 -0
    added DBUG_PRINT.  this was added by Ingo and not removed.

  mysys/my_getwd.c
    1.14 05/05/25 23:20:56 rburnett@stripped +4 -1
    checking / in has_path

  myisammrg/myrg_open.c
    1.29 05/05/25 23:20:56 rburnett@stripped +3 -1
    caling fn_format if the filename has a path

# 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:	rburnett
# Host:	production.mysql.com
# Root:	/usersnfs/rburnett/5.0-build

--- 1.28/myisammrg/myrg_open.c	2005-04-28 18:28:44 +02:00
+++ 1.29/myisammrg/myrg_open.c	2005-05-25 23:20:56 +02:00
@@ -67,7 +67,7 @@
   while ((length=my_b_gets(&file,buff,FN_REFLEN-1)))
   {
     if ((end=buff+length)[-1] == '\n')
-      end[-1]='\0';
+      *--end='\0';
     if (!buff[0])
       continue;		/* Skip empty lines */
     if (buff[0] == '#')
@@ -86,6 +86,8 @@
                    sizeof(name_buff)-1-dir_length));
       VOID(cleanup_dirname(buff,name_buff));
     }
+    else
+      fn_format(buff, buff, "", "", 0);
     if (!(isam=mi_open(buff,mode,(handle_locking?HA_OPEN_WAIT_IF_LOCKED:0))))
       goto err;
     if (!m_info)                                /* First file */

--- 1.13/mysys/my_getwd.c	2005-04-28 18:28:44 +02:00
+++ 1.14/mysys/my_getwd.c	2005-05-25 23:20:56 +02:00
@@ -208,7 +208,10 @@
 
 my_bool has_path(const char *name)
 {
-  return test(strchr(name, FN_LIBCHAR))
+  return test(strchr(name, FN_LIBCHAR)) 
+#if FN_LIBCHAR != '/'
+    || test(strchr(name,'/'))
+#endif
 #ifdef FN_DEVCHAR
     || test(strchr(name, FN_DEVCHAR))
 #endif

--- 1.62/sql/ha_myisammrg.cc	2005-04-29 10:59:29 +02:00
+++ 1.63/sql/ha_myisammrg.cc	2005-05-25 23:20:56 +02:00
@@ -441,6 +441,7 @@
     }
     else
       table_name= (*tbl)->s->path;
+    DBUG_PRINT("info",("MyISAM table_name: '%s'", table_name));
     *pos++= table_name;
   }
   *pos=0;

--- 1.316/BitKeeper/etc/logging_ok	2005-05-18 20:02:02 +02:00
+++ 1.317/BitKeeper/etc/logging_ok	2005-05-25 23:21:34 +02:00
@@ -232,6 +232,7 @@
 ranger@stripped
 rburnett@stripped
 rburnett@stripped
+rburnett@stripped
 reggie@bob.(none)
 reggie@mdk10.(none)
 root@home.(none)