mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 07:44:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
163975 commits 2778 branches 343 tags 1.6 GiB
Commit graph

16330 commits

Author SHA1 Message Date
Andrew McDonnell
a235504b75 Ensure VERBOSE_DEBUG is off by default 2015-02-28 22:43:18 +10:30
Andrew McDonnell
2b9aba3b55 Updated (C) message to 2015, and changelog 2015-02-28 22:43:04 +10:30
Andrew McDonnell
c65f323836 Fixed more cases for MDEV-6282 2015-02-28 22:37:06 +10:30
Andrew McDonnell
e32dafe778 Hopefully finally fixes MDEV-6282, MDEV-5748 and MDEV-6345 2015-02-28 22:37:06 +10:30
Andrew McDonnell
f8e0f1a823 Minor code cleanup: validation of options to member function. 2015-02-28 22:37:05 +10:30
Andrew McDonnell
fbcabb24ce Fixed minor spelling mistake. 2015-02-28 22:37:05 +10:30
Andrew McDonnell
6ff6bf8aa3 Added regression test for MDEV-6345 2015-02-28 22:37:04 +10:30
Andrew McDonnell
a657abd63f Added extra debug to support MDEV-6282 
Conflicts:
	storage/oqgraph/ha_oqgraph.cc
 2015-02-28 22:37:04 +10:30
Andrew McDonnell
e72abc5a96 Minor fix: make sure alter table wont try to change our storage engine to something else. 2015-02-28 22:37:04 +10:30
Andrew McDonnell
79246ebfe9 Partial code tidy: move plugin description to end with other items, and added status variable for debug. 2015-02-28 22:37:03 +10:30
Andrew McDonnell
13e30c0063 Removed dead code and support for dead (<10.0.5) versions of mariadb 
Conflicts:
	storage/oqgraph/ha_oqgraph.cc

Conflicts:
	storage/oqgraph/ha_oqgraph.cc
 2015-02-28 22:37:03 +10:30
Andrew McDonnell
abf1e259f6 Partial whitespace cleanup. 
Conflicts:
	storage/oqgraph/ha_oqgraph.cc

Conflicts:
	storage/oqgraph/ha_oqgraph.cc
 2015-02-28 22:29:43 +10:30
Andrew McDonnell
826141368c Added regression test for MDEV-6282 2015-02-28 22:29:42 +10:30
Andrew McDonnell
1973c00970 Update 2014 (C) message 2015-02-28 22:02:58 +10:30
Sergei Golubchik
6c09a72af5 Merge remote-tracking branch 'origin/10.0' into 10.0 2015-02-24 20:52:37 +01:00
Sergei Golubchik
73033e5e1a fix mroonga to compile w/o performance schema 2015-02-24 15:54:59 +01:00
Sergei Golubchik
723be51678 Merge 2015-02-24 14:17:00 +01:00
Jan Lindström
8799f87075 MDEV-7623: Add lock wait time and hold time to every record/table lock in 
InnoDB transaction lock printout.
 2015-02-24 10:33:49 +02:00
Jan Lindström
90635c6fb5 MDEV-7620: Transaction lock wait is missing number of lock 
waits and total wait time.
 2015-02-23 11:24:19 +02:00
Sergei Golubchik
f2cb45daf3 Merge remote-tracking branch 'origin/10.0' into 10.0 2015-02-22 21:45:24 +01:00
Olivier Bertrand
a736e63f7c - Add new Json UDF's Json_Array_Add, Json_Array_Grp and Json_Object_Grp. 
Handle longjmp's raised during json processing.
modified:
  storage/connect/global.h
  storage/connect/ha_connect.cc
  storage/connect/json.cpp
  storage/connect/jsonudf.cpp

- Fix wrong references to the suppressed g->Trace variables.
modified:
  storage/connect/global.h
  storage/connect/plugutil.c
  storage/connect/tabjson.cpp
  storage/connect/tabodbc.cpp
 2015-02-22 17:53:02 +01:00
Sergei Golubchik
77e6e74a26 merge 10.0-spider 2015-02-19 22:05:33 +01:00
Kentoku SHIBA
cf3b51b1d5 Merge Spider 3.2.18 2015-02-20 00:41:26 +09: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
Sergei Golubchik
d7e7862364 Merge branch '5.5' into 10.0 2015-02-18 15:16:27 +01:00
Jan Lindström
a1a32f8f25 Revert file space allocation change on row0merge.cc. 2015-02-18 06:59:28 +02: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
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
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
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
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
Jan Lindström
44a9e3f7b4 MDEV-7139: Sporadic failure in innodb.innodb_corrupt_bit on P8 
The testcase fails randomly due to ibuf merge happening in the background.
Fix not to do any merges with ibuf_debug enabled.
 2015-02-09 16:14:27 +02:00
Olivier Bertrand
3c097fd689 - Remove some GCC warnings 
modified:
  storage/connect/ha_connect.cc
 2015-02-08 19:47:26 +01:00
Olivier Bertrand
96ba1f1473 - Handle the use of date/time values when making queries for MYSQL or 
ODBC. Was raised by 7549.
modified:
  storage/connect/ha_connect.cc
  storage/connect/odbconn.cpp
  storage/connect/tabodbc.cpp
 2015-02-08 18:17:29 +01:00
Olivier Bertrand
35548d577c - Modify the connect_type_conv and connect_conv_size variables. 
They were global (read-only) now they are session (not read-only)
modified:
  storage/connect/checklvl.h
  storage/connect/ha_connect.cc
  storage/connect/myconn.cpp
  storage/connect/myutil.cpp
  storage/connect/tabutil.cpp

- Suppress the compver variable on Linux compile. Was not
  debian reproductible because using __DATE__ and __TIME__ macros.
modified:
  storage/connect/ha_connect.cc

- ODBC LONGVARVAR type conversion now uses connect_conv_size.
modified:
  storage/connect/odbconn.cpp
 2015-02-07 11:33:52 +01:00
Jan Lindström
8cc9751165 MDEV-7538: Wrong constraint (TINYINT or MEDIUMINT and INT) 
causes server crash

Analysis: If wrong data types used on foreign constraint there
was possibility that foreign->id is NULL when incorrect
foreign constraint was removed from the dictionary cache.

Fix: Add guard foreign->id != NULL before trying to lookup
or remove the foreign constraint from dictionary cache.

Tested using user database where problem was repeatable.
 2015-02-04 14:40:46 +02:00
Jan Lindström
f32091532d MDEV-7055: MySQL#74664 - InnoDB: Failing assertion: len <= col->len || col->mtype == 5 || (col->len == 0 && col->mtype == 1) in file rem0rec.cc line 845 
Debug assertion maybe too strict.
 2015-02-04 10:50:16 +02:00