Commit graph

33457 commits

Author SHA1 Message Date
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
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
d43afb8828 Merge MariaDB-10.0.7 revision 3961. 2014-01-25 11:02:49 +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
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
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
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
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
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
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
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
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
Sergei Golubchik
d28d3ba40d 10.0-base merge 2013-12-16 13:02:21 +01:00
Sergey Vojtovich
4541c4d3fb MDEV-5319 - Request for merge of Oqgraph v3 functionality
storage/oqgraph into 10.0

- fixed sys_vars.all_vars (added oqgraph_allow_create_integer_latch_basic.test)
- since oqgraph depends on Judy, move it to a separate package
2013-12-16 13:55:43 +04:00
Sergey Vojtovich
cd342e78b8 MDEV-4748 - metadata_lock_info plugin
- restore find_ticket() private status, declare friend function instead
- added metadata_lock_info to DEFAULT_SUITES
2013-12-16 12:26:20 +04:00
Sergei Golubchik
6bf10fac44 5.5 merge 2013-12-15 15:57:26 +01:00
Igor Babaev
8efaff4959 Fixed bug mdev-5415.
Do not calculate selectivity of conditions for the tables of the information schema.
2013-12-14 19:13:37 -08:00
Sergei Golubchik
ff485d2dc4 MDEV-5438 A view can mask a table that supports discovery 2013-12-13 14:26:10 +01:00
Alexander Barkov
0c0fe7a862 Fixing temporarily test failures in ctype_xxx.
The problem reported as MDEV-5444.
2013-12-13 17:18:10 +04:00
Sergei Golubchik
e68bccc743 5.3 merge 2013-12-13 13:00:38 +01:00
Sergey Vojtovich
258bf32d3c MDEV-4748 - metadata_lock_info plugin
- include metadata_lock_info plugin into debian packages
- ignore metadata_lock_info plugin in mysqld--help test
- let test suite run with built-in metadata_lock_info plugin
2013-12-13 12:42:45 +04:00
Igor Babaev
3ec4296ec4 Fixed bug mdev-5410.
The fix for bug #27937 was incomplete: it did not handle correctly the queries
containing UNION with global ORDER BY in subselects.
2013-12-12 13:55:33 -08:00
Sergei Golubchik
47ee721923 MDEV-4403 Attempting to use cassandra storage engine causes "service 'my_snprintf_service' interface version mismatch"
When a DSO is loaded we rewrite service pointers to point to the actual service structures.
But when a DSO is unloaded, we have to restore their original values, in case this DSO
wasn't removed from memory on dlclose() and is later loaded again.
2013-12-09 12:39:13 +01:00
Sergei Golubchik
6ae5f0efea MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work
Patially merge WL#5917, to understand v2 row events
2013-12-09 12:37:45 +01:00
Igor Babaev
21d0d8c5bf Merge 2013-12-05 12:40:04 -08:00
Igor Babaev
ccf5871d7b Fixed bug mdev-5382
When marking used columns the function find_field_in_table_ref() erroneously
called the walk method for the real item behind a view/derived table field
with the second parameter set to TRUE.
This erroneous code was introduced in 2006.
2013-12-05 11:13:20 -08:00
unknown
b78f721460 MDEV-5353: server crash on subselect if WHERE applied to some result field
Correct processing of view/derived with no tables added.
2013-12-04 16:54:33 +02:00
Seppo Jaakola
496e22cf3b merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6
and a number of fixes to make this buildable. 
Run also few short multi-master high conflict rate tests, with no issues
2013-12-04 10:32:43 +02:00
Sergei Golubchik
a3b99778fc 5.2 merge 2013-12-02 12:32:43 +01:00
Alexander Barkov
b97b9536c7 MDEV-4857 Wrong result of HOUR('1 00:00:00')
modified:
  mysql-test/r/func_time.result
  mysql-test/t/func_time.test
  sql-common/my_time.c
  sql/item_func.h
  sql/item_timefunc.cc
  sql/mysql_priv.h
  sql/time.cc
2013-12-02 15:09:34 +04:00
Sergei Golubchik
7e431dc379 5.1 merge 2013-12-01 20:12:19 +01:00
Sergei Golubchik
f534708bd6 MDEV-5266 MySQL:57657 - Temporary MERGE table with temporary underlying is broken by ALTER
Fix ha_myisammrg::update_create_info() to do what ha_myisammrg::append_create_info() does -
take sub-table names from TABLE_LIST, not reverse engineer tablefile names.

Backport praveenkumar.hulakund@oracle.com-20120127081643-u7dxy23i8yyqarm7 from mysql-5.6
2013-11-29 20:21:05 +01:00
Alexander Barkov
c23b36510e Fixing mysql_tzinfo_to_sql_symlink.result that was
inintentionally broken during merge 5.5->10.0-base

modified:
  mysql-test/r/mysql_tzinfo_to_sql_symlink.result
2013-11-29 15:44:22 +04:00
Sergei Golubchik
38c91c067b MDEV-4955 discover of table non-existance on CREATE
when frm file exists, but the table does not.

In recover_from_failed_open(), allow the discovery
to fail without an error, when
open_strategy == TABLE_LIST::OPEN_IF_EXISTS.
2013-11-28 16:39:17 +01:00
Sergei Golubchik
1387e71531 MDEV-5281 Partitioning issue after upgrade from 10.0.3-1 to 10.0.5-1
merged from 5.6:
Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING
Bug#16589511: MYSQL_UPGRADE FAILS TO WRITE OUT ENTIRE ALTER TABLE ... ALGORITHM= ... STATEMENT
Bug#16274455: CAN NOT ACESS PARTITIONED TABLES WHEN DOWNGRADED FROM 5.6.11 TO 5.6.10

plus minor changes from 5.6, mainly comments
2013-11-28 12:10:44 +01:00
Sergei Golubchik
44db9c41b3 typo fix in ha_partition::rnd_pos(), status wasn't updated 2013-11-27 22:30:59 +01:00
Sergei Golubchik
b16e67fd9c install and package plugin suites. 2013-11-27 21:58:47 +01:00
Sergei Golubchik
c2839e2cf2 mysql-test: allow suite.pm add its suite to the default list.
run tokudb suites by default.
mark big and slow tests tokudb.change_column_all_1000_1 and
tokudb.change_column_all_1000_10 test as --big
2013-11-27 21:58:36 +01:00