bk commit into 5.1 tree (lars:1.1965)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann 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.1965 05/12/16 12:19:13 lars@stripped +2 -0
  WL#2321: Changed to a hopefully more restrictive include

  mysys/base64.c
    1.12 05/12/16 12:19:04 lars@stripped +1 -0
    Needed include

  include/base64.h
    1.8 05/12/16 12:19:03 lars@stripped +1 -2
    Include my_global instead of mysys_priv

# 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:	lars
# Host:	dl145h.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.1-wl1012-v3-wl2321-max

--- 1.7/include/base64.h	2005-12-07 17:26:34 +01:00
+++ 1.8/include/base64.h	2005-12-16 12:19:03 +01:00
@@ -21,8 +21,7 @@
 extern "C" {
 #endif
 
-
-#include <mysys/mysys_priv.h>
+#include <my_global.h>
 
 /*
   Calculate how much memory needed for dst of base64_encode()

--- 1.11/mysys/base64.c	2005-12-07 17:26:35 +01:00
+++ 1.12/mysys/base64.c	2005-12-16 12:19:04 +01:00
@@ -16,6 +16,7 @@
 
 #include <base64.h>
 #include <m_string.h>  /* strchr() */
+#include <m_ctype.h>  /* my_isspace() */
 
 #ifndef MAIN