1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Commit Graph

9286 Commits

Author SHA1 Message Date
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
56f64f796e TokuDB: enable online alter for partitioned tabled 2014-05-09 14:53:32 +02:00
Sergei Golubchik
d3e2e1243b 5.5 merge 2014-05-09 12:35:11 +02: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
Sergei Golubchik
229dad1f9b merge with 10.0-connect 2014-05-08 11:33:51 +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
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
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
04bce7b569 5.6.17 2014-05-07 10:04:30 +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
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
7a0a2c4b84 after tokudb-7.1.6 merge 2014-05-06 14:40:32 +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
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
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
Rich Prohaska
394202d207 #224 fail tokudb init if jemalloc is not loaded 2014-05-05 07:59:33 -04:00
Rich Prohaska
2a8682244a #223 build tokudb without upserts 2014-05-02 15:55:52 -04:00
Sergei Golubchik
a03997db43 MDEV-6085 ALTER TABLE looses the connection string 2014-05-01 18:27:52 +02:00
Sergei Golubchik
5b6c75ca4d increase TokuDB plugins maturity to "stable". 2014-05-01 14:06:06 +02:00
Sergei Golubchik
dc23a9501a Solaris compilation failure: xtradb is linked in statically, ha_innodb.so needs
the linker script.
2014-05-01 14:05:52 +02:00
Sergei Golubchik
4544e60d29 MDEV-6106 Cannot create a table with 229 or greater columns in TokuDB
correct the length encoding for the extra2 frm segment. add the comment.
2014-05-01 14:04:00 +02:00
Rich Prohaska
85d338cc3e #222 filter out degenerate key range in tokudb::record_in_range 2014-04-30 18:19:14 -04:00
Rich Prohaska
53cb5329e4 #218 fix incorrect use of num_DBs_lock 2014-04-29 13:51:05 -04:00
Sergei Golubchik
2797f0c534 fix XtraDB version to tell the truth 2014-04-28 12:11:35 +02:00
Sergei Golubchik
0e05dc81b3 rename handler::ha_set_lock_type() -> handler::set_lock_type(),
because it's not a handler convenience wrapper
2014-04-28 11:11:16 +02:00
Olivier Bertrand
f3af6da976 - Enable MYSQL tables to USE result instead of STORE result.
See the issue reported in MDEV-6142.
modified:
  storage/connect/myconn.cpp
  storage/connect/myconn.h
  storage/connect/tabmysql.cpp
  storage/connect/tabmysql.h
2014-04-27 19:18:20 +02:00
Rich Prohaska
94ed981ffe ft-index#218 use cursor set range with bound for point queries 2014-04-25 13:43:45 -04:00
Olivier Bertrand
24369d2175 - Check in Indexable, create and check_if_supported_inplace_alter for not indexable
tables when they are Multiple or Compressed.
modified:
  storage/connect/ha_connect.cc
  storage/connect/tabdos.h
2014-04-25 19:14:33 +02:00
Olivier Bertrand
e9bb12acdb - Do not throw an error on empty ODBC CATFUNC (MDEV-5455)
modified:
  storage/connect/ha_connect.cc
  storage/connect/odbconn.cpp
2014-04-25 15:34:02 +02:00
Olivier Bertrand
39750cd4db - FIX a bug causing libxml2 not retrieving expanded multiple column values.
This was working but the cause probably comes from freeing Xop object to
  handle memory leaks reported by Valgrind.
  Also add a test case on XML multiple tables.
added:
  storage/connect/mysql-test/connect/r/xml_mult.result
  storage/connect/mysql-test/connect/std_data/bookstore.xml
  storage/connect/mysql-test/connect/t/xml_mult.test
modified:
  storage/connect/domdoc.cpp
  storage/connect/tabxml.cpp
  storage/connect/tabxml.h

- Enhance the index types and flages returning functions.
modified:
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h

- Suppress irrelevant warning message (MDEV-6117)
modified:
  storage/connect/ha_connect.cc
