diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-02-07 16:38:37 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-02-07 16:38:37 +0200 |
| commit | e751d298369061cfd8b3362712cce11aa8efbaa5 (patch) | |
| tree | e5a5f635842a20157ef2ed69775c40aad98631f7 /Makefile.am | |
| parent | d66e60248c9f448b9d251358e0acfd97d1e3f84e (diff) | |
| parent | f06b0d9f3cfeaee8098db22eeecf41f6c072c479 (diff) | |
| download | mariadb-git-e751d298369061cfd8b3362712cce11aa8efbaa5.tar.gz | |
Merge with 4.0 to get fix for MIN/MAX
BitKeeper/etc/ignore:
added support-files/MacOSX/Info.plist
Makefile.am:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/distinct.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/join.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/order_by.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/lex.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
configure.in:
Use local version
mysql-test/r/func_group.result:
merge
mysql-test/r/order_by.result:
merge
mysql-test/r/show_check.result:
merge
mysql-test/t/func_group.test:
merge
mysql-test/t/join.test:
merge
sql/mysql_priv.h:
Use local version
sql/sql_yacc.yy:
merge
sql/table.cc:
USe local
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index ea965e282f3..fc3cc23cf69 100644 --- a/Makefile.am +++ b/Makefile.am @@ -88,4 +88,3 @@ tags: test: cd mysql-test ; ./mysql-test-run - |