diff options
| author | unknown <joerg@trift-lap.none> | 2007-07-20 13:32:41 +0200 |
|---|---|---|
| committer | unknown <joerg@trift-lap.none> | 2007-07-20 13:32:41 +0200 |
| commit | 193d5f54b1b504dd1b889ad11c1ca70a05e488eb (patch) | |
| tree | c959a44848cbf939e69283ace36f08758a4bf979 /include | |
| parent | 1bd1216f006f934be6d6aaefda111add346b596d (diff) | |
| parent | 809e56e4677652e54ad2edca86d8ba6a565d60fe (diff) | |
| download | mariadb-git-193d5f54b1b504dd1b889ad11c1ca70a05e488eb.tar.gz | |
Merge trift-lap.none:/MySQL/M51/bug14151-5.1
into trift-lap.none:/MySQL/M51/push-5.1
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 |