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 | eff442964a68d63a0ce9fe3e89332e5cc2b623e4 (patch) | |
| tree | 2b0d3650bb46050bc0438cfd5228e52e89aa3895 /sql-common | |
| parent | a68a68bf45807fc50bf05c2f2e4cde3329755b41 (diff) | |
| parent | d8b33c52b6538e85ab489be8a11ef6f7ebb1205f (diff) | |
| download | mariadb-git-eff442964a68d63a0ce9fe3e89332e5cc2b623e4.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 'sql-common')
| -rw-r--r-- | sql-common/Makefile.am | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql-common/Makefile.am b/sql-common/Makefile.am index 614ccffde9d..3193efee754 100644 --- a/sql-common/Makefile.am +++ b/sql-common/Makefile.am @@ -15,6 +15,3 @@ ## Process this file with automake to create Makefile.in EXTRA_DIST = client.c pack.c my_time.c my_user.c - -# Don't update the files from bitkeeper -%::SCCS/s.% |