Commit graph

87240 commits

Author SHA1 Message Date
Alexander Barkov
4d5f5f4cdf Merg 10.0-connect -> 10.0 2014-02-03 09:13:03 +04:00
Alexander Barkov
bec94a1566 merge 10.0 -> 10.0-connect 2014-01-31 14:21:15 +04:00
Sergey Petrunya
a1a49ec9ed Merge 2014-01-21 14:07:00 +04:00
Sergey Petrunya
41208f6e5b MDEV-5426: Assertion `toku_ft_needed_unlocked(src_h)' failed (errno=11) ...
- the problem was caused by EXPLAIN INSERT SELECT. For that statement, 
  the code would call select_insert::prepare2(), which would call 
  handler->ha_start_bulk_insert().  The corresponding handler->end_bulk_insert() 
  call is made from select_insert::send_eof or select_insert::abort_result_set 
  which are never called for EXPLAIN INSERT SELECT.
- Fixed by re-using approach of mysql-5.6: don't call ha_start_bulk_insert() if 
  we are in EXPLAIN.
2014-01-21 14:02:56 +04:00
Sergey Petrunya
0e593c123f MDEV-4816: rpl.rpl_trunc_temp fails in 10.0-serg
Undo the previous band-aid fix in psergey@askmonty.org-20130802141209-4dqfvx2db8acxwbl.
Kristian has made a proper fix, which uses a different approach.
2014-01-20 16:36:57 +04:00
Michael Widenius
0a20d762af Fix for MDEV-4117 @@global.relay_log_purge not per-master, conflicts between different masters in multisource replication
The fix is to not change @relay_log_purge as part of the CHANGE MASTER.
(There is no logical reason why this is done in the current source)

mysql-test/suite/rpl/r/rpl_slave_status.result:
  Ensure that CHANGE MASTER doesn't change relay_log_purge
mysql-test/suite/rpl/t/rpl_slave_status.test:
  Ensure that CHANGE MASTER doesn't change relay_log_purge
sql/sql_repl.cc:
  Don't change relay_log_purge in CHANGE MASTER
2014-01-14 19:00:38 +01:00
Olivier Bertrand
e71bd28f3f - Fix bug MDEV-5486 (fail to create or drop a table dbn.tbn when no default database)
modified:
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h

- Typo

modified:
  storage/connect/odbconn.cpp
  storage/connect/user_connect.h
2013-12-31 13:08:29 +01:00
Elena Stepanova
2ddbe0ec81 Increment the version number 2013-12-28 20:36:57 +04:00
Olivier Bertrand
32284eba5c - Fix variables used uninitialized
modified:
  storage/connect/filamdbf.cpp
  storage/connect/tabutil.cpp
2013-12-28 16:56:51 +01:00
Olivier Bertrand
c055e5e0ef - Add the DECIMAL data type (TYPE_DECIM)
Change the variable name of the DOUBLE type from TYPE_FLOAT to TYPE_DOUBLE
  Change some names to reflect ODBC version 3. This affects some variable
  names, function names and catalog table column names.
  Qualifier -> Catalog
  Owner (Creator) -> Schema
  Length -> Precision
  Prec -> Scale

modified:
  storage/connect/catalog.h
  storage/connect/colblk.cpp
  storage/connect/colblk.h
  storage/connect/filamdbf.cpp
  storage/connect/global.h
  storage/connect/ha_connect.cc
  storage/connect/myconn.cpp
  storage/connect/mysql-test/connect/r/mysql_new.result
  storage/connect/mysql-test/connect/r/odbc_oracle.result
  storage/connect/myutil.cpp
  storage/connect/odbconn.cpp
  storage/connect/plgdbutl.cpp
  storage/connect/rcmsg.c
  storage/connect/reldef.cpp
  storage/connect/reldef.h
  storage/connect/tabcol.cpp
  storage/connect/tabcol.h
  storage/connect/tabdos.cpp
  storage/connect/tabfmt.cpp
  storage/connect/tabmysql.cpp
  storage/connect/tabodbc.cpp
  storage/connect/tabodbc.h
  storage/connect/tabsys.cpp
  storage/connect/tabutil.cpp
  storage/connect/tabwmi.cpp
  storage/connect/tabxml.cpp
  storage/connect/valblk.cpp
  storage/connect/value.cpp
  storage/connect/value.h
  storage/connect/xindex.cpp
  storage/connect/xobject.cpp
  storage/connect/xobject.h

- Fix crash when GetTDB returned NULL in Open_Table

modified:
  storage/connect/ha_connect.cc

- Fix assert error setting double values from PSZ

modified:
  storage/connect/valblk.cpp
2013-12-28 15:46:49 +01:00
Alexander Barkov
889b08b050 Adding tests for TABLE_TYPE=ODBC with Oracle. 2013-12-25 18:24:37 +04:00
Sergei Golubchik
02765f4c61 update information_schema-big.result 2013-12-23 10:29:25 +01:00
Sergei Golubchik
90a3c97162 merge 2013-12-22 17:20:23 +01:00
Sergei Golubchik
ece56ac52a merge 10.0-connect 2013-12-22 17:18:45 +01:00
Sergei Golubchik
91b82a0f73 mtr: abort when a suite.pm fails to load, don't just ignore the errors.
Fix all suite.pm files that had errors and test files that were skipped because of that
2013-12-22 17:14:05 +01:00
Sergei Golubchik
902491c397 * change the test to use is_embedded.inc instead of a direct check
* remove is_embedded.require
2013-12-22 17:11:38 +01:00
Sergei Golubchik
d596ce67c1 mtr: move collect_default_suites() after collect_mysqld_features(),
because some suites may be disabled unless a plugin is available,
and compiled-in plugins are only known after collect_mysqld_features().

Additionally move mysql_install_db() after everything else it's collected -
it's a slow process, better do it after all the information is gathered
(and reported to the user).
2013-12-22 17:11:31 +01:00
Sergei Golubchik
3b7b79a9d1 don't install connect test suite explicitly,
plugin.cmake does it automatically for all plugins
2013-12-22 17:11:24 +01:00
Sergei Golubchik
59662bfb67 remove a deprecated API function from the plugin.h 2013-12-22 17:11:20 +01:00
Sergei Golubchik
20be6dbe9c remove duplicate function (see thd_tx_isolation()) 2013-12-22 17:11:16 +01:00
Sergei Golubchik
0562261336 mysql-test:
* rename "xtradb" combination to be called "innodb"
* disable xtradb_plugin embedded tests (because of RECOMPILE_FOR_EMBEDDED)
2013-12-22 17:10:47 +01:00
Sergei Golubchik
8e72ddbb9c use -visibility=hidden also for plugins linked statically into libmysqld
(it was used only for plugins in mysqld)
2013-12-22 17:09:16 +01:00
Sergei Golubchik
5660d6a550 put ha_xtradb.so in deb packages 2013-12-22 17:09:10 +01:00
Sergei Golubchik
536ca5715d use dynamic libaio for ha_xtradb.so 2013-12-22 17:08:50 +01:00
Sergei Golubchik
348c962c49 fix xtradb I_S tables to load 2013-12-22 17:08:22 +01:00
Sergei Golubchik
ffa8c4cfcc Percona-Server-5.6.14-rel62.0 merge
support ha_innodb.so as a dynamic plugin.
* remove obsolete *,innodb_plugin.rdiff files
* s/--plugin-load=/--plugin-load-add=/
* MYSQL_PLUGIN_IMPORT glob_hostname[]
* use my_error instead of push_warning_printf(ER_DEFAULT)
* don't use tdc_size and tc_size in a module

update test cases (XtraDB is 5.6.14, InnoDB is 5.6.10)
* copy new tests over
* disable some tests for (old) InnoDB
* delete XtraDB tests that no longer apply

small compatibility changes:
* s/HTON_EXTENDED_KEYS/HTON_SUPPORTS_EXTENDED_KEYS/
* revert unnecessary InnoDB changes to make it a bit closer to the upstream

fix XtraDB to compile on Windows (both as a static and a dynamic plugin)

disable XtraDB on Windows (deadlocks) and where no atomic ops are available (e.g. CentOS 5)


storage/innobase/handler/ha_innodb.cc:
  revert few unnecessary changes to make it a bit closer to the original InnoDB
storage/innobase/include/univ.i:
  correct the version to match what it was merged from
2013-12-22 17:06:50 +01:00
Olivier Bertrand
ec906f928b - Fix MDEV-5340
modified:
  storage/connect/odbconn.cpp
2013-12-20 12:24:24 +01:00
Alexander Barkov
f40b99626d Merge 10.0->10.0-connect 2013-12-20 13:46:45 +04:00
Alexander Barkov
a6e5ac2279 MDEV-4929 Myanmar collation 2013-12-20 12:42:33 +04:00
Alexander Barkov
e9b3c97141 Merge 10.0-base->10.0 2013-12-19 17:54:02 +04:00
Alexander Barkov
e1b2de5f0b A post-fix for MDEV-5009 don't look inside /*!50700 ... */ comments
Fixing "/*100000 ...*/" comments (i.e. MySQL style with 6-digits),
which were unintentionally broken in the MDEV-5009 patch.

modified:
  mysql-test/r/comments.result
  mysql-test/t/comments.test
  sql/sql_lex.cc
2013-12-19 17:50:08 +04:00
Olivier Bertrand
d05ccc2324 - Add extra column info in discovery
modified:
  storage/connect/ha_connect.cc
  storage/connect/myconn.cpp
  storage/connect/odbconn.cpp
  storage/connect/plgdbsem.h
2013-12-19 12:56:06 +01:00
Alexander Barkov
06ebc6cc50 MDEV-4838 Wrong metadata for DATE_ADD('string', INVERVAL)
The problem seems to be fixed by some earlier change
and is not reproducible any longer. Only adding a test case.
2013-12-19 12:39:40 +04:00
Alexander Barkov
ece71fafd6 Merge 10.0-base->10.0 2013-12-18 01:56:13 +04:00
Alexander Barkov
fa7faa2955 MDEV-5009 don't look inside /*!50700 ... */ comments 2013-12-18 01:08:39 +04:00
Alexander Barkov
d253599b83 Merge 10.0->10.0-connect 2013-12-17 17:50:55 +04:00
Alexander Barkov
90d022404c Fixing a compilation warning 2013-12-17 17:42:19 +04:00
Alexander Barkov
9f4dd86c2e Merge 10.0-base->10.0 2013-12-17 17:28:48 +04:00
Alexander Barkov
768751c786 Merge 5.5->10.0-base 2013-12-17 16:23:08 +04:00
Alexander Barkov
dc407270a1 MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
Fixed a wrong assertion.
2013-12-17 15:19:26 +04:00
Elena Stepanova
71f4a24d06 MDEV-5452 10.0 does not build on openSUSE 13.1
Also known as MySQL#70047 and BUG#17316314 (srv_buf_size not declared).
The workaround is taken from MySQL 5.6 tree: 

  BUG#17316314 - SRV_BUF_SIZE NOT DECLARED
  Temporary fix. Disabling FALLOC_FL_PUNCH_HOLE for now
2013-12-17 14:40:56 +04:00
Alexander Barkov
752c6edda2 Merge from 10.0-base 2013-12-17 13:26:35 +04:00
Alexander Barkov
074455105c MDEV-5445 Server crashes in Item_func_like::fix_fields on LIKE ExtractValue(..)
backporting from the main 10.0

modified:
  mysql-test/r/func_like.result
  mysql-test/t/func_like.test
  sql/item_cmpfunc.cc
2013-12-17 13:23:05 +04:00
Alexander Barkov
c5004e399e MDEV-5445 Server crashes in Item_func_like::fix_fields on LIKE ExtractValue(..)
Fixed.
2013-12-17 01:38:44 +04:00
Olivier Bertrand
18112a3f0c - Fix logical error in STRBLK::SetValue
modified:
  storage/connect/valblk.cpp

- Fix compiler warning in ODBConn::GetCatInfo

modified:
  storage/connect/odbconn.cpp
2013-12-16 17:40:42 +01:00
Sergei Golubchik
e27c34f9e4 undelete a file 2013-12-16 15:52:36 +01:00
Sergei Golubchik
52c26f7a1f Percona-Server-5.6.14-rel62.0.tar.gz 2013-12-16 15:38:05 +01:00
Sergei Golubchik
63efc652b5 rename *.c -> *.cc 2013-12-16 15:36:18 +01:00
Sergei Golubchik
ce2fabe442 move oqgraph and sphinx suites into storage/*/mysql-test/ 2013-12-16 13:32:03 +01:00
Sergei Golubchik
c1a6522875 merge 2013-12-16 13:28:35 +01:00