Commit graph

77738 commits

Author SHA1 Message Date
Olivier Bertrand
4959811411 - General code cleaning, eliminating a few potential bugs
modified:
  storage/connect/catalog.h
  storage/connect/mycat.cc
  storage/connect/taboccur.cpp
  storage/connect/taboccur.h
  storage/connect/tabutil.cpp
  storage/connect/tabutil.h
  storage/connect/tabxcl.cpp
  storage/connect/tabxcl.h
2013-05-05 12:45:26 +02:00
Olivier Bertrand
5fc19f8db8 - Add test for XCOL and OCCUR tables
- Fix a bug causing a crash when doing an ALTER TABLE
  (because create_info->alias is NULL)

added:
  storage/connect/mysql-test/connect/r/occur.result
  storage/connect/mysql-test/connect/r/xcol.result
  storage/connect/mysql-test/connect/t/occur.test
  storage/connect/mysql-test/connect/t/xcol.test
modified:
  storage/connect/ha_connect.cc
2013-05-04 00:47:55 +02:00
Olivier Bertrand
f3e944099e - Adding a loop test to prevent PROXY based table to loop when repointing on itself.
- Fix bug causing PROXY on non CONNECT tables to sometimes use the wrong DB.
- Making some more tests in create that were in pre_create not called anymore
  when columns are defined.
- Updating some test results to reflect new warnings.

modified:
  storage/connect/ha_connect.cc
  storage/connect/mysql-test/connect/r/tbl.result
  storage/connect/mysql-test/connect/r/upd.result
  storage/connect/tabcol.h
  storage/connect/tabmysql.cpp
  storage/connect/taboccur.cpp
  storage/connect/taboccur.h
  storage/connect/tabtbl.cpp
  storage/connect/tabtbl.h
  storage/connect/tabutil.cpp
  storage/connect/tabutil.h
  storage/connect/tabxcl.cpp
  storage/connect/tabxcl.h
2013-05-02 16:33:15 +02:00
Olivier Bertrand
3d4adc3fdf - Change in connect_assisted_discovery the default value for port from MYSQL_PORT
to 0. So it can be later set to mysqld_port if necessary. Doing so, it is no
  more required to specify port when using the current port and the current port
  is not equal to MYSQL_PORT (3306)

modified:
  storage/connect/ha_connect.cc
2013-04-30 17:48:18 +02:00
Olivier Bertrand
7461d8e30c - Allow PROXY based tables to specify MySQL access parameters when the
object table is not a CONNECT table. This was the case in previous
  versions but was no more possible with recent changes.

modified:
  storage/connect/mycat.cc
  storage/connect/tabmysql.cpp
  storage/connect/tabutil.cpp
2013-04-30 16:16:32 +02:00
Olivier Bertrand
2a37f3e030 - Fix a bug causing a crash when using OEM tables based on BIN tables.
modified:
  storage/connect/reldef.cpp
2013-04-29 17:47:23 +02:00
Olivier Bertrand
4fd74200dd - Adding 3 new table types:
PROXY table base on another table. Used by several other types.
  XCOL  proxy on a table having a colummn containing a list of values
  OCCUR proxy on a table having several columns containing the same type
        of values that can be put in a unique column and several rows.
  TBL   Not new but now internally using the PROXY table class.
- Fix 2 bugs in add_field:
        Change '=' to ' ' after the COMMENT keyword.
        Quote column names between '`' in the SQL string.
- Update xml test result to the CONNECT version

added:
  storage/connect/taboccur.cpp
  storage/connect/taboccur.h
  storage/connect/tabutil.cpp
  storage/connect/tabutil.h
  storage/connect/tabxcl.cpp
  storage/connect/tabxcl.h
modified:
  storage/connect/CMakeLists.txt
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/mycat.cc
  storage/connect/myconn.cpp
  storage/connect/mysql-test/connect/r/xml.result
  storage/connect/plgdbsem.h
  storage/connect/tabmysql.cpp
  storage/connect/tabtbl.cpp
  storage/connect/tabtbl.h
  storage/connect/valblk.cpp
  storage/connect/valblk.h
