diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-11 12:39:38 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-11 12:39:38 +0300 |
| commit | 567671368723c704d60902b4d0ccff951b414552 (patch) | |
| tree | 965519a5b0af3f33624c7e16fd61b58d15f42372 /Makefile.am | |
| parent | efee0608316e4cc034a3e62d05980eef8530843d (diff) | |
| parent | ceefe7bb50b17b72e88851e3b98642e89a4cddae (diff) | |
| download | mariadb-git-567671368723c704d60902b4d0ccff951b414552.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- client/mysqltest.cc
- mysql-test/collections/default.experimental
- mysql-test/suite/rpl/t/disabled.def
- sql/mysqld.cc
- sql/opt_range.cc
- sql/sp.cc
- sql/sql_acl.cc
- sql/sql_partition.cc
- sql/sql_table.cc
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 7e9614fb1e5..36be3d0f7e7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ @readline_topdir@ sql-common scripts \ - @pstack_dir@ \ + @pstack_dir@ libservices \ @sql_union_dirs@ unittest \ @sql_server@ @man_dirs@ tests \ netware @libmysqld_dirs@ \ @@ -32,7 +32,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ DIST_SUBDIRS = . include Docs zlib \ cmd-line-utils sql-common scripts \ - pstack \ + pstack libservices \ strings mysys dbug extra regex libmysql libmysql_r client unittest storage plugin \ vio sql man tests \ netware libmysqld \ @@ -98,7 +98,8 @@ test-pr: test-ns: cd mysql-test ; \ - @PERL@ ./mysql-test-run.pl $(force) $(mem) --mysqld=--binlog-format=mixed + @PERL@ ./mysql-test-run.pl $(force) $(mem) --mysqld=--binlog-format=mixed ; \ + @PERL@ ./mysql-test-run.pl $(force) $(mem) --suite=funcs_1 test-binlog-statement: cd mysql-test ; \ |