1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
88,553 Commits 3,050 Branches 357 Tags
Commit Graph

88553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Barkov
1449d1d54f Moving implementation of INET_ATON() INET_NTOA() into 
separate files item_inetfunc.h and item_inetfunc.cc.
 2014-05-30 15:24:25 +04:00
Elena Stepanova
69742e4ee3 Increase version number 2014-05-26 22:41:35 +04:00
Sergei Golubchik
63a0e5640d typo fixed (compilation failure with libwrap) 2014-05-26 13:31:11 +02:00
Sergei Golubchik
edf1fbd25b MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wrong executable bits 2014-05-13 11:53:30 +02:00
Sergei Golubchik
1170a54060 fix a bad merge, causing a crash of fulltext.test in --ps-protocol 2014-05-10 23:42:01 +02:00
Sergei Golubchik
73216f79e4 10.0 merge 2014-05-10 08:20:27 +02:00
Sergei Golubchik
56f64f796e TokuDB: enable online alter for partitioned tabled 2014-05-09 14:53:32 +02:00
Sergei Golubchik
fca2b1a773 for windows 2014-05-09 12:36:15 +02:00
Sergei Golubchik
d3e2e1243b 5.5 merge 2014-05-09 12:35:11 +02:00
Jan Lindström
dabf471547 MDEV-4791: Assertion range_end >= range_start fails in log0online.c 
on select from I_S.INNODB_CHANGED_PAGES

Analysis: limit_lsn_range_from_condition() incorrectly parses
start_lsn and/or end_lsn conditions.

Fix from SergeyP. Added some test cases.
 2014-05-09 11:43:53 +03:00
Jan Lindström
124428a9e2 MDEV-4791: Assertion range_end >= range_start fails in log0online.c 
on select from I_S.INNODB_CHANGED_PAGES

Analysis: limit_lsn_range_from_condition() incorrectly parses
start_lsn and/or end_lsn conditions.

Fix from SergeyP. Added some test cases.
 2014-05-09 11:03:39 +03:00
unknown
45a91d8cbb MDEV-6193: Problems with multi-table updates that JOIN against read-only table 
All underlying tables should share the same lock type.
 2014-05-08 22:56:36 +03:00
Sergei Golubchik
229dad1f9b merge with 10.0-connect 2014-05-08 11:33:51 +02:00
Sergei Golubchik
60dd52e3a3 fix innodb.row_lock test to work in 10.0 2014-05-08 11:09:00 +02:00
Sergei Golubchik
3e7519f17e fix mdl_sync test to work now when ALTER TABLE .. ENGINE=xxx may be executed online 2014-05-08 10:25:24 +02:00
Sergei Golubchik
c8ee83ee8a after merge test case fixes 2014-05-08 10:25:16 +02:00
Sergei Golubchik
99027efd14 post-fix for the merge of "Bug#16216513 INPLACE ALTER DISABLED FOR PARTITIONED TABLES" 
make this innodb-only patch work for other engines as well
 2014-05-08 10:25:09 +02:00
Sergei Golubchik
9927b36e87 merge of "Bug#16216513 INPLACE ALTER DISABLED FOR PARTITIONED TABLES" 
revno: 4777
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: mysql-5.6
timestamp: Fri 2013-02-15 10:32:25 +0200
message:
  Bug#16216513 INPLACE ALTER DISABLED FOR PARTITIONED TABLES
 2014-05-08 10:01:31 +02:00
Sergei Golubchik
8db4a51815 merge of "BUG#18233051 - FTS: FAILING ASSERTION: NUM_TOKEN < MAX_PROXIMITY_ITEM" 
revno: 5826
committer: Shaohua Wang <shaohua.wang@oracle.com>
branch nick: mysql-5.6-bugfix2
timestamp: Wed 2014-02-19 16:41:14 +0800
message:
  BUG#18233051 - FTS: FAILING ASSERTION: NUM_TOKEN < MAX_PROXIMITY_ITEM
 2014-05-07 22:36:40 +02:00
Sergei Golubchik
914a2b38bf merge of "BUG# 13975227: ONLINE OPTIMIZE TABLE FOR INNODB TABLES" 
revno: 5820
committer: Nisha Gopalakrishnan <nisha.gopalakrishnan@oracle.com>
branch nick: mysql-5.6-13975225
timestamp: Mon 2014-02-17 15:12:16 +0530
message:
  BUG# 13975227: ONLINE OPTIMIZE TABLE FOR INNODB TABLES
 2014-05-07 22:36:25 +02:00
Sergei Golubchik
a2807e41e8 xtradb 5.6.17-65.0 2014-05-07 17:33:33 +02:00
Sergei Golubchik
8ee9d19607 innodb 5.6.17 2014-05-07 17:32:23 +02:00
Sergei Golubchik
08f3280235 5.6-compatibility, per-host connect error counter is reset only after the 
successful connection, not when a client reply packet is received
(that still might be invalid).

(test case was merged with perfschema 5.6.17)
 2014-05-07 16:13:00 +02:00
Sergei Golubchik
a83a4136ff revno: 5265 
committer: Christopher Powers <chris.powers@oracle.com>
branch nick: mysql-5.6-bug16750433
timestamp: Fri 2013-06-28 07:48:12 -0500
message:
  Bug#16750433 - THE STATEMENT DIGEST DOES NOT SHOW THE SLAVE SQL
                 THREAD STATEMENTS

