Commit graph

87284 commits

Author SHA1 Message Date
Nirbhay Choubey
899f9801d4 bzr merge -r3946..3968 codership/5.5 2014-03-25 17:01:05 -04:00
Nirbhay Choubey
3088d52c20 bzr merge -r3933..3945 codership/5.5 (Non-InnoDB changes only). 2014-03-25 14:42:15 -04:00
Nirbhay Choubey
3c0b3babd9 bzr merge -r3928..3932 codership/5.5 2014-03-25 13:39:12 -04:00
Seppo Jaakola
7b57c5ea6f References: https://mariadb.atlassian.net/browse/MDEV-5908 -
moved releasing of wsrep THD mutex and thd->awake later, so that wsrep->abort_pre_commit()
is guaranteed to run for a thread which is still in conflict state
2014-03-20 16:03:20 +02:00
Nirbhay Choubey
8a99be643c Modified debian scripts to make galera packages
self-contained.
2014-03-14 17:52:55 -04:00
Nirbhay Choubey
ff0f41974c Debian script fixes. 2014-03-13 11:56:37 -04:00
Nirbhay Choubey
27c09524eb MDEV#5790 : SHOW GLOBAL STATUS LIKE does not show
the correct list of variables when using "_"

Fixed the type for offending "wsrep", wrongly
set to SHOW_SIMPLE_FUNC.

Added a test case.
2014-03-04 22:10:28 -05:00
Nirbhay Choubey
87910f7d30 MDEV#5759 Init script contains syntax error
Fixed the init script.
2014-02-27 17:56:28 -05:00
Nirbhay Choubey
5de274c43b Fixed install_macros.cmake to set the correct
destination for documentation.
2014-02-19 13:59:10 -05:00
Nirbhay Choubey
e6a7a3804d * mysqld_safe could not start server as it failed
trying to perform wsrep position recovery.
  Fixed by correcting the erroneous mysqld command
  by properly quoting it.

* Merged the changes made to Ubuntu rules in previous
  revision to Debian rules.
2014-02-14 17:03:44 -05:00
Nirbhay Choubey
9564537cb1 Fixes in debian distribution files. 2014-02-13 09:33:04 -05:00
Jan Lindström
b0ad00df27 MDEV-5644: Assertion failure during lock_cancel_waiting_and_release.
Analysis: In wsrep case there is two transactions possible trx and 
conflicting lock owning transaction. Code was handling trx mutexin
correctly but not for c_lock->trx case.

Fixed by taking clock-trx mutex when needed and releasing trx
mutex if it is taken at lower levels.
2014-02-11 15:03:42 +02:00
Nirbhay Choubey
65f2f289d1 MDEV#5626 : Cannot install InnoDB/XtraDB plugin
(undefined symbol: wsrep_md5_update)

Refactored wsrep's md5 related code so that Innodb/xtradb
no longer relies on mysys_ssl for md5 implementation.
2014-02-10 09:22:24 -05:00
Nirbhay Choubey
aaf3063d0d Dummy empty revision (to trigger bb). 2014-02-07 09:14:43 -05:00
Nirbhay Choubey
324544ea64 Fix for main.commit test. 2014-02-03 17:14:38 -05:00
Nirbhay Choubey
4d254ef4f2 * Fixed debian dist file names.
* Fixed failing test results.
* Updated tztime.cc (lp:1161432).
2014-01-30 20:27:01 -05:00
Nirbhay Choubey
4a6be51f78 * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.
* Fixed Debian/Ubuntu dist files.
* Fixed some compiler warnings.
2014-01-30 12:45:38 -05:00
Jan Lindström
5b6a4f25a5 Fixed issue on wsrep_kill_victim mutexing order error. Furthermore, fixed merge
errors found on mysql-test suite testing.
2014-01-29 08:54:17 +02:00
Jan Lindström
86d470386b Fixed issue with extra status lines Wsrep_local_bf_aborts at SHOW GLOBAL STATUS
LIKE 'x'; where x != wsrep_local_bf_aborts by changing it as SHOW_SIMPLE_FUNC
from SHOW_FUNC.
2014-01-28 09:48:51 +02:00
Jan Lindström
d43afb8828 Merge MariaDB-10.0.7 revision 3961. 2014-01-25 11:02:49 +02:00
Jan Lindström
d0f77b8361 Fixed issue with retrying autocommitted transactions. We might need to
clean up the explain structure in this case.
2014-01-20 12:17:31 +02:00
Seppo Jaakola
caa1b783bd Fixed one compiler warning in wsrep_applier.cc 2014-01-17 13:55:09 +02:00
Seppo Jaakola
a8dbf680e6 Added missing files 2014-01-17 13:28:43 +02: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