diff options
| author | unknown <joerg@trift-lap.none> | 2007-07-19 14:14:03 +0200 |
|---|---|---|
| committer | unknown <joerg@trift-lap.none> | 2007-07-19 14:14:03 +0200 |
| commit | f4209c71a24ec563dd876db3a94fad7d2c53b8aa (patch) | |
| tree | 384b50aefabe8834cf34958a95feda6e244a1ff2 /os2 | |
| parent | c3e1eaba62e1ecd7b007df01c35228c828fdf142 (diff) | |
| download | mariadb-git-f4209c71a24ec563dd876db3a94fad7d2c53b8aa.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.
include/my_md5.h:
Rename: include/md5.h -> include/my_md5.h
Diffstat (limited to 'os2')
| -rw-r--r-- | os2/MySQL-Source.icc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/os2/MySQL-Source.icc b/os2/MySQL-Source.icc index 342cb6c96b9..285811d0eae 100644 --- a/os2/MySQL-Source.icc +++ b/os2/MySQL-Source.icc @@ -31,7 +31,7 @@ group server_global_pch = 'myisam.h', 'myisampack.h', '.\myisam\myisamdef.h', 'sql_string.h', 'item.h', 'unireg.h', 'field.h', 'sql_lex.h', 'sql_list.h', 'sql_repl.h', - 'md5.h', 'sql_acl.h', 'slave.h', + 'my_md5.h', 'sql_acl.h', 'slave.h', 'ha_myisam.h', 'procedure.h', 'sql_select.h', 'errmsg.h', 't_ctype.h', 'direct.h', 'mysys_err.h', 'zconf.h', 'zlib.h', |