diff options
| author | Sergey Vojtovich <svoj@sun.com> | 2009-11-02 19:07:26 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@sun.com> | 2009-11-02 19:07:26 +0400 |
| commit | 63ef110355989da4b12470596d2e92a5af2d5bc5 (patch) | |
| tree | f5da21fe7115340a2384bb0f15a4dfae54d3e4ed /storage | |
| parent | 66fc82247d19ec4782b5289d72fc7531289c9174 (diff) | |
| download | mariadb-git-63ef110355989da4b12470596d2e92a5af2d5bc5.tar.gz | |
Applying InnoDB snashot 5.1-ss6129
Detailed revision comments:
r6129 | vasil | 2009-10-30 17:14:22 +0200 (Fri, 30 Oct 2009) | 4 lines
branches/5.1:
Revert a change to Makefile.am that sneaked unnoticed in c6127.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/Makefile.am b/storage/innobase/Makefile.am index 8114da9af03..a597e3c24e4 100644 --- a/storage/innobase/Makefile.am +++ b/storage/innobase/Makefile.am @@ -156,8 +156,8 @@ libinnobase_a_SOURCES= btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c \ ut/ut0ut.c ut/ut0vec.c ut/ut0wqueue.c \ handler/ha_innodb.cc -libinnobase_a_CXXFLAGS=-Werror $(AM_CFLAGS) -libinnobase_a_CFLAGS=-Werror $(AM_CFLAGS) +libinnobase_a_CXXFLAGS= $(AM_CFLAGS) +libinnobase_a_CFLAGS= $(AM_CFLAGS) EXTRA_LTLIBRARIES= ha_innodb.la pkgplugin_LTLIBRARIES= @plugin_innobase_shared_target@ |