Bazaar branches of Maria

Author: Sergey Vojtovich
Revision Date: 2014-04-16 05:49:30 UTC

MDEV-6059 - Result files with no corresponding test files

Removed unused result files.

Author: Alexey Botchkov
Revision Date: 2014-04-15 15:41:08 UTC

MDEV-4856 SQL_ERROR_LOG shows 1146 errors which didnt appear in mysql client.
    The fill_schema_table() function used to call get_table_share() for a table name in WHERE
    then clear the error list. That way plugins receive the superfluous error notification if it
    happens in it. Also the problem was that error handler didn't prevent the suppressed
    error message from logging anyway as the logging happens in THD::raise_condition
    before the handler call.
    Trigger_error_handler is remade into Warnings_only_error_handler, so it stores the error
    message in all cases in the thd->stmt_da.
    Then later the stored error is raised.

Author: Kristian Nielsen
Revision Date: 2014-04-11 07:38:55 UTC

Merge MDEV-6067 from 5.2 to 5.3.

Author: Alexey Botchkov
Revision Date: 2014-04-16 21:12:08 UTC

MDEV-6124 Audit plugin fails with the Percona-Server 5.6.
   Some lines of code in file_logger.c were lost while moving to the
   general MariaDB tree. Adding them.

Author: Jan Lindström
Revision Date: 2014-04-16 13:55:36 UTC

MDEV-6070: FusionIO: Failure to create a table with ATOMIC_WRITES
option leaves the database in inconsistent state,

Analysis: Problem was that atomic writes variable had incorrect
type on same places leading to fact that e.g. OFF option was
not regognized. Furthermore, some error check code was missing
from both InnoDB and XtraDB engines. Finally, when table is
created we have already created the .ibd file and if we can't
set atomic writes it stays there.

Fix: Fix atomic writes variable type to ulint as it should be.
Fix: Add proper error code checking on os errors on both InnoDB
and XtraDB
Fix: Remove the .idb file when atomic writes can't be enabled
to a new table.

Author: Michael Widenius
Revision Date: 2014-04-16 11:11:42 UTC

added missing files

Author: Jan Lindström
Revision Date: 2014-04-16 10:08:29 UTC

Merge lp:codership-mysql/5.5 -r3961..3980.

Author: ahel
Revision Date: 2014-04-15 16:25:36 UTC

overhauled the sysbench skeleton

Author: Sergei
Revision Date: 2014-04-15 13:52:23 UTC

Solaris compilation failure: xtradb is linked in statically, ha_innodb.so needs
the linker script.

Author: Sergei
Revision Date: 2014-04-14 17:50:55 UTC

don't install mysql-test/var and cmake internal files

Author: Olivier Bertrand
Revision Date: 2014-04-14 12:26:48 UTC

- 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

Author: Sergei
Revision Date: 2014-04-14 07:54:42 UTC

typo in FederatedX. HA_READ_AFTER_KEY is not a valid index flag.

Author: Kristian Nielsen
Revision Date: 2014-04-11 07:11:40 UTC

MDEV-6067: Partitioned table DML sometimes binlogged without XID event

Temporary 10.0 patch for testing (same fix will be done in 5.2 and merged up).

Author: Kristian Nielsen
Revision Date: 2014-04-11 07:03:53 UTC

MDEV-6067: Partitioned table DML sometimes binlogged without XID event

Add test case.

Author: Antony T Curtis
Revision Date: 2014-04-04 00:00:16 UTC

Implement missing OPAQUE plugin thdvar.

Author: Elena Stepanova
Revision Date: 2014-04-03 13:56:00 UTC

MDEV-6016 Packaging error with cmake 2.8.12 and greater

Avoid CPack complaints when a pdb file is missing for a static library
(patch from Vladislav Vaintroub)

Author: Nirbhay Choubey
Revision Date: 2014-04-03 02:35:12 UTC

* Merging fix for lp:1224775
* Removing duplicate code

