mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-26 08:44:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
175004 commits 2779 branches 343 tags 1.6 GiB
Commit graph

175004 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oleksandr Byelkin
2c52493d14 Fixed condition 2016-09-09 13:13:27 +02:00
Kristian Nielsen
ec47beaba6 Merge parallel replication async deadlock kill into 10.2. 
Conflicts:
	sql/mysqld.cc
	sql/slave.cc
 2016-09-09 12:15:53 +02:00
Sergei Golubchik
06b7fce9f2 Merge branch '10.1' into 10.2 2016-09-09 08:33:08 +02:00
Oleksandr Byelkin
1f2ff25eba Fixed embedded server. 2016-09-08 22:41:50 +02:00
Kristian Nielsen
7e0c9de864 Parallel replication async deadlock kill 
When a deadlock kill is detected inside the storage engine, the kill
is not done immediately, to avoid calling back into the storage engine
kill_query method with various lock subsystem mutexes held. Instead the
kill is queued and done later by a slave background thread.

This patch in preparation for fixing TokuDB optimistic parallel
replication, as well as for removing locking hacks in InnoDB/XtraDB in
10.2.

Signed-off-by: Kristian Nielsen <knielsen at knielsen-hq.org>
 2016-09-08 15:25:40 +02:00
Igor Babaev
effb65bc86 Adjusted test results. 2016-09-07 19:34:11 -07:00
Igor Babaev
a2b8bdfbb9 Merge branch '10.2' into bb-10.2-mdev9864 2016-09-07 15:49:56 -07:00
Igor Babaev
82626d7879 Adjusted test results. 2016-09-07 08:51:18 -07:00
Oleksandr Byelkin
4ec088f2e7 MDEV-8348: Add catchall to all table partitioning for list partitions 
DEFAULT partition support added to LIST and LIST COLUMN partitioning.
Partitions Prunning added for DEFAULT partititon.
 2016-09-07 17:26:36 +02:00
Sergei Petrunia
95b8dcbd43 MDEV-10729: Server crashes in st_select_lex::set_explain_type 
Make the new (CTE-related) code in set_explain_type to take into
account that some JOIN_TABs are non-merged semi-joins, and do not
have a TABLE object.
 2016-09-07 17:14:30 +03:00
Alexander Barkov
a032fd5c1c MDEV-10758 engines/funcs.db_alter_collate_ascii and engines/funcs.db_alter_collate_utf8 fail with wrong results 2016-09-07 16:43:45 +04:00
Sergei Petrunia
e305054f31 MDEV-10058: Suspicious EXPLAIN output for a derived table + WITH + joined tabl 
Add a testcase
 2016-09-07 12:22:41 +03:00
Sergei Petrunia
4c39f75c73 MDEV-10057: Crash with EXPLAIN + WITH + constant query 
Add the testcase
 2016-09-07 11:35:06 +03:00
Sergei Petrunia
06ba09d604 Merge branch '10.2' of github.com:MariaDB/server into 10.2 2016-09-07 11:17:41 +03:00
Alexander Barkov
dd283db6bc MDEV-8909 union parser cleanup 
This is the final patch removing some old remainders that are
not needed anymore.

(Other clean-ups were done in earlier commits)
 2016-09-07 11:36:22 +04:00