2014-04-22 19:15:08 +02:00
Rich Prohaska
02fce56777 #110 turn off replace into and insert ignore optimizations when binlog format != statement (2nd try) 2014-04-21 12:35:59 -04:00
Rich Prohaska
99c4517b29 #110 turn off replace into and insert ignore optimizations when binlog format != statement 2014-04-21 10:35:03 -04:00
Alexander Barkov
d3d3a4b834 MDEV-4511 Assertion `scale <= precision' fails on GROUP BY TIMEDIFF with incorrect types 2014-04-24 16:59:01 +04:00
Alexander Barkov
6075c82467 Merge 10.0 -> 10.0-connect 2014-04-21 14:57:10 +04:00
Olivier Bertrand
187e41697b - Implement "remote" index (similar to FEDERATED ones) for MYSQL tables.
Not yet done for ODBC tables.
modified:
  storage/connect/connect.cc
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/mycat.cc
  storage/connect/plgdbsem.h
  storage/connect/reldef.h
  storage/connect/tabdos.h
  storage/connect/tabmysql.cpp
  storage/connect/tabmysql.h
  storage/connect/tabodbc.cpp
  storage/connect/tabodbc.h
  storage/connect/xindex.cpp
  storage/connect/xtable.h

- Return error in "info" on Cardinality error.
modified:
  storage/connect/ha_connect.cc
2014-04-19 17:02:53 +02:00
Rich Prohaska
25f931c6b6 #202 allow non-null AND null key index cursor operations (2nd try) 2014-04-18 14:07:14 -04:00
Rich Prohaska
5d2d9bfdeb #206 support mariadb 10.0.10 start_bulk_insert api change 2014-04-17 09:12:43 -04:00
Sergey Vojtovich
15b443b095 MDEV-6088 - Merge spider 3.2 2014-04-15 11:29:57 +04:00
Rich Prohaska
9f324de94d #212 binlog row replication turns the insert ignore optimization off 2014-04-14 17:23:06 -04:00
Rich Prohaska
e7e91ab6bb #202 allow non-null AND null key index cursor operations 2014-04-14 15:11:31 -04:00
Olivier Bertrand
213ecbbb4f - In info, the file length sometimes could not be caculated because the
catalog data path had not been set. This was added into ha_connect::info.
modified:
  storage/connect/ha_connect.cc

- All the functions querying table options could return information from the wrong
  table when several CONNECT tables were used in the same query (for instance joined
  together) This was because they belonged to the catalog class that is shared between
  all tables in the same query. They have been moved from the catalog class to the
  TABDEF/RELDEF class that is attached to each table. This was a major potential bug.
modified:
  storage/connect/catalog.h
  storage/connect/filamvct.cpp
  storage/connect/filamzip.cpp
  storage/connect/mycat.cc
  storage/connect/mycat.h
  storage/connect/reldef.cpp
  storage/connect/reldef.h
  storage/connect/tabdos.cpp
  storage/connect/tabfmt.cpp
  storage/connect/tabmul.cpp
  storage/connect/tabmysql.cpp
  storage/connect/taboccur.cpp
  storage/connect/tabodbc.cpp
  storage/connect/tabpivot.cpp
  storage/connect/tabsys.cpp
  storage/connect/tabtbl.cpp
  storage/connect/tabutil.cpp
  storage/connect/tabvct.cpp
  storage/connect/tabwmi.cpp
  storage/connect/tabxcl.cpp
  storage/connect/tabxml.cpp
  storage/connect/xindex.cpp

- Prepare indexing of MYSQL/ODBC tables (as does FEDERATED) (Not implemented yet)
modified:
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/mycat.cc
  storage/connect/mycat.h

- Typo
modified:
  storage/connect/plgdbutl.cpp
2014-04-14 14:26:48 +02:00
Rich Prohaska
cb41cf0db1 #194 fix gcc 4.8 warnings 2014-04-13 14:40:54 -04:00
andrew
8bc1fa7344 MDEV-3037 - make build work on Windows 64 2014-04-11 21:09:18 +09:30