diff options
author | anozdrin@mysql.com <> | 2006-01-13 19:09:27 +0300 |
---|---|---|
committer | anozdrin@mysql.com <> | 2006-01-13 19:09:27 +0300 |
commit | b1705ae5c4cf7f3fe52d742e0e7b89789f488a40 (patch) | |
tree | c39f4747f6c64b9a61a4edb4ab053adc98010ea0 /include/Makefile.am | |
parent | 89f3b9b2dbc79d5fec3322321b4ed4eb809ea498 (diff) | |
parent | e5d26fc446f07d9898c6c1253bcd5dcd6d3f523f (diff) | |
download | mariadb-git-b1705ae5c4cf7f3fe52d742e0e7b89789f488a40.tar.gz |
Merge BUG#15110 from 5.0 into 5.1.
Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110
into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
Diffstat (limited to 'include/Makefile.am')
-rw-r--r-- | include/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index ba9f8029def..783a0b215bf 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -31,7 +31,7 @@ noinst_HEADERS = config-win.h config-os2.h config-netware.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 \ mysql_version.h.in my_handler.h my_time.h decimal.h \ - my_vle.h + my_vle.h my_user.h # mysql_version.h are generated CLEANFILES = mysql_version.h my_config.h readline openssl |