on the build machine. So put them into the deb packages optionally.
     
Additionally, fixing cassandra/CMakeLists.txt to work with thrift
installed in /opt/local and /opt. It was supposed to work, but did
not work actually. Only thrift installed in /usr or /usr/local worked.


renamed:
  debian/dist/Debian/mariadb-server-10.0.files => debian/dist/Debian/mariadb-server-10.0.files.in
  debian/dist/Ubuntu/mariadb-server-10.0.files => debian/dist/Ubuntu/mariadb-server-10.0.files.in
modified:
  .bzrignore
  CMakeLists.txt
  storage/cassandra/CMakeLists.txt
  storage/cassandra/cassandra_se.cc
  storage/cassandra/gen-cpp/Cassandra.h
  storage/cassandra/gen-cpp/cassandra_types.h
  storage/oqgraph/CMakeLists.txt
  debian/dist/Debian/mariadb-server-10.0.files.in
  debian/dist/Ubuntu/mariadb-server-10.0.files.in

packages (they were unintentionally removed while moving ha_connect.so
into a separate package).

modified:
  debian/dist/Debian/mariadb-server-10.0.files
  debian/dist/Ubuntu/mariadb-server-10.0.files

who has two different incompatible copies of zlib installed:
(in /usr and in /usr/local).
cmake errorneously chose *.h file from /usr/local/include,
while zlib.a/zlib.so from /usr/lib/. Compilation failed
because of a missing symbol gzopen64.

modified:
  @ cmake/zlib.cmake
  Removing the line (as suggested by Vlad) which made cmake choose
  the wrong library.
  Note: this line used to be a hack for old HP machines,
  it's not needed anymore.

modified:
  @ storage/cassandra/CMakeLists.txt
    Renaming the package "CassandraSE" to "cassandra-engine",
    as agreed during Lisbon meeting.

  @ storage/connect/CMakeLists.txt
    Removing an unused line

increase the version.

error: too many initializers for `tm'

modified:
  storage/connect/ha_connect.cc

(e.g. sol10-64 in build bot).

modified:
  storage/connect/CMakeLists.txt

(the format changed during Sergei's merge of the connect engine and discovery)

modified:
  storage/connect/mysql-test/connect/r/odbc_xls.result

added:
  debian/mariadb-connect-engine-10.0.files
modified:
  cmake/build_configurations/mysql_release.cmake
  debian/dist/Debian/control
  debian/dist/Debian/mariadb-server-10.0.files
  debian/dist/Ubuntu/control
  debian/dist/Ubuntu/mariadb-server-10.0.files
pending merges:
  Alexander Barkov 2013-04-20 Adding mariadb-connect-engine-10.0 deb packa...
    Alexander Barkov 2013-04-19 Removing the connect engine from mariadb...

added:
  debian/mariadb-connect-engine-10.0.files
modified:
  debian/dist/Debian/control
  debian/dist/Ubuntu/control

modified:
  @ mysql-test/r/mysqld--help.result
  @ mysql-test/t/mysqld--help.test
  Supressing information about "--connect" in "mysqld --help" output,
  as it depends on the build parameters.
  As a side effect information about --connect-timeout is now also suppressed :(

  @ storage/connect/CMakeLists.txt
  Removing gcc warning switches that do not exists in some older gcc versions.

  @ storage/connect/ha_connect.cc
  Adding a quick fix: cast from "const char *" to "char *".
  Olivier should do a better fix eventually.

Fixed a wrong result from mysqld--help.test.

This bug in the code of get_column_range_cardinality() could lead to
wrong estimates of number of records in ranges for non-nullable columns.  

odbc_sqlite3 failed. Fixed.

modified:
  storage/connect/ha_connect.cc
  storage/connect/mysql-test/connect/r/odbc_sqlite3.result
  storage/connect/mysql-test/connect/t/odbc_sqlite3.test

as it needs unixODBC and libxml2 as dependencies

modified:
  cmake/build_configurations/mysql_release.cmake
  debian/dist/Debian/mariadb-server-10.0.files
  debian/dist/Ubuntu/mariadb-server-10.0.files

Adaptation to new API, small simplifications and bug fixes

just like other String::append() methods do

field options from SELECT clause to CREATE

Rename connect_engine component back to connect-engine.

modified:
  mysql-test/suite/connect/r/mysql.result
  mysql-test/suite/connect/t/mysql.test

modified:
  mysql-test/suite/connect/r/tbl.result
  mysql-test/suite/connect/t/tbl.test

added:
  storage/connect/connect.cnf
modified:
  mysql-test/suite/connect/r/dir.result
  mysql-test/suite/connect/t/dir.test
  sql/sql_parse.cc
  sql/sql_parse.h
  storage/connect/CMakeLists.txt
  win/packaging/CPackWixConfig.cmake