Author: Elena Stepanova
Revision Date: 2014-04-02 23:16:46 UTC

Some support for repair on partitioned InnoDB tables was added in 5.6.14

Author: Kentoku SHIBA
Revision Date: 2014-03-26 13:32:05 UTC

remove unset() from CMakeList.txt

Author: Kristian Nielsen
Revision Date: 2014-03-20 14:36:45 UTC

MDEV-5914: Parallel replication deadlock due to InnoDB lock conflicts

Preparation patch for investigating a possible solution.

Add THD::rpl_group_commit_id. This will be zero except when running
multiple transactions in parallel in parallel replication. Then it
can be compared between two THDs to check if these are two
transactions that were group-committed together on the master and
thus are known not to conflict.

Author: Sergei
Revision Date: 2014-03-15 17:24:15 UTC

mysql-5.1.73 merge

Author: Kristian Nielsen
Revision Date: 2014-03-11 23:14:49 UTC

MDEV-5804: If same GTID is received on multiple master connections in multi-source replication, the event is double-executed causing corruption or replication failure

Some fixes, mainly to make it work in non-parallel replication mode also
(--slave-parallel-threads=0).

Patch should be fairly complete now.

Author: Jan Lindström
Revision Date: 2014-03-11 11:49:52 UTC

Added multi-key unique test case.

Author: Tan Tran
Revision Date: 2014-03-10 04:00:37 UTC

MDEV-5681: audit log will not rotate when the file size exceeds global variable setting

Author: Savita Agrawal
Revision Date: 2014-03-08 12:43:53 UTC

MDEV-5437: drop reigger not respecting read_only=1 flag

Author: Sergei
Revision Date: 2014-03-04 21:25:34 UTC

xtradb, windows, aio: fix the bad merge

Author: Akira Higuchi
Revision Date: 2014-02-18 03:44:01 UTC

add hsmodule_pxc/client

Author: andrew
Revision Date: 2014-02-08 12:31:17 UTC

Fix for MDEV-5634 - segfault caused by error in defaults-file

Author: Michael Widenius
Revision Date: 2014-02-05 07:20:51 UTC

Replication changes for CREATE OR REPLACE TABLE
- CREATE TABLE is by default handled by slave as CREATE OR REPLACE
- DROP TABLE is by default handled by slave as DROP TABLE IF NOT EXISTS

- Ensure that a CREATE OR REPLACE TABLE which dropped a table is replicated
- DROP TABLE that generated an error on master is handled as DROP TABLE without IF NOT EXISTS on slave.
- Added slave_ddl_exec_mode_options to decide how DDL's are replicated

New logic for handling BEGIN GTID ... COMMIT from the binary log:

- When we find a BEGIN GTID, we start a transaction and set OPTION_GTID_BEGIN
- When we find COMMIT, we reset OPTION_GTID_BEGIN and execute the normal COMMIT code.
- While OPTION_GTID_BEGIN is set:
  - We don't generate implict commits before or after statements
  - All tables are regarded as transactional tables in the binary log (to ensure things are executed exactly as on the master)
- We reset OPTION_GTID_BEGIN also on rollback

This will help ensuring that we don't get any sporadic commits (and thus new GTID's) on the slave and will help keep the GTID's between master and slave in sync.

Author: Hartmut Holzgraefe
Revision Date: 2014-02-03 19:56:58 UTC

added ST_AsGeoJson() function

Author: Alexander Barkov
Revision Date: 2014-01-29 11:43:48 UTC

Adding environment variable GRN_PLUGINS_DIR when
running tests from a build directory.

modified:
  storage/mroonga/mysql-test/mroonga/storage/suite.pm
  storage/mroonga/mysql-test/mroonga/wrapper/suite.pm

Author: Michael Widenius
Revision Date: 2014-01-26 18:57:20 UTC

Fix for MDEV-5168: MariaDB returns warnings for INSERT IGNORE

