diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-05-20 16:35:28 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-05-20 16:35:28 +0400 |
| commit | dabd4a1c55cabbe73350c7c9b4c2bd6ab2db2b5c (patch) | |
| tree | 2b0d3650bb46050bc0438cfd5228e52e89aa3895 /storage/archive | |
| parent | a08c47a3ace44229e8683108bd1ce4a45471b491 (diff) | |
| parent | a18861e4adab138553da6b55a7b1d7286acbe23d (diff) | |
| download | mariadb-git-dabd4a1c55cabbe73350c7c9b4c2bd6ab2db2b5c.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- mysql-test/r/partition.result
- mysql-test/r/variables_debug.result
- mysql-test/t/partition.test
- mysql-test/t/variables_debug.test
Diffstat (limited to 'storage/archive')
| -rw-r--r-- | storage/archive/Makefile.am | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/storage/archive/Makefile.am b/storage/archive/Makefile.am index ca7942c082d..adc11358df6 100644 --- a/storage/archive/Makefile.am +++ b/storage/archive/Makefile.am @@ -102,6 +102,3 @@ probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) $(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@ endif - -# Don't update the files from bitkeeper -%::SCCS/s.% |