diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-14 11:12:26 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-14 11:12:26 -0300 |
| commit | 7f1eedec2d70c3afe3b9b1c788d357322189a237 (patch) | |
| tree | c1cb5b7c9fbb5fd6901154d278efe7223b5cac53 /include/Makefile.am | |
| parent | 4972f4d8030b5fc053b3c5605505215a653a39e1 (diff) | |
| parent | f317d3a6fb413cfc04c1ed005df8e859664e41d5 (diff) | |
| download | mariadb-git-7f1eedec2d70c3afe3b9b1c788d357322189a237.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
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 e610a8e325c..b440fa7aeaa 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -45,7 +45,7 @@ noinst_HEADERS = config-win.h config-netware.h lf.h my_bit.h \ my_vle.h my_user.h my_atomic.h atomic/nolock.h \ atomic/rwlock.h atomic/x86-gcc.h atomic/generic-msvc.h \ atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h \ - atomic/solaris.h mysql/innodb_priv.h + atomic/solaris.h mysql/innodb_priv.h my_compiler.h EXTRA_DIST = mysql.h.pp mysql/plugin.h.pp probes_mysql.d.base \ CMakeLists.txt \ |