← Back to branch summary

~jaypipes/drizzle/item-class-file-reorg

« back to all changes in this revision

Viewing changes to Makefile.am

Merging trunk changes from over weekend.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
20
20
# These are built from source in the Docs directory
21
21
EXTRA_DIST =            
22
22
 
 
23
if BUILD_DBUG
 
24
  d_dbug = dbug
 
25
endif
 
26
 
23
27
SUBDIRS =               . include \
24
28
                        sql-common scripts vio \
25
 
                        strings mysys dbug \
 
29
                        strings mysys $(d_dbug) \
26
30
                        extra regex \
27
31
                        libmysql client storage plugin \
28
32
                        sql \
76
80
        cd mysql-test ; \
77
81
            @PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement
78
82
 
79
 
test:   test-ns test-pr
 
83
test: test-drizzle
 
84
 
 
85
test-old:       test-ns test-pr
80
86
 
81
87
test-full:      test test-nr test-ps
82
88
 
162
168
        $(MAKE) force=--force test-pr \
163
169
            test-binlog-statement test-ext test-fast-view \
164
170
                test-fast-cursor 
 
171
 
 
172
test-drizzle:
 
173
        cd mysql-test ; \
 
174
         @PERL@ ./mysql-test-run.pl --fast --reorder --force \
 
175
                join_crash \
 
176
                join_nested \
 
177
                join_outer_innodb \
 
178
                delete \
 
179
                join_outer \
 
180
                join \
 
181
                subselect \
 
182
                insert \
 
183
                select \
 
184
                update \
 
185
                information_schema \
 
186
                mysqlslap \
 
187
                lock \
 
188
                lock_tables_lost_commit