77771 Commits

Author SHA1 Message Date
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
Sergei Golubchik
53375573e3 small mtr cleanup
and move the connect suite into storage/connect/
2013-04-19 07:07:06 +02:00
Sergei Golubchik
f9dcd5b540 10.0-base merge 2013-04-18 21:54:13 +02:00
unknown
9441e53653 MDEV-4345
Sampling of selectivity of LIKE predicate.
2013-04-18 22:22:04 +03:00
Alexander Barkov
3975256685 Fixing check_access() not to be inlined in case of
embedded server, to make connect engine work with embedded server
dynamically.

modified:
  sql/sql_parse.cc
  sql/sql_parse.h
2013-04-18 23:18:34 +04:00
unknown
71c211d48b Fix race in test case. 2013-04-18 11:17:10 +02:00
Igor Babaev
e46341758d Merge. 2013-04-17 18:10:01 -07:00
Igor Babaev
8c71e7a383 Merge 10.0-base -> mwl253 2013-04-17 18:07:37 -07:00
Igor Babaev
ac8333e46d Fixed a typo/bug that could lead to wrong selectivity numbers for
tables retrieved by range scans.

Added comments forgotten in the previous patch.
2013-04-17 16:15:22 -07:00
Michael Widenius
8b714e507f Changed the client library to only mark memory as THREAD_SPECIFIC if one has called
mysql_options() with MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY

include/mysql.h:
  Added MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY
include/mysql.h.pp:
  Updated file
sql-common/client.c:
  Marked client memory as THREAD_SPECIFIC
sql/event_db_repository.cc:
  Fixed compiler warning
sql/slave.cc:
  Marked client memory as THREAD_SPECIFIC
storage/federatedx/federatedx_io_mysql.cc:
  Marked client memory as THREAD_SPECIFIC
storage/federatedx/ha_federatedx.cc:
  Marked client memory as THREAD_SPECIFIC
storage/sphinx/ha_sphinx.cc:
  Marked client memory as THREAD_SPECIFIC
2013-04-17 23:37:06 +03:00
Michael Widenius
8e52698580 Fixed compiler warnings and a not critical memory leak
sql/keycaches.cc:
  Added free_all_rpl_filters() to be able to free all filters at cleanup
sql/keycaches.h:
  Added prototype
sql/rpl_rli.cc:
  Fixed compiler warning
sql/slave.cc:
  Free all rpl_filters at cleanup
sql/sp.cc:
  Fixed compiler warning when not all struct elements was initialized
sql/sql_acl.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/perfschema/table_events_waits.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/perfschema/table_events_waits_summary.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/perfschema/table_ews_global_by_event_name.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/perfschema/table_file_instances.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/perfschema/table_file_summary.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/perfschema/table_performance_timers.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/perfschema/table_setup_consumers.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/perfschema/table_setup_instruments.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/perfschema/table_setup_timers.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/perfschema/table_sync_instances.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/perfschema/table_threads.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/xtradb/os/os0file.c:
  Fixed compiler warning when not all struct elements was initialized
2013-04-17 22:33:33 +03:00
Igor Babaev
a1cd28e2e5 Merge 10.0-base -> 10.0 2013-04-17 10:18:04 -07:00
Alexander Barkov
89bafdf452 Dashed name did not work on Windows.
Renaming dashed name to underscored name:

connect-engine -> connect_engine
2013-04-17 19:36:57 +04:00
Vladislav Vaintroub
4a3e22c430 Fix MSI package creation for connect engine.
Also, do not use /MP option when compiling CONNECT (incompatible with COM #import directive)
Also, fix ODBC_LIBRARY to be a list on Windows, not string with spaces inside.
2013-04-17 07:44:49 -07:00
unknown
0e7410a154 Merge 10.0-base -> 10.0 (GTID). 2013-04-17 15:17:01 +02:00
unknown
43fe53acc2 Remove forgotten debug printout in test, was a bit too quick there :-( 2013-04-17 14:11:16 +02:00
unknown
02ef7e0af0 Fix that multi_source tests did not reset @@global.gtid_pos between tests. 2013-04-17 13:35:16 +02:00
unknown
585d7bbfb4 Merge 5.5->10.0-base 2013-04-17 09:39:40 +02:00