diff options
author | unknown <jimw@mysql.com> | 2005-05-07 08:25:58 -0700 |
---|---|---|
committer | unknown <jimw@mysql.com> | 2005-05-07 08:25:58 -0700 |
commit | 474a4d5d8d997f7cc068a8d1b4a14138e3bc55af (patch) | |
tree | 0a1534765795d08014f77b4124d29d383bf130ed /BUILD | |
parent | de275d94d2b69048e973986e3df3dad8beb6f332 (diff) | |
parent | 29fcd4b318cccf96fbdd68232c9b0596ead04f9d (diff) | |
download | mariadb-git-474a4d5d8d997f7cc068a8d1b4a14138e3bc55af.tar.gz |
Merge
BUILD/FINISH.sh:
Auto merged
client/mysql.cc:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/ha_heap.cc:
Auto merged
mysql-test/r/create.result:
Merge changes
mysql-test/r/temp_table.result:
SCCS merged
mysql-test/t/temp_table.test:
Merge new tests
sql/item.cc:
Merge from 4.1
sql/sql_select.cc:
Merge from 4.1
Diffstat (limited to 'BUILD')
-rw-r--r-- | BUILD/FINISH.sh | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index 81defaa7f52..01e58b0ee1c 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -2,12 +2,6 @@ cflags="$c_warnings $extra_flags" cxxflags="$cxx_warnings $base_cxxflags $extra_flags" extra_configs="$extra_configs $local_infile_configs" configure="./configure $base_configs $extra_configs" -for arg -do - # Escape special characters so they don't confuse eval - configure="$configure "`echo "$arg" | \ - sed -e 's,\([^a-zA-Z0-9_.=-]\),\\\\\1,g'` -done commands="\ $make -k distclean || true |