diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-07-21 01:52:15 +0200 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-07-21 01:52:15 +0200 |
| commit | 066d97ba09767e11d942795fc8a3532cf3dc313a (patch) | |
| tree | 589e6d7e4f3cdb8a80432797ac5ec4d74037026e /include | |
| parent | d9bad2acc0fa78f77e2c05bd54a04063a26e71b2 (diff) | |
| parent | 9c7290120be24921768ac3e928ccc7657a6e4044 (diff) | |
| download | mariadb-git-066d97ba09767e11d942795fc8a3532cf3dc313a.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
libmysql/libmysql.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/field.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | include/my_md5.h (renamed from include/md5.h) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index b803f614a93..0796341cc91 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -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 \ diff --git a/include/md5.h b/include/my_md5.h index f92976b3beb..f92976b3beb 100644 --- a/include/md5.h +++ b/include/my_md5.h |