List:Commits« Previous MessageNext Message »
From:jani Date:December 13 2005 11:22pm
Subject:bk commit into 5.0 tree (jani:1.1982)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of jani. When jani 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.1982 05/12/14 01:21:56 jani@stripped +2 -0
  Netware specific changes.

  sql/sql_string.h
    1.60 05/12/14 01:21:49 jani@stripped +1 -1
    Added casts. Won't work with Metrowerks compiler without.

  sql/ha_archive.cc
    1.62 05/12/14 01:21:48 jani@stripped +1 -1
    Disabled archive db for Netware until
    zlibCompileFlags() is available for this platform.

# 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:	jani
# Host:	a193-229-222-105.elisa-laajakaista.fi
# Root:	/home/my/bk/mysql-5.0

--- 1.59/sql/sql_string.h	2005-11-20 20:47:02 +02:00
+++ 1.60/sql/sql_string.h	2005-12-14 01:21:49 +02:00
@@ -24,7 +24,7 @@
 #define NOT_FIXED_DEC			31
 #endif
 
-#define STRING_WITH_LEN(X)  ((char*) X), (sizeof(X)-1)
+#define STRING_WITH_LEN(X)  ((const char*) X), ((uint) (sizeof(X) - 1))
 
 class String;
 int sortcmp(const String *a,const String *b, CHARSET_INFO *cs);

--- 1.61/sql/ha_archive.cc	2005-11-16 16:16:53 +02:00
+++ 1.62/sql/ha_archive.cc	2005-12-14 01:21:48 +02:00
@@ -20,7 +20,7 @@
 
 #include "mysql_priv.h"
 
-#ifdef HAVE_ARCHIVE_DB
+#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)
 #include "ha_archive.h"
 #include <my_dir.h>
 
Thread
bk commit into 5.0 tree (jani:1.1982)jani14 Dec