Added variable "OLD_MODE" that can be used to turn off the new behavior

Author: Kentoku SHIBA
Revision Date: 2014-01-25 15:54:45 UTC

remove unfixed test

Author: Andrew McDonnell
Revision Date: 2013-11-21 10:04:08 UTC

Merge in latest Maria 10.0.7 ready for merge to trunk

Author: Jan Lindström
Revision Date: 2014-01-13 13:02:31 UTC

Removed some unnecessary assertions to debug build and enhanced the page_compression and page_compression_level fetch.

Author: Sergey Petrunia
Revision Date: 2013-12-31 10:43:19 UTC

Added comments

Author: Vicențiu Ciorbaru
Revision Date: 2013-12-18 13:39:09 UTC

Fix for:
MDEV-5221: User auto-creation does not work upon GRANT <role>

Author: Kentoku SHIBA
Revision Date: 2013-12-10 15:31:04 UTC

add metadata_lock_info

Author: Sergey Vojtovich
Revision Date: 2013-12-06 19:54:52 UTC

MDEV-5403 - Reduce usage of LOCK_open: tc_count

Lock-free tc_count.

Author: Matt Coleman
Revision Date: 2013-11-26 13:40:31 UTC

Removed unneeded changes in the Ubuntu control file.

Author: Matt Coleman
Revision Date: 2013-11-25 21:20:14 UTC

Updated version to 1:5.5.35+maria.

Author: Timour Katchaounov
Revision Date: 2013-11-19 09:29:09 UTC

MDEV-4170 Dynamic pushdown of subquery predicates
- fixed an error where the left-most pushdown tab was the left-most tab in a nest, instead of the tab where the condition can pushed the earliest
- fixed errors in the cost computation, mainly when the optimizer looks for optimal join order of the outer query,
  its subqueries may not be optimized yet, and their cost may not be known.
- fixed several valgrind errors

Author: Sergey Vojtovich
Revision Date: 2013-11-18 11:48:01 UTC

MDEV-5182 - build of 10.0.4/r3863 fails @ 'cmake' with
            -DINSTALL_SYSCONFDIR/-DDEFAULT_SYSCONFDIR specified

The reason for a bug is in support-files/CMakeLists.txt that tries to
install files in INSTALL_SYSCONF2DIR, without checking whether this
variable is actually defined.

Normally INSTALL_SYSCONF2DIR is always defined if INSTALL_SYSCONFDIR is
defined, and support-files/CMakeLists.txt assumes that. But when one
specifies INSTALL_SYSCONFDIR manually on the command line, this
assumption might be broken.

Author: Kentoku SHIBA
Revision Date: 2013-11-15 17:58:28 UTC

MDEV-4447 MariaDB sources should have unix-style line endings everywhere

Author: Patryk Pomykalski
Revision Date: 2013-11-03 17:41:20 UTC

Port of per query variables feature from Percona Server.
Allows changing variables for duration of the query.

Author: Kentoku SHIBA
Revision Date: 2013-10-31 19:32:32 UTC

Change for first review result for metadata_lock_info

Author: Oleksandr "Sanja" Byelkin
Revision Date: 2013-10-28 18:04:04 UTC

yet another try to trigger duildbot

Author: Vicențiu Ciorbaru
Revision Date: 2013-10-21 21:56:30 UTC

Implemented REVOKE ALL FROM for Roles and role grants.

Author: Jan Lindström
Revision Date: 2013-10-18 10:49:03 UTC

Added support for atomic writes by disabling the doublewrite buffer. This is controlled by a new configuration variable innodb_use_atomic_writes. Added support for extending the database file using posix_fallocate and this is controlled by a new configuration variable innodb_use_posix_fallocate. Finally, added support to skip trim operation when page has actual write size initialized after fist successfull trim operation for this page and if initialized we do not trim again if actual page size does not decrease.

