diff options
| author | joerg@trift-lap.none <> | 2007-07-19 14:14:03 +0200 |
|---|---|---|
| committer | joerg@trift-lap.none <> | 2007-07-19 14:14:03 +0200 |
| commit | af3c675bc1176aef4d7f1070a80c49b987e54d6e (patch) | |
| tree | 384b50aefabe8834cf34958a95feda6e244a1ff2 /include | |
| parent | aa03d369bff132c2c00bf7de9902792f0eaf5b5e (diff) | |
| download | mariadb-git-af3c675bc1176aef4d7f1070a80c49b987e54d6e.tar.gz | |
Avoid the name conflict between the system-provided "md5.h" and the MySQL one
by renaming "include/md5.h" to "include/my_md5.h".
Fixes bug#14151.
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 ccd5ac627bf..2cd72052a15 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -32,7 +32,7 @@ noinst_HEADERS = config-win.h config-os2.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 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_user.h my_libwrap.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 |