Daniel Black
5e20c61fcc MDEV-10707 Tokudb tokudb_parts test suites failing (#229) 2016-09-07 01:13:17 +03:00
Igor Babaev
5684f9d2d1 Merge branch '10.2' into bb-10.2-mdev9864 2016-09-06 14:43:05 -07:00
Igor Babaev
d6f87e68f1 For some unclear reasons the test case for bug mdev-10736 
does not work in non-debug modes.
 2016-09-06 14:36:59 -07:00
Igor Babaev
dc9b0924d1 More cleanup. 2016-09-06 11:20:50 -07:00
Igor Babaev
2c6d620019 Merge branch '10.2' into bb-10.2-mdev9864 2016-09-06 10:57:14 -07:00
Igor Babaev
2d36e5aa38 Fixed bug mdev-10736 that caused crashes. 
The bug manifested itself for recursive definitions that
used anchors over tables with blobs.
 2016-09-06 10:05:36 -07:00
Igor Babaev
2f83cc6388 Removed redefinitions of some newly introduced constants. 2016-09-06 09:11:34 -07:00
Sergei Golubchik
8494039757 fix the test to work 
without preceding sys_vars.wsrep_provider_basic
 2016-09-06 16:34:25 +02:00
Alexey Botchkov
225440047d MDEV-10421 duplicate CHECK CONSTRAINTs. 
mysql_prepare_create_table fixed so it doesn't let duplicating
        constraint names. Syntax for CONSTRAINT IF NOT EXISTS added
        and handled in mysql_alter_table.
 2016-09-06 14:42:33 +04:00
Alexander Barkov
00dfe27f7c Recording information_schema.result (forgotten in the patch for MDEV-9711) 2016-09-06 14:42:54 +04:00
Alexander Barkov
ee19806b8e MDEV-9711 NO PAD collations 
Based on the patch from Daniil Medvedev (a Google Summer of Code task)
 2016-09-06 12:50:02 +04:00
Alexander Barkov
e4f6fd5e12 MDEV-10743 LDML: a new syntax to reuse sort order from another 8bit simple collation 2016-09-06 12:37:11 +04:00
Igor Babaev
8ae65920fa Fixed bug mdev-10737. 
This bug in st_select_lex_node::move_node could result
in invalid select lists in recursive units that could
cause falling into infinite loops when iterating over
selects in such units.
 2016-09-05 23:07:31 -07:00
Igor Babaev
9fc2358684 Merge branch '10.2' into bb-10.2-mdev9864 2016-09-05 22:13:01 -07:00
Igor Babaev
de02bfd373 The code that pushed conditions into derived did not 
take into account that the list of equal items in
an Item_equal object may contain items with type() == REF_ITEM.
 2016-09-05 22:10:50 -07:00
Sergei Golubchik
61fd38a1de update plugin maturities 2016-09-05 17:11:14 +02:00
Elena Stepanova
aaedb63ee0 MDEV-10741 sys_vars.sysvars_server_embedded 32-bit fails in buildbot 
The rdiff file needed to be adjusted after changes made in scope of MDEV-9864
 2016-09-05 16:01:44 +03:00
Sergei Golubchik
362ad94bb0 cleanup: don't copy-paste, don't current_thd 2016-09-05 09:11:42 +02:00
Alexander Barkov
9e89e117f9 MDEV-10742 LDML: make conf_to_src reuse common data between collations 2016-09-05 10:03:10 +04:00
Igor Babaev
7faff4de82 Merge branch '10.2' into 10.2-mdev9197 2016-09-04 20:42:07 -07:00
Igor Babaev
3b40f78ede Fixed a flaw in the implementation of condition push-down 
for materialized views and derived tables: there were no
push-down if the view was defined as union of selects
without aggregation. Added test cases with such unions.

Adjusted result files after the merge of the code for mdev-9197.
 2016-09-04 20:11:58 -07:00
Oleksandr Byelkin
1da21cd4a5 MDEV-10035: DBUG_ASSERT on CREATE VIEW v1 AS SELECT * FROM t1 FOR UPDATE 
Ability to print lock type added.
Restoring correct lock type for CREATE VIEW added.
 2016-09-04 14:15:21 +02:00
Alexander Barkov
3dcca1b724 A fix for 1ca595fbf7 (LDML refactoring) 
Modifying innodb_ctype_ldml.test related files to take into account
the previous commit changes.
 2016-09-03 14:25:04 +04:00
Alexander Barkov
1ca595fbf7 LDML refactoring for "MDEV-9711 NO PAD collations" 
- Moving detection of the MY_CS_CSSORT, MY_CS_PUREASCII, MY_CS_NONASCII
  flags of loadable collations from add_collation() in mysys.c
  to my_cset_init_8bit() and my_coll_init_simple() in ctype-simple.c.

- Adding tests that these flags are set properly for loadable collations

- Moving LDML test related *.xml files from mysql-test/std_data/
  to mysql-test/std_data/ldml/, as there will be more *.xml test files
 2016-09-03 09:05:56 +04:00
Nirbhay Choubey
747893a854 MDEV-10545: Update perfschema.nesting result 2016-09-02 14:40:09 -04:00
Nirbhay Choubey
31697d0b80 MDEV-10545: Server crashed in my_copy_fix_mb on querying I_S and P_S tables 
Once THDs have been added to the global "threads" list,
they must modify query_string only after acquiring per-
thread LOCK_thd_data mutex.
 2016-09-02 12:21:40 -04:00
Oleksandr Byelkin
a6fb6473cf MDEV-10419: crash in mariadb 10.1.16-MariaDB-1~trusty 
Fixed initialization and usage of THD reference in subselect engines.
 2016-09-02 16:20:38 +03:00
Igor Babaev
102fc62990 Fixed a failure with cte_recursive.test: 
Do not push conditions into recursive with tables.
 2016-09-01 23:44:42 -07:00
Igor Babaev
4de75afb45 Fixed the previous merge to be able to build mysqld. 
Adjusted one result file.
 2016-09-01 23:37:27 -07:00
Igor Babaev
17622bc088 Merge branch '10.2' into 10.2-mdev9197 2016-09-01 15:07:10 -07:00
Monty
addb38f476 More DBUG_PRINT's to make it easier to debug 
parallel replication
 2016-09-01 21:15:17 +03:00
Monty
b6e436278f Split rpl_parallel into two tests to make it easier 
to know what goes wrong.
rpl_parallel_conflicts now contains the tests that
can cause row conflicts in replication.
 2016-09-01 21:11:47 +03:00
Sergei Petrunia
e19ca69191 Update test results, mysql-test/r/mysqld--help,win.rdiff 2016-09-01 19:52:04 +03:00
Sergey Vojtovich
dd31e5c6ab MDEV-9593 - Print the real version in the error log 2016-09-01 12:29:53 +04:00
Igor Babaev
3fb4f9bb93 Merge branch '10.2-mdev9197-cons' of github.com:shagalla/server 
into branch 10.2-mdev9197.
 2016-08-31 16:16:54 -07:00