revno: 5414.1.1
committer: Marc Alff <marc.alff@oracle.com>
branch nick: mysql-5.6-bug17271055
timestamp: Thu 2013-08-29 12:29:25 +0200
message:
  Bug#17271055 "STATEMENT/COM" EVENT MEANING IS UNCLEAR

(test case was merged with perfschema 5.6.17)
 2014-05-07 16:12:39 +02:00
Sergei Golubchik
bff1b52a10 revno: 5305.1.1 
committer: Marc Alff <marc.alff@oracle.com>
branch nick: mysql-5.6-bug17156507
timestamp: Tue 2013-07-23 15:08:32 +0200
message:
  Bug#17156507 SUCCESSFUL CONNECTION ATTEMPT DOESN'T RESET THE SUM_CONNECT_ERRORS COUNTER

(test case was merged with perfschema 5.6.17)
 2014-05-07 16:12:29 +02:00
Sergei Golubchik
5ffe939a6c perfschema 5.6.17 2014-05-07 16:12:16 +02:00
Sergei Golubchik
a30477b322 compiler warning 2014-05-07 10:24:02 +02:00
Sergei Golubchik
f55a0a6ad2 after perfschema-mergetree merge - update tests and results 2014-05-07 10:21:58 +02:00
Sergei Golubchik
374f0751a2 null-merge from perfschema-5.6 merge tree 
(only new files and small style changes are accepted)
 2014-05-07 10:21:41 +02:00
Sergei Golubchik
04bce7b569 5.6.17 2014-05-07 10:04:30 +02:00
Sergei Golubchik
7226287c06 perfschema 5.6.10 initial commit. 
include/mysql/psi/*
 2014-05-07 10:02:35 +02:00
unknown
3f80740aa8 merge 5.5->5.3 2014-05-07 09:28:12 +03:00
Sergei Golubchik
06d874ba90 perfschema 5.6.10 initial commit. 
5.6 files
 2014-05-06 23:22:16 +02:00
Sergei Golubchik
d74414399d perfschema 5.6.10 initial commit. 
10.0 files
 2014-05-06 23:20:50 +02:00
Michael Widenius
554fd30ba3 Fixed bug where CHECK TABLE for a MYISAM table before 5.5.38 wrongly gave warning: 
"Table upgrade required..."

The row format is only different for the case where we have a very old MyISAM table with varchar fields, null fields and created with CHECKSUM=1
The table is usable, except that CHECKSUM TABLE will give a wrong result and CHECK TABLE will warn about this.

I added a test for this to warn when a table needs to be upgraded, but forgot to add a test that this was only relevant for tables with CHECKSUM=1
This is now fixed.



storage/myisam/ha_myisam.cc:
  Fixed wrong test.
 2014-05-06 23:44:02 +03:00
Sergei Golubchik
3427fd0378 making perfschema easier to merge: remove unnecessary changes 2014-05-06 21:42:05 +02:00
Sergei Golubchik
6cb3146af8 percona-server-5.6.17-65.0 2014-05-06 21:18:00 +02:00
Sergei Golubchik
60aba058b1 5.6.17 2014-05-06 21:13:16 +02:00
Olivier Bertrand
3743e1e0f6 - Fix gcc error and warnings 
modified:
  storage/connect/odbconn.cpp
  storage/connect/xindex.cpp
 2014-05-06 16:00:48 +02:00
Sergei Golubchik
890982192a update test file for windows 2014-05-06 14:52:40 +02:00
Sergei Golubchik
7a0a2c4b84 after tokudb-7.1.6 merge 2014-05-06 14:40:32 +02:00
Sergei Golubchik
4a84ee1c25 after InnoDB/XtraDB 5.6.16 merge 2014-05-06 13:57:56 +02:00
Sergei Golubchik
b968363aac MDEV-6184 10.0.11 merge 
XtraDB 5.6.16-64.2
 2014-05-06 10:21:34 +02:00
Sergei Golubchik
e2e5d07b28 MDEV-6184 10.0.11 merge 
InnoDB 5.6.16
 2014-05-06 09:57:39 +02:00
Sergei Golubchik
3792693f31 merge MySQL-5.6 bugfix "Bug#17862905: MYSQLDUMP CREATES USELESS METADATA LOCKS" 
revno: 5716
committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
branch nick: mysql_5_6
timestamp: Sat 2013-12-28 22:08:40 +0530
message:
  Bug#17862905: MYSQLDUMP CREATES USELESS METADATA LOCKS
 2014-05-05 23:53:31 +02:00
Sergei Golubchik
aff4854dfd merge: 
git://github.com/Tokutek/ft-index.git
git://github.com/Tokutek/ft-engine.git
at the tag tokudb-7.1.6
 2014-05-05 22:59:44 +02:00
Sergei Golubchik
83759e02dc 5.6.16 2014-05-05 18:20:28 +02:00
Sergei Golubchik
05fd3e6366 percona-server-5.6.16-64.2.tar.gz 2014-05-05 18:16:30 +02:00
Sergei Golubchik
f90dca1a0d MDEV-6014 Merge fixed OQGRAPH into 10.0 tree 2014-05-05 17:50:07 +02:00
Olivier Bertrand
9d41d856a7 - Fix a bug concerning index mapping that caused mapped index files 
not to be unmapped. This caused a crash instead of reporting an
  error. This was also fixed.
modified:
  storage/connect/connect.cc
  storage/connect/ha_connect.cc
  storage/connect/maputil.cpp
  storage/connect/table.cpp
  storage/connect/xindex.cpp
  storage/connect/xindex.h
  storage/connect/xtable.h
 2014-05-05 17:36:16 +02:00