diff options
| author | unknown <konstantin@mysql.com> | 2004-06-24 19:09:31 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2004-06-24 19:09:31 +0400 |
| commit | e85de70652938e18b02271b5e770ea2abad09184 (patch) | |
| tree | 1c3eec012abfb2a5d98d1db69e459003b89bedd1 /sql-common/Makefile.am | |
| parent | f9976fe8dc682e90f6fe3302301bceb199f3bc86 (diff) | |
| parent | 04f3836f1d85778eab3a0009c5f4989ce1d7e79f (diff) | |
| download | mariadb-git-e85de70652938e18b02271b5e770ea2abad09184.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-4030
sql/field.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/tztime.cc:
Auto merged
Diffstat (limited to 'sql-common/Makefile.am')
| -rw-r--r-- | sql-common/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/Makefile.am b/sql-common/Makefile.am index 1f397c0ea87..6bd42d70e4f 100644 --- a/sql-common/Makefile.am +++ b/sql-common/Makefile.am @@ -15,7 +15,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ## Process this file with automake to create Makefile.in -EXTRA_DIST = client.c pack.c +EXTRA_DIST = client.c pack.c my_time.c # Don't update the files from bitkeeper %::SCCS/s.% |