diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-05-07 13:37:16 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-05-07 13:37:16 +0400 |
| commit | fe8f7052fc475a113eea9e44c728b37096496ce6 (patch) | |
| tree | 385aedcde4e00b31a7b5e1b308d16b5460be7b94 /include | |
| parent | 72ae25b11ea922c018953053e3c3cdd5fd80f971 (diff) | |
| parent | 19fac19a93177daf51479ae911482133a973c398 (diff) | |
| download | mariadb-git-fe8f7052fc475a113eea9e44c728b37096496ce6.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- mysql-test/suite/engines/funcs/t/disabled.def
- mysql-test/suite/engines/iuds/t/disabled.def
- mysql-test/suite/engines/iuds/t/insert_number.test
Diffstat (limited to 'include')
| -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 5ede6d7591f..da50ecf2178 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 + atomic/solaris.h mysql/innodb_priv.h EXTRA_DIST = mysql.h.pp mysql/plugin.h.pp probes_mysql.d.base \ CMakeLists.txt \ |