Author: Timour Katchaounov
Revision Date: 2013-10-18 09:09:35 UTC

Removed extra empty line

Author: Elena Stepanova
Revision Date: 2013-10-10 10:24:40 UTC

Merge with 10.0-base

Author: Kentoku SHIBA
Revision Date: 2013-09-29 20:18:34 UTC

fix MEDV-4739 With SPIDER plugin installed, XA COMMIT/ROLLBACK after recovery causes assertion `! is_set()' failure in Diagnostics_area::set_ok_status

Author: Alexander Barkov
Revision Date: 2013-09-25 12:05:04 UTC

Better comments in the test file mysql-test/t/func_regexp_pcre.test

Author: Shuang Qiu
Revision Date: 2013-09-22 17:15:31 UTC

remove deprecated working directory.

Author: Sergei
Revision Date: 2013-09-18 12:59:51 UTC

cmake error on osx

Author: AugustQ
Revision Date: 2013-09-06 13:38:31 UTC

first try

Author: Kentoku SHIBA
Revision Date: 2013-08-12 16:37:45 UTC

fix for MDEV-4733

Author: Jan Lindström
Revision Date: 2013-07-24 17:01:31 UTC

Merge

Author: Vladislav Vaintroub
Revision Date: 2013-07-17 20:29:12 UTC

Implement fallback for ERROR_NONE_MAPPED return code from GetUserNameEx().
Got this error while trying to run server as NetworkService() on non-domain controller machine.
The fallback is to use "machine UPN", in the form host$@domain.com

Author: Sergei
Revision Date: 2013-07-02 09:39:41 UTC

Mark tokudb plugin as "Alpha" in MariaDB.

It's reasonably stable on itself, but MariaDB integration
within 5.5 series is still rather new.

Author: Kentoku SHIBA
Revision Date: 2013-06-30 15:51:52 UTC

add metadata_lock_info plugin.

Author: Vladislav Vaintroub
Revision Date: 2013-06-17 17:18:14 UTC

MDEV-4503 : Installation fails if TEMP directory contains "~" subdirectory.

Remove special handling for ~ in the middle of the path in cleanup_dir_name() - according to Monty, this was ancient code that tried to emulate Emacs behavior

Author: Oleksandr "Sanja" Byelkin
Revision Date: 2013-06-14 18:55:58 UTC

Fix of stmt_da / m_stamt_da.

Work around for alolocated memory counter.

Author: Kentoku SHIBA
Revision Date: 2013-06-08 16:47:02 UTC

add function's parameters for generate_partition_syntax

Author: Vladislav Vaintroub
Revision Date: 2013-05-24 22:02:13 UTC

MDEV-4553 - NetBSD fixes

Author: Sergey Petrunia
Revision Date: 2013-05-23 16:25:20 UTC

Added comments

Author: Sergey Petrunia
Revision Date: 2013-05-16 14:34:40 UTC

MDEV-4201: LevelDB Storage Engine MS2
- Add @@leveldb_max_row_locks variable, limit # of locks a transaction may hold

Author: Eric Bergen
Revision Date: 2013-05-14 22:23:26 UTC

Merged from trunk

Author: Igor Babaev
Revision Date: 2013-04-26 02:05:30 UTC

Fixed bug mdev-4428.
Do not try to estimate the selectivity of a column range if min/max
values for the column are not provided and there is no supporting index.

Author: Hartmut Holzgraefe
Revision Date: 2013-04-19 20:35:14 UTC

added warning about CHECK constraints not being supported yet

Author: Kentoku SHIBA
Revision Date: 2013-04-18 18:59:56 UTC

fix back ground search test result for MariaDB

Author: Kristian Nielsen
Revision Date: 2013-04-15 18:18:46 UTC

MDEV-3882, Debian version problem.

Try another fix, to avoid using epoch. This should work as long as
we have the same or greater server version (eg. 5.5.30) as the
standard Debian repo.

Author: Vladislav Vaintroub
Revision Date: 2013-04-03 21:42:41 UTC

MDEV-4356

Author: Lixun Peng (P.Linux)
Revision Date: 2013-04-02 11:45:28 UTC

FLASHBACK FEATURE

How to use this feature?
I added several new arguments for mysqlbinlog: (binlog_format must be ROW)
--flashback (-B), it will let mysqlbinlog to work on FLASHBACK mode.
--table (-T), it likes -d, but this argument is for tables.
--review, it will let mysqlbinlog print the SQL for reviewing. Reviewing feature will create a new "review" table to record the data that will be modified by
FLASHBACK feature. If you aren't special the --review-dbname/tablename, "review" table will created on current DB, and the table name will be "__"+original_table_name. And for getting the original table struct, mysqlbinlog need to connect mysql, so --user/--host/--password is necessary if needed.
--review-dbname, the DB that you want to store the review table.
--review-tablename, the TABLE that you want to store the original data before modified. Only if you set -T, this argument is useful.

For example:
I have a table "t" in database "test", we can compare the output with --flashback and without.
#client/mysqlbinlog /data/mysqldata_10.0/binlog/mysql-bin.000001 -vv -d test -T t --start-datetime="2013-03-27 14:54:00" > /tmp/1.sql
#client/mysqlbinlog /data/mysqldata_10.0/binlog/mysql-bin.000001 -vv -uroot -d test -T t --start-datetime="2013-03-27 14:54:00" -B --review > /tmp/2.sql

Then, importing the flashback output can flashback database/table to the special time.

How to implement Flashback:
1. mysqlbinlog tool can parse the binlog files and print them, so we can use the most of code in mysqlbinlog.
2. Changing the event type (INSERT -> DELETE; DELETE -> INSERT).
3. Exchanging the SET/WHERE part in UPDATE event (UPDATE table SET x=1 WHERE y=2 -> UPDATE table SET y=2 WHERE x=1).
4. Invert the events in binlog files, from end to beginning (binlog: e1,e2,e3... -> flashback_log: en...e3,e2,e1).

Author: Ian Good
Revision Date: 2013-03-23 21:07:51 UTC

fixed ordering of ifs

Author: ebergen
Revision Date: 2013-03-22 23:53:33 UTC

Allow passing in LD_PRELOAD argument so that it can be checked and logged. This will not interfere with an existing environment LD_PRELOAD

Author: Hartmut Holzgraefe
Revision Date: 2013-03-13 14:33:09 UTC

STRAIGHT_JOIN couldn't be combined with NATURAL or USING(),
INNER JOIN not with NATURAL (MDEV-4271, MySQL Bug #35268)

Separate rules existed for "natural" (non-outer) joins and
for STRAIGHT_JOIN, with the only difference code wise being
that with STRAIGHT_JOIN the "straight" property of the right
side table was set before calling the appropriate add_...()
function.

The "natural_join" parser rule has now been extended to also
accept STRAIGHT_JOIN, and the rule result value is set to
1 for straight joins, 0 otherwise, so acting as a "straight"
flag that can directly be assigned to the "straight" property
of the right side table.

The rule parsing NATURAL JOIN was hard coded to accept just
this keyword combination, without support for either
STRAIGHT_JOIN or the optional INNER.

The "natural_join" rule has now been split up in an inner
"inner_join" rule that matches the JOIN, INNER JOIN and
STRAIGHT_JOIN cases while "natural_join" also matches
CROSS JOIN.

The NATURAL rule has been changed to accept "inner_join"
instead of just JOIN, so now NATURAL STRAIGHT_JOIN and
NATURAL INNER JOIN also work as expected.

As a side effect the removal of the duplciated rules
for STRAIGHT_JOIN handling has reduced the shift/reduce
conflict count by one.

Author: Oleksandr "Sanja" Byelkin
Revision Date: 2013-03-04 11:38:05 UTC

Check posibility to allow exists-to-in in SELECT list and deep inside WHERE clause.

Author: Eric Bergen
Revision Date: 2013-02-24 06:58:05 UTC

Add --crash-script and remove a rm call that causes problems when MYSQL_UNIX_PORT is set

Author: Kristian Nielsen
Revision Date: 2013-01-16 10:31:17 UTC

In-order commit for Taobao parallel replication.

Fix deadlock with MyISAM tables. If T2 got a table lock before T1,
then T1 would wait for T2 to complete, and T2 would wait for T1 to
commit -> deadlock.

Now, for non-transactional tables, we consider it a conflict when
*any* update happens to the same table (regardless of key values).
Most such updates to MyISAM cannot be done in parallel anyway due
to table-level locking.

(Later we might want to introduce a special flag for this for
storage engines, as even transactional engines could have
page-level locking or lock escalation or similar with similar
deadlock issues).

Author: Timour Katchaounov
Revision Date: 2012-12-21 09:32:49 UTC

MDEV-537 Make multi-column non-top level subqueries to be executed via index (index/unique subquery)
         instead of single_select_engine

This task changes the IN-EXISTS rewrite for multi-column subqueries "(a, b) IN (select b, c ...)"
to work in the same way as for single-column subqueries "a IN (select b ...) with respect to the
injection of NULL-rejecting predicates.

More specifically, the method Item_in_subselect::create_row_in_to_exists_cond() adds
Item_is_not_null_test and Item_func_trig_cond only if the left IN operand can be NULL.
Not having these predicates when not necessary, makes it possible to rewrite the subquery
into a "unique_subquery" or "index_subquery" when there is a suitable index on the only
subquery table.

Author: Vladislav Vaintroub
Revision Date: 2012-12-19 20:40:14 UTC

Add Fusion-io support (Percona's patch)

Author: Igor Babaev
Revision Date: 2012-12-19 06:45:15 UTC

The patch for the task mdev-539.
The patch lifts the limitation of the current implementation
of ALTER TABLE that does not allow to build unique/primary
indexes by sort for MyISAM engine.

Author: Vladislav Vaintroub
Revision Date: 2012-12-18 19:35:48 UTC

Add support for fusionio (via PErconas patch)

Author: Michael Widenius
Revision Date: 2012-09-22 14:11:40 UTC

Automatic merge

Author: Oleksandr "Sanja" Byelkin
Revision Date: 2011-10-04 11:14:59 UTC

open_binary_frm() decomposed an methods of TABLE_SHARE to allow engine to create TABLE_SHARE.

utype and geometry_type moved out of Field.

Author: Oleksandr "Sanja" Byelkin
Revision Date: 2012-12-10 10:51:07 UTC

MDEV-3906 fix. Server crashes in Dependency_marker::visit_field on 2nd execution of PS with exists_to_in and NOT EXISTS subquery.

The problem is that in case of NOT we put IS NOT NULL befoe Item_in_optimizer with reference on its left expression. On the first execution the left expression is already "fixed". But on the second IS NOT NULL fix_field() called before and so it is not fix fielded.

Fix is to allow direct references to call fixfields of its arguments if it is needed.

Author: Alexey Botchkov
Revision Date: 2012-11-30 13:10:15 UTC

'lighter' ST_ConvexHull implemented.

Author: Oleksandr "Sanja" Byelkin
Revision Date: 2012-11-20 13:11:22 UTC

MDEV-3862 Lift limitation for merging VIEWS with Subqueries in SELECT list.

Author: Oleksandr "Sanja" Byelkin
Revision Date: 2012-11-19 12:16:04 UTC

Cassandra SE & Dynamic columns with names merge to 10.0

Author: Ievgen Varavva
Revision Date: 2012-11-09 14:39:38 UTC

Fix conflicting values for REFRESH_CHECKPOINT and REFRESH_TABLE_STATS tokens which make mysqld confuse them.