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

170359 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergei Golubchik
77e6e74a26 merge 10.0-spider 2015-02-19 22:05:33 +01:00
Sergei Petrunia
0f8b194146 MDEV-6687: Assertion `0' failed in Protocol::end_statement on query 
Redefine FT_KEYPART in a way that it does not conflict with Hash Join.
Hash join stores field->field_index in KEYUSE::keypart, so we must
use a value of FT_KEYPART that's greater than MAX_FIELDS.
 2015-02-19 20:54:20 +03:00
Kentoku SHIBA
cf3b51b1d5 Merge Spider 3.2.18 2015-02-20 00:41:26 +09:00
Kristian Nielsen
004dd0aaa8 MDEV-7568: STOP SLAVE crashes the server 
The order of initialisation during server startup was incorrect. The slave
threads were started before the parallel replication worker thread pool was
initialised, allowing a race where uninitialised data could be accessed.
 2015-02-19 15:43:27 +01:00
Sergei Golubchik
c1ebb4a60f compiler warnings in spider 2015-02-19 11:28:03 +01:00
Sergei Golubchik
16c01c7004 after merge: fix mroonga to compile and pass its tests 2015-02-19 10:26:52 +01:00
Sergei Golubchik
da637137ba merge 10.0-mroonga 2015-02-19 09:57:34 +01:00
Sergei Golubchik
56114a416f merge 10.0-connect 2015-02-19 09:37:11 +01:00
Olivier Bertrand
d9175f3822 - Remove GCC warnings 
modified:
  storage/connect/jsonudf.cpp
  storage/connect/tabutil.h
 2015-02-19 01:25:31 +01:00
Olivier Bertrand
564d41faf4 - Work on JSON and JSON UDF's 
modified:
  storage/connect/json.cpp
  storage/connect/jsonudf.cpp
  storage/connect/tabjson.cpp

- CntReadNext: Enable EvalColumns for longjmp
modified:
  storage/connect/connect.cc
 2015-02-19 00:59:02 +01:00
Sergei Golubchik
174bccd3ff xtradb 5.6.22-72.0 2015-02-18 20:31:40 +01:00
Sergei Golubchik
6b05688f6d innodb 5.6.23 2015-02-18 17:59:21 +01:00
Chaithra Gopalareddy
1a5b8122b6 Bug #19612819 : FILESORT: ASSERTION FAILED: POS->FIELD != 0 || POS->ITEM != 0 
Problem:
While getting the temp table field for a REF_ITEM
make_sortorder is using the real_item. As a result
server fails later with an assert.

Solution:
Do not use real_item to get the temp table field.
Instead use the REF_ITEM itself as temp table fields
are created for REF_ITEM not the real_item.
 2015-02-18 22:28:03 +05:30
Sergei Golubchik
1645930d0b 5.6.23 2015-02-18 16:20:46 +01:00
Sergei Golubchik
f37bdd9c1a Merge remote-tracking branch 'github/10.0' into 10.0 2015-02-18 15:18:35 +01:00
Sergei Golubchik
d7e7862364 Merge branch '5.5' into 10.0 2015-02-18 15:16:27 +01:00
Sergei Golubchik
dfb001edcd percona-server-5.6.22-72.0 2015-02-18 13:19:09 +01:00
Jan Lindström
865b83e9a4 Fixed test failure seen on partition_innodb_plugin test case. 2015-02-18 14:07:13 +02:00
Jan Lindström
2fb81b956d MDEV-7408: Cannot use a table containing special chars for InnoDB stopwords 
Added test case. No actual bug found.
 2015-02-18 11:25:59 +02:00
Rik Prohaska
96ea639362 Merge branch 'master' into releases/tokudb-7.5 2015-02-18 01:46:23 -05:00
Rik Prohaska
084668af6b DB-814 cleanup trx->sp_level when master txn (trx->all) is retired 2015-02-18 01:46:09 -05:00
Jan Lindström
63905f1447 Add forgotten test case change (add more). 2015-02-18 07:28:44 +02:00
Jan Lindström
a1a32f8f25 Revert file space allocation change on row0merge.cc. 2015-02-18 06:59:28 +02:00
Sergei Golubchik
44cf4d6751 fix a case where automatic procedure grant was changing user's password 
phase out make_password_from_salt() to be removed in 10.1
 2015-02-17 18:07:56 +01:00
Sergei Petrunia
22dae70015 Added testcase for MDEV-7193: Incorrect Query Result (MySQL Bug 68897) ... 2015-02-17 20:07:12 +03:00
Kentoku SHIBA
f5dabd7aca Update Mroonga to the latest version on 2015-02-17T13:34:27+0900 2015-02-17 13:34:27 +09:00
Rik Prohaska
629464e75e Merge branch 'master' into releases/tokudb-7.5 2015-02-16 10:46:57 -05:00
Rik Prohaska
bd026f29f9 DB-813 add an interrupt callback to the analyze cursor to allow early termination, plus detect garbage rows during analyze scan 2015-02-16 10:46:46 -05:00
Rik Prohaska
d0fa28aa87 DB-813 add deleted rows count to the cursor interrupt callback. may be useful to count garbage rows. 2015-02-16 10:41:39 -05:00
Sergei Golubchik
fdd6c111c2 MDEV-7419 Function cli_safe_read not exported 
Start the client API for low-level protocol access:
* unsigned long mysql_net_read_packet(MYSQL *mysql);
* unsigned long mysql_net_field_length(unsigned char **packet);
 2015-02-13 12:57:11 +01:00
Jan Lindström
454beee5fb MDEV-6288 :Innodb causes server crash after disk full, then can't ALTER TABLE any more 
Fix try to avoid unnecessary crashes when disk full situation is reached
on alter table.
 2015-02-13 11:49:31 +02:00
Olivier Bertrand
2201aa66cf - Typo on the jsonudf.cpp name 
modified:
  storage/connect/CMakeLists.txt
 2015-02-12 17:23:28 +01:00
Vicențiu Ciorbaru
356ae629f0 Crash during configure without development SSL libraries installed 
Incorrect usage of OPENSSL_INCLUDE_DIR variable within cmake caused the
configure step to fail. The variable was used before being checked if
the include directory actually existed.
 2015-02-12 15:44:44 +02:00
Sergei Golubchik
5dce6aa1fe Merge remote-tracking branch 'bzr/5.5' into bb-5.5-merge 2015-02-12 13:14:55 +01:00
Sergei Golubchik
ed839052d7 Merge tag 'tokudb-7.5.5' into bb-5.5-merge 2015-02-12 00:23:21 +01:00
Sergei Golubchik
8e80f91fa3 Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42 2015-02-11 23:50:40 +01:00
Olivier Bertrand
dcfe068d59 - Adding json udf's. Making the second version of json tables. 
added:
  storage/connect/jsonudf.cpp
modified:
  storage/connect/CMakeLists.txt
  storage/connect/json.cpp
  storage/connect/json.h
  storage/connect/tabjson.cpp
  storage/connect/tabjson.h

- Fix utf8 issues with PROXY tables
modified:
  storage/connect/ha_connect.cc
  storage/connect/tabutil.cpp
  storage/connect/tabutil.h
 2015-02-11 21:39:41 +01:00
Sergei Golubchik
2a1be9cdf8 XtraDB 5.5.41-37.0 2015-02-11 20:40:56 +01:00
Sergei Golubchik
13927f878e percona-server-5.5.41-37.0 2015-02-11 18:32:40 +01:00
Sergei Golubchik
d996dc2997 MDEV-7290 please update MSI installer to include HeidiSQL 9.1 2015-02-11 15:02:15 +01:00
Jan Lindström
56da6252f7 Improve InnoDB transaction lock output by providing number of table locks 
this transaction is currently holding and total number of table locks to
the table where lock is held.
 2015-02-10 15:15:27 +02:00
Alexander Barkov
a2578018bf Fixing compilation failure in storage/connect when -DMYSQL_MAINTAINER_MODE=ON: 
disabling some CXX errors in storage/connect/CMakeLists.txt.
 2015-02-10 16:01:03 +04:00
Sergei Golubchik
63108dc9d2 Fix the tree to work in git. Backport corresponing 10.1 changes. 2015-02-10 12:26:21 +01:00
Sergei Golubchik
75884242ab restore a cross-compiling bit that was lost in a merge 2015-02-10 10:19:42 +01:00
Jan Lindström
48e7c19f9e Fix test failure innodb-mdev7046 on Windows. Test causes 
OS error printout from InnoDB.
 2015-02-10 09:41:54 +02:00
Sergei Golubchik
a34fd50ce1 MDEV-7478 log-basename unpredictable behavior in standalone mode 
* fix /etc/init.d/mysql to use log-basename for pid-filename
* fix mysqld_safe not to force logging-to-file when log-basename is specified
 2015-02-09 20:53:36 +01:00
Sergei Golubchik
f007f82881 MDEV-7351 5.5 build fails on Ubuntu Utopic in buildbot 
include oqgraph into deb packages conditionally, just like we do with tokudb
 2015-02-09 20:53:28 +01:00
unknown
c233d6e120 MDEV-7260: Crash in get_best_combination when executing multi-table UPDATE with nested views 
Do not use merge_for_insert for commands which use SELECT because optimizer can't work with such tables.

Fixes which makes multi-delete working with normally merged views.
 2015-02-11 01:26:50 +01:00
Alexey Botchkov
cfb7d5d78a MDEV-7516 Assertion `!cur_p->event' failed in Gcalc_scan_iterator::arrange_event(int, int). 
When the distance in ST_BUFFER is too far negative the coordinates can run out of the operational
    area. We should just return an empty geometry in this case.
 2015-02-10 16:16:31 +04:00
Jan Lindström
552f1b3505 Fix test failures on innodb-mdev-7055 and innodb-mdev-7513. 2015-02-10 14:17:23 +02:00