mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
90833 commits 2794 branches 343 tags 1.5 GiB
Commit graph

90833 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergei Golubchik
06c1690445 revert test changes from "cleaned up code for setting slave_parallel_mode" 
but keep the code cleanup.
as it turns out, it didn't change the behavior, which is good :)
 2015-02-02 18:02:43 +01:00
Sergei Golubchik
51bdfb01d8 trivial cleanup: be explicit about extern variables 2015-02-02 09:04:16 +01:00
Sergei Golubchik
9efd0207e4 fix the code to compile 2015-02-02 09:03:40 +01:00
Monty
cd9e69ec70 Cleaned up code for setting slave_parallel_mode 
Now this works the same way as all other multi source variables.
 2015-02-01 22:39:59 +02:00
Monty
0ee879ff8a Improve performance for calculating memory allocation 
Extend interface for 'show variables' with current scope
 2015-02-01 15:24:22 +02:00
Monty
67b24a2374 Remove some allocations not needed for internal temporary tables. 2015-02-01 14:19:39 +02:00
Monty
e7870122f3 Ignore tokudb binaries 2015-02-01 14:19:39 +02:00
Sergei Golubchik
6a3fee211f Merge remote-tracking branch 'refs/remotes/github/10.1' into 10.1 2015-02-01 12:39:59 +01:00
Sergei Golubchik
b2ceedc9fb main.ctype_ucs2 --ps: Item_func_nullif should use m_args0_copy metadata 
in case args[0] changes between PREPARE and EXECUTE
 2015-01-31 21:51:45 +01:00
Sergei Golubchik
f122cca4df main.null --ps: Item_null doesn't need charset converter 
in particular, not the one that destructively changes Item's charset
(meaning different metadata for PREPARE and EXECUTE)
 2015-01-31 21:51:45 +01:00
Sergei Golubchik
6f12cfdc5e fix semisync plugin locking: rpl.rpl_semi_sync_uninstall_plugin failed 2015-01-31 21:51:45 +01:00
Sergei Golubchik
863cfb3fa5 small cleanup, remove a useless function 2015-01-31 21:51:45 +01:00
Sergei Golubchik
b050354ffb compiler warnings 2015-01-31 21:51:45 +01:00
Sergei Golubchik
f299da89ba rpl.rpl_parallel: after-merge fix 
* fix the test to pass
* rearrange tests in a file to allow it to auto-merge in the future
 2015-01-31 21:51:45 +01:00
Sergei Golubchik
4b21cd21fe Merge branch '10.0' into merge-wip 2015-01-31 21:48:47 +01:00
Sergei Golubchik
a06624d61f merge 2015-01-30 21:24:39 +01:00
Sergei Golubchik
dfc7e9541d MDEV-7531 Update 10.0.15 to 10.0.16 -> Error 2003 (HY000) can't connect to MySql server. 
use the old registry branch, even if we changed the "manufacturer" string
 2015-01-30 15:53:24 +01:00
Oleksandr Byelkin
edf34f38ac MDEV-7024: Assertion `! is_set()' failed in Diagnostics_area::set_eof_status on executing ANALYZE SELECT via PS 
select_send::is_result_interceptor() should return FALSE because it return results to the client.
 2015-01-29 22:43:07 +01:00
Sergei Golubchik
5c309012c4 increase the version 2015-01-29 21:10:45 +01:00
Sergei Golubchik
27439ee6ea 5.5 merge 2015-01-29 18:26:07 +01:00
Sergei Golubchik
5f63c9c067 recreate expired certificates for SSL tests 
added a script to regenerate certificates easily in the future (2035!)
restored server8k-key.pem to actually be 8K key, as it was supposed to
 2015-01-29 14:34:31 +01:00
Oleksandr Byelkin
51feb6fa99 MDEV-7023: Error 2027: Malformed packet and assertion `field_types == 0 || field_types[field_pos] == MYSQL_TYPE_INT24 || field_types[field_pos] == MYSQL_TYPE_LONG' failure in Protocol_text::store_long 
The problem was that sp_head::MULTI_RESULTS was not set correctly for ANALYZE statement.
 2015-01-29 12:47:13 +01:00
