mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge trift-lap.none:/MySQL/M51/bug14151-5.1

Browse source 
into  trift-lap.none:/MySQL/M51/push-5.1
This commit is contained in:
unknown 2007-07-20 13:32:41 +02:00
commit 193d5f54b1
6 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/Makefile.am
View file

@ -33,7 +33,7 @@ noinst_HEADERS = config-win.h config-netware.h \
mysys_err.h my_base.h help_start.h help_end.h \
my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \
my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \
thr_lock.h t_ctype.h violite.h md5.h base64.h \
thr_lock.h t_ctype.h violite.h my_md5.h base64.h \
mysql_version.h.in my_handler.h my_time.h \
my_vle.h my_user.h my_atomic.h atomic/nolock.h \
atomic/rwlock.h atomic/x86-gcc.h atomic/x86-msvc.h \

0
include/md5.h → include/my_md5.h
View file

2
mysys/md5.c
View file

@ -45,7 +45,7 @@ documentation and/or software.
#include <my_global.h>
#include <m_string.h>
#include "md5.h"
#include "my_md5.h"
/* Constants for MD5Transform routine. */

2
sql/item_strfunc.cc
View file

@ -25,7 +25,7 @@
#include "mysql_priv.h"
#include <m_ctype.h>
#include "md5.h"
#include "my_md5.h"
#include "sha1.h"
#include "my_aes.h"
#include <zlib.h>

2
sql/sql_partition.cc
View file

@ -36,7 +36,7 @@
#include "mysql_priv.h"
#include <errno.h>
#include <m_ctype.h>
#include "md5.h"
#include "my_md5.h"
#ifdef WITH_PARTITION_STORAGE_ENGINE
#include "ha_partition.h"

2
sql/table.cc
View file

@ -19,7 +19,7 @@
#include "mysql_priv.h"
#include "sql_trigger.h"
#include <m_ctype.h>
#include "md5.h"
#include "my_md5.h"
/* Functions defined in this file */