2013-04-29 13:50:20 +02:00
Alexander Barkov
bc80fb07de ha_cassandra.so and ha_oqgraph.so can be build only if boost is installed
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
2013-04-25 17:12:52 +04:00
Alexander Barkov
616e7a7466 Adding ha_oqgraph.so and ha_cassandra.so back into the Debian and Ubuntu
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
2013-04-24 18:20:22 +04:00
Igor Babaev
cd0e834d12 Merge 10.0-base -> 10.0 2013-04-22 20:55:22 -07:00
Igor Babaev
bb5b0a9f5b Merge from mwl253 2013-04-22 07:40:54 -07:00
unknown
7a565cd961 Make test working on case insensitive file system 2013-04-22 12:18:46 +03:00
Igor Babaev
d312bb0bca Merge mwl253 -> 10.0-base 2013-04-21 22:44:19 -07:00
unknown
c076f7302b Removed comparison of table names. 2013-04-22 06:46:26 +03:00
Sergei Golubchik
16c3fbab03 update test results 2013-04-21 19:37:35 -07:00
Alexander Barkov
5fb0d16016 Fixing build-bot compilation failure on SolarisX86,
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.
2013-04-21 23:19:20 +04:00
unknown
30e66dd6e7 decode_histogram fixed to show delta of the last value with maximum. 2013-04-21 22:12:57 +03:00
unknown
3fccd933dd Fix of the test suite. 2013-04-21 21:39:01 +03:00
Alexander Barkov
1de77ee1ad Packaging clean-ups for the cassandra and connect engines.
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
2013-04-21 22:15:33 +04:00
Sergei Golubchik
88b89aaa82 fixes for buildbot.
increase the version.
2013-04-21 09:38:54 -07:00
Alexander Barkov
b44f11c994 Fixing compilation failure in Solaris/OpenSolaris
error: too many initializers for `tm'

modified:
  storage/connect/ha_connect.cc
2013-04-21 18:38:08 +04:00
Alexander Barkov
7329f85379 Removing -Wfatal-errors, as it does not present in the older gcc versions.
(e.g. sol10-64 in build bot).

modified:
  storage/connect/CMakeLists.txt
2013-04-21 09:17:24 +04:00
Igor Babaev
c0034df25e Changed a test case. 2013-04-20 18:18:01 -07:00
unknown
2e830cfbc8 MDEV-4402 A function to visualize histograms data. 2013-04-20 23:30:21 +03:00
Igor Babaev
6edcd45ebf Merge 10.0-base -> 10.0 2013-04-20 12:30:40 -07:00
Alexander Barkov
30651fd2f6 Recoding new results
(the format changed during Sergei's merge of the connect engine and discovery)

modified:
  storage/connect/mysql-test/connect/r/odbc_xls.result
2013-04-20 21:10:58 +04:00
Alexander Barkov
63fb05225f Merging from maria-10.0-connect (DEB packaging related fixes)
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...
2013-04-20 20:51:26 +04:00
Alexander Barkov
55e99a6b3e Adding mariadb-connect-engine-10.0 deb package for Debian and Ubuntu
added:
  debian/mariadb-connect-engine-10.0.files
modified:
  debian/dist/Debian/control
  debian/dist/Ubuntu/control
2013-04-20 19:58:09 +04:00
Alexander Barkov
a6a4fa1d6f Fixing a few problems found by Build Bot after merging the CONNECT engine.
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.
2013-04-20 19:23:33 +04:00
Igor Babaev
7efad6330f Merge.
Fixed a wrong result from mysqld--help.test.
2013-04-20 02:24:01 -07:00
Igor Babaev
09a1f410cb Fixed bug mdev-4406.
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.
2013-04-20 02:16:55 -07:00
Alexander Barkov
548399f6d0 After-fix for Sergei's merge of the connect engine.
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
2013-04-20 00:24:05 +04:00
Alexander Barkov
e5da28770d Removing the connect engine from mariadb-server package,
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
2013-04-19 22:48:18 +04:00
Sergei Golubchik
f7e95c8efa merge with maria-10.0-connect 2013-04-19 20:43:35 +02:00
Sergei Golubchik
6bd49441b5 CONNECT engine fixes after 10.0 merge.
Adaptation to new API, small simplifications and bug fixes
2013-04-19 20:35:43 +02:00
Sergei Golubchik
337c1b3ee8 fix plugin locking/unlocking when assisted discovery fails 2013-04-19 20:35:37 +02:00
Sergei Golubchik
faf4d99d22 String::append_for_single_quote() should signal OOM condition,
just like other String::append() methods do
2013-04-19 20:35:32 +02:00
Sergei Golubchik
4b169cd7c1 bugfix: CREATE .. SELECT should not pass engine defined
field options from SELECT clause to CREATE
2013-04-19 20:35:18 +02:00
Sergei Golubchik
45912599ca 10.0 merge 2013-04-19 20:35:04 +02:00
Vladislav Vaintroub
016bef6ea0 MDEV-4356 - Do not try to unlock an already unlocked mutex. 2013-04-19 19:52:18 +02:00
Vladislav Vaintroub
0b034c1b2c Fix to handle CMake component names with dash in the name, when producing MSI package.
Rename connect_engine component back to connect-engine.
2013-04-19 18:45:54 +02:00
unknown
1a8486a842 MDEV-4345: fixed optimizer_selectivity_sampling_limit default value. 2013-04-19 19:35:13 +03:00
unknown
c44c923156 MDEV-4345: Fixed system variables tests. 2013-04-19 18:59:46 +03:00
Alexander Barkov
9df2057cfa Adding --eval command in the queries that use $PORT
modified:
  mysql-test/suite/connect/r/mysql.result
  mysql-test/suite/connect/t/mysql.test
2013-04-19 18:25:34 +04:00
Olivier Bertrand
40ab5ffe2c - Added --eval and -- replace_result
modified:
  mysql-test/suite/connect/r/tbl.result
  mysql-test/suite/connect/t/tbl.test
2013-04-19 16:25:05 +02:00
unknown
1baf3d7d14 Fix missing reset of debug_sync, which could cause subsequent test to fail. 2013-04-19 15:59:39 +02:00
Olivier Bertrand
32669e4c15 - Committing merged changes
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
2013-04-19 15:18:42 +02:00
Olivier Bertrand
f406bca7f1 - Fix problem of mysql connection in TBL tables
By adding the option_list='port=$PORT' in the table create statement.

modified:
  mysql-test/suite/connect/r/tbl.result
  mysql-test/suite/connect/t/tbl.test
2013-04-19 15:14:47 +02:00
Vladislav Vaintroub
305e3dea0d MDEV-4398 - remove incorrect fix, replace with correct one - change default to OFF for innodb_use_fallocate 2013-04-19 14:52:05 +02:00
Alexander Barkov
7cedea09fd "mtr --ps --suite=connect dir" did not work.
Applying a patch from SerG fixing this problem.

modified:
  mysql-test/suite/connect/r/dir.result
  mysql-test/suite/connect/t/dir.test
2013-04-19 12:37:07 +04:00