Sergei Golubchik
1e227b8f2c clarify the comment and trivial cleanups 2015-01-29 12:12:29 +01:00
unknown
9033aa02dc MDEV-6128:[PATCH] mysqlcheck wrongly escapes '.' in table names 
Backport from mysql 5.7. The patch reviewed, test added.
 2015-01-28 11:49:55 +01:00
Jan Lindström
0b049b4012 Fix test failure on innodb_stats_fetch_nonexistent. 2015-01-27 15:40:50 +02:00
Nirbhay Choubey
7cda4bee0e maria-10.0.16 merge 
bzr merge -r4588 maria/10.0
 2015-01-26 22:54:27 -05:00
Nirbhay Choubey
ea229eb6bb Minor test modifications. 2015-01-26 22:48:02 -05:00
Nirbhay Choubey
e6f35f1511 Backported changes done in wsrep_guess_ip() from 10.1. 2015-01-26 11:58:16 -05:00
Sergey Petrunya
fb71449b10 MDEV-5719: Wrong result with GROUP BY and LEFT OUTER JOIN 
Merged revision 5224 from mysql-5.6 and added a test case.
..
revno: 5224
committer: Sergey Glukhov <sergey.glukhov@oracle.com>
branch nick: mysql-5.6
timestamp: Wed 2013-06-19 14:24:08 +0400
message:
    Bug#16620047 INCORRECT QUERY RESULT (AFTER SERVER UPGRADE)
 2015-01-25 16:16:25 +01:00
Nirbhay Choubey
53b9f755af MDEV-7374 : Losing connection to MySQL while running ALTER TABLE 
Backport from 10.1.
 2015-01-24 18:46:48 -05:00
Sergei Golubchik
267fc6f2b7 Master_info_index assumed that file descriptor can never be 0 2015-01-24 09:37:58 +01:00
Michael Widenius
45ff0d6277 Ignore some tokudb executables 2015-01-29 15:14:09 +02:00
Michael Widenius
b83f692565 MDEV-6668: Server crashes in check_view_single_update on concurrent DDL/DML flow with views and triggers 
Call mysql_derived_reinit() if we are reusing view.
This is needed as during a previous error condition the view may not have been reset

sql/sql_derived.cc:
  More DBUG_PRINT
  Always reset merged_for_insert (no reason to not do that)
sql/sql_derived.h:
  Added prototype
sql/sql_insert.cc:
  More DBUG_PRINT
  Added DBUG_ASSERT
sql/sql_view.cc:
  Call mysql_derived_reinit() if we are reusing view.
  This is needed as during a previous error condition the view may not have been reset
sql/table.cc:
  More DBUG_PRINT
 2015-01-29 15:12:32 +02:00
Sergei Golubchik
d1c4ff2b2c win32-debug build failure 2015-01-23 14:17:38 +01:00
Kristian Nielsen
c287873795 MDEV-7352: main.kill_processlist-6619 fails sporadically in buildbot 
After fix of MDEV-6728, the KILL signal is reset at the start of query
execution. This means that in this test case, we need to wait for the
to-be-killed query to have started; otherwise the kill signal can be lost,
causing the test case to fail.
 2015-01-23 13:56:46 +01:00
Sergei Golubchik
b07081338b 5.5 merge 2015-01-23 09:36:03 +01:00
Sergei Golubchik
cb9c116a50 update tokudb version after merge 2015-01-23 09:13:21 +01:00
Nirbhay Choubey
0105bf349a MDEV-7476: Allow SELECT to succeed even when node is not ready 
Added a SESSION-only system variable "wsrep_dirty_reads" to allow SELECT
queries to pass even when the node is not prepared to accept queries
(wsrep_ready=OFF). Added a test case.
 2015-01-22 18:00:37 -05:00
Kristian Nielsen
c23c00136a MDEV-7491: Occasional test failure in innodb.group_commit_crash_no_optimize_thread 
The test case deliberately crashes the server. If this crash happens in the
middle of a page write, InnoDB crash recovery recovers the page from the
doublewrite buffer, writing a message to the error log that is flagged as a
test failure by mysql-test-run. So add a suppression for this.
 2015-01-22 16:11:03 +01:00
Sergei Golubchik
f2be9c0fea after merge. innodb/xtradb to work on Windows 2015-01-22 08:58:13 +01:00
Nirbhay Choubey
b520120040 MDEV-7123 : MariaDB 10.0.14 Galera node shutdown with signal 11 
wsrep-patch uses same connection name for constructing Master_info
objects. As a result all existing wsrep Master_info objects refer
to same rpl_filter object. This could lead to race when multiple
threads try to delete/destruct Master_info object, as they would
all try to delete the same relay_log object.

Fixed by adding a check in Master_info's destructor to not free
the "wsrep" rpl_filter, so that its reused by current & subsequent
wsrep threads and later reclaimed by free_all_rpl_filters() during
server shutdown.
 2015-01-21 10:57:46 -05:00
Sergei Golubchik
6e8e081a6f connect merge 2015-01-21 14:58:41 +01:00
Sergei Golubchik
b0a8e07357 P_S 5.6.22 2015-01-21 14:53:40 +01:00
Sergei Golubchik
78e131d493 XtraDB 5.6.22-71.0 2015-01-21 14:34:58 +01:00
Sergei Golubchik
476a8660e6 InnoDB 5.6.22 2015-01-21 14:33:39 +01:00
Sergei Golubchik
ff55d900fb after-merge fixes 2015-01-21 14:02:26 +01:00
Sergei Golubchik
d9c01e4b4a 5.5 merge 2015-01-21 12:03:02 +01:00
Olivier Bertrand
e576772383 - Last revision was to add the JSON table type. This one adds a sort 
on the multiple table result to obtain the same result on Windows
  and Linux (because files can be retrieved in a different order)
modified:
  storage/connect/mysql-test/connect/r/json.result
  storage/connect/mysql-test/connect/t/json.test
 2015-01-20 11:26:03 +01:00
Olivier Bertrand
8fc6956430 - Fix compile errors and warnings of LINUX G++ 
added:
  storage/connect/json.cpp
  storage/connect/json.h
  storage/connect/mysql-test/connect/r/json.result
  storage/connect/mysql-test/connect/std_data/biblio.jsn
  storage/connect/mysql-test/connect/std_data/expense.jsn
  storage/connect/mysql-test/connect/std_data/mulexp3.jsn
  storage/connect/mysql-test/connect/std_data/mulexp4.jsn
  storage/connect/mysql-test/connect/std_data/mulexp5.jsn
  storage/connect/mysql-test/connect/t/json.test
  storage/connect/tabjson.cpp
  storage/connect/tabjson.h
modified:
  storage/connect/CMakeLists.txt
  storage/connect/engmsg.h
  storage/connect/filamtxt.h
  storage/connect/ha_connect.cc
  storage/connect/msgid.h
  storage/connect/mycat.cc
  storage/connect/plgdbsem.h
  storage/connect/tabdos.cpp
  storage/connect/value.cpp
  storage/connect/value.h
 2015-01-20 01:21:56 +01:00
Olivier Bertrand
2d2e110bce - Adding the JSON table type 
added:
  storage/connect/json.cpp
  storage/connect/json.h
  storage/connect/mysql-test/connect/r/json.result
  storage/connect/mysql-test/connect/std_data/biblio.jsn
  storage/connect/mysql-test/connect/std_data/expense.jsn
  storage/connect/mysql-test/connect/std_data/mulexp3.jsn
  storage/connect/mysql-test/connect/std_data/mulexp4.jsn
  storage/connect/mysql-test/connect/std_data/mulexp5.jsn
  storage/connect/mysql-test/connect/t/json.test
  storage/connect/tabjson.cpp
  storage/connect/tabjson.h
modified:
  storage/connect/CMakeLists.txt
  storage/connect/engmsg.h
  storage/connect/filamtxt.h
  storage/connect/ha_connect.cc
  storage/connect/msgid.h
  storage/connect/mycat.cc
  storage/connect/plgdbsem.h
  storage/connect/tabdos.cpp
  storage/connect/value.cpp
  storage/connect/value.h
 2015-01-19 18:55:25 +01:00