summaryrefslogtreecommitdiff
path: root/.bzrignore
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)Sergei Golubchik2014-10-111-1462/+0
| | | | | | | | | | remove: * NDB from everywhere * IM from mtr-v1 * packaging/rpm-oel and packaging/rpm-uln * few unused spec files * plug.in file * .bzrignore
* MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-0/+1
| | | | | | | | | Merged lp:maria/maria-10.0-galera up to revision 3879. Added a new functions to handler API to forcefully abort_transaction, producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These were added for future possiblity to add more storage engines that could use galera replication.
* bzr ignore 'pcre/test*grep'Sergei Golubchik2014-06-091-0/+1
|
* remove and ignore generated pcre filesSergei Golubchik2014-06-051-0/+1
|
* 5.5 mergeSergei Golubchik2014-05-091-4/+5
|\
| * after tokudb-7.1.6 mergeSergei Golubchik2014-05-061-4/+4
| |
| * MDEV-6129: Server crashes during UNION with ORDER BY field IS NULLMichael Widenius2014-04-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed crashing bug for union queries where there was no real tables. mysql-test/r/group_by.result: Added test case mysql-test/t/group_by.test: Added test case sql/db.opt: Removed genrated file sql/item.cc: Handled case when table_list->pos_in_tables is not set. Can only happens when there is no real tables in query
* | 10.0-base mergeSergei Golubchik2014-02-261-1/+1
|\ \
| * \ 5.5 mergeSergei Golubchik2014-02-251-1/+1
| |\ \ | | |/
| | * MDEV-5529 Sync libmysqlclient.so symbol versioning across distributionsSergei Golubchik2014-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An attempt to introduce libmysqlclient.so symbol versioning that is compatible both with Debian and Fedora all versions: put all symbols into libmysqlclient_18 version node (as on Debian), but also put aliases of old symbols into libmysqlclient_16 version node (as on Fedora). Also use a linker script to create aliases of exported symbols, not rpm_support.cc source file.
| * | 5.5 mergeSergei Golubchik2013-11-231-0/+1
| |\ \ | | |/
| | * .bzrignoreSergei Golubchik2013-11-191-0/+1
| | |
* | | Merge 10.0-base -> 10.0Alexander Barkov2013-10-151-0/+15
|\ \ \ | |/ /
| * | MDEV-4425 Regexp enhancementsAlexander Barkov2013-10-021-0/+1
| | | | | | | | | | | | | | | Removing pcre.h from the tree, it's generated from pcre.h.in
| * | pcre: Removing config.h from the tree, it's a generated file.Alexander Barkov2013-09-271-0/+1
| | |
| * | MDEV-4425 REGEXP enhancementsAlexander Barkov2013-09-261-0/+13
| | |
* | | bzr ignoreSergei Golubchik2013-09-251-0/+3
| | |
* | | 10.0-base merge.Sergei Golubchik2013-09-211-4/+288
|\ \ \ | |/ / | | | | | | | | | Partitioning/InnoDB changes are *not* merged (they'll come from 5.6) TokuDB does not compile (not updated to 10.0 SE API)
| * | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-181-4/+288
| |\ \ | | |/
| | * .bzrignoreSergei Golubchik2013-09-091-0/+286
| | |
| | * remove PBXTSergei Golubchik2013-08-301-4/+0
| | |
| | * start using jemallocSergei Golubchik2013-08-301-0/+2
| | |
* | | 10.0-base mergeSergei Golubchik2013-07-181-0/+1
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2013-07-171-0/+1
| |\ \ | | |/
| | * mysql-5.5.32 mergeSergei Golubchik2013-07-161-0/+1
| | |\
| | | * A bit more intelligent processing of .in files in mysql-test/collectionsBjorn Munch2013-01-151-0/+2
| | | |
* | | | 10.0-base mergeSergei Golubchik2013-06-061-0/+3
|\ \ \ \ | |/ / / | | | | | | | | (without InnoDB - all InnoDB changes were ignored)
| * | | 5.5 mergeSergei Golubchik2013-06-061-0/+3
| |\ \ \ | | |/ /
| | * | 5.3 merge.Sergei Golubchik2013-05-201-0/+2
| | |\ \ | | | | | | | | | | | | | | | change maria.distinct to use a function that doesn't require ssl-enabled builds
| | | * \ 5.2 mergeSergei Golubchik2013-05-201-6/+1
| | | |\ \
| | | | * \ 5.1 mergeSergei Golubchik2013-05-201-0/+1
| | | | |\ \
| | | | | * | MDEV-4280: Assertion `empty_size == empty_size_on_page' failure in ↵Michael Widenius2013-05-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ma_blockrec.c or ER_NOT_KEYFILE on query with DISTINCT and GROUP BY This could happen when using Aria for internal temporary files (default case) and using DISTINCT. _ma_scan_restore_block_record() didn't work correctly if there was rows inserted, updated or deleted on the handler between calls to _ma_scan_remember_block_record() and _ma_scan_restore_block_record(). The effect was that some DISTINCT queries that used remove_dup_with_compare() could fail. .bzrignore: Ignore sql_yacc.hh mysql-test/suite/maria/r/distinct.result: Test case for MDEV-4280 mysql-test/suite/maria/t/distinct.test: Test case for MDEV-4280 mysql-test/t/mysql.test: Fixed test suite (we could get error -1 in some cases) sql/sql_select.cc: Break loop if restart_rnd_next() gives an error storage/maria/ha_maria.cc: scan_restore_pos() can return disk fault error. storage/maria/ma_blockrec.c: _ma_scan_remember_block_record() did incorrectly update scan.dir instead of scan_save.dir . _ma_scan_restore_block_record() didn't work correctly if there was rows inserted,updated or deleted on the handler between calls to _ma_scan_remember_block_record() and _ma_scan_restore_block_record(). Fixed by adding counters for row changes and reading the current scan page if changes had been made. storage/maria/ma_blockrec.h: scan_restore_pos() can return disk fault error. storage/maria/ma_delete.c: Increment row_changes storage/maria/ma_scan.c: scan_restore_pos() can return disk fault error. storage/maria/ma_update.c: Increment row_changes storage/maria/ma_write.c: Increment row_changes storage/maria/maria_def.h: scan_restore_pos() can return disk fault error.
| | | * | | | bzr ignore sql-bench/test-table-eliminationSergey Petrunya2012-11-021-0/+1
| | | | | | |
| | * | | | | If one declared several continue handler for the same condition on different ↵Michael Widenius2013-05-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | level of stored procedures, all of them where executed. Now we only execute the innermost of them (the most relevant). The solution was to add a 'handled' marker to MYSQL_ERROR and mark all elements for which we have executed a condition handler. When searching for new conditions, we will ignore any marked element. .bzrignore: Ignore error message file mysql-test/r/sp.result: Added testcase for continue handlers. mysql-test/t/sp.test: Added testcase for continue handlers. sql/sp_head.cc: Mark errors for which we will excute a handler as 'handled' Ignore already handled warnings/errors sql/sql_error.cc: Add 'handled' argument to MYSQL_ERROR, so that we can mark the errors/warnings we have handled. sql/sql_error.h: Add 'handled' argument to MYSQL_ERROR, so that we can mark the errors/warnings we have handled.
* | | | | | | ha_cassandra.so and ha_oqgraph.so can be build only if boost is installedAlexander Barkov2013-04-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on the build machine. So put them into the deb packages optionally. Additionally, fixing cassandra/CMakeLists.txt to work with thrift installed in /opt/local and /opt. It was supposed to work, but did not work actually. Only thrift installed in /usr or /usr/local worked. renamed: debian/dist/Debian/mariadb-server-10.0.files => debian/dist/Debian/mariadb-server-10.0.files.in debian/dist/Ubuntu/mariadb-server-10.0.files => debian/dist/Ubuntu/mariadb-server-10.0.files.in modified: .bzrignore CMakeLists.txt storage/cassandra/CMakeLists.txt storage/cassandra/cassandra_se.cc storage/cassandra/gen-cpp/Cassandra.h storage/cassandra/gen-cpp/cassandra_types.h storage/oqgraph/CMakeLists.txt debian/dist/Debian/mariadb-server-10.0.files.in debian/dist/Ubuntu/mariadb-server-10.0.files.in
* | | | | | | 10.0 mergeSergei Golubchik2013-04-191-0/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ 10.0-base mergeSergei Golubchik2013-04-151-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 5.5 mergeSergei Golubchik2013-03-271-0/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Automatic mergeMichael Widenius2013-03-011-0/+1
| | | | | | | |
* | | | | | | | - Adding index.test (with some statements temporarily skipped)Olivier Bertrand2013-03-041-0/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Updating xml.result added: mysql-test/suite/connect/r/index.result mysql-test/suite/connect/std_data/emp.txt mysql-test/suite/connect/std_data/sexe.csv mysql-test/suite/connect/std_data/sitmat.csv mysql-test/suite/connect/t/index.test modified: .bzrignore mysql-test/suite/connect/r/xml.result
* | | | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-191-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | SHOW EXPLAIN: merge with 5.5-mainSergey Petrunya2012-10-061-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | MWL#182: Explain running statementsSergey Petrunya2012-06-151-0/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | - Merge with current 5.5-main
| | | * \ \ \ \ MWL#182: SHOW EXPLAIN: Merge 5.3->5.5Sergey Petrunya2012-05-161-0/+1
| | | |\ \ \ \ \
| | | | * | | | | bzr ignore libmysqld/my_apc.ccSergey Petrunya2012-01-041-0/+1
| | | | |/ / / /
| * | | | | | | merge with MySQL 5.5.27Sergei Golubchik2012-08-091-1/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | | manually checked every change, reverted incorrect or stupid changes.
| | * | | | | Bug#12845091 .EMPTY FILE IN /DATA/TEST PREVENTS USERS FROM DROPPING TEST DB ↵Tor Didriksen2012-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ON 5.5 AND 5.6 For those who build in-source, we need to change .bzrignore: s/.empty/dummy.bak/
* | | | | | | more fixes for test casesSergei Golubchik2012-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/innodb/include/restart_and_reinit.inc: drop and recreate mysql.innodb* tables when deleting innodb table spaces mysql-test/t/ssl_8k_key-master.opt: with loose- prefix ssl errors are ignored sql-common/client.c: compiler warnings sql/field.cc: use the new function sql/item.cc: don't convert time to double or decimal via longlong, this loses sub-second part. Use dedicated functions. sql/item.h: incorrect cast_to_int type for params sql/item_strfunc.cc: use the new function sql/lex.h: unused sql/my_decimal.h: helper macro sql/sql_plugin.cc: workaround for a compiler warning sql/sql_yacc.yy: unused sql/transaction.cc: fix the merge for SERVER_STATUS_IN_TRANS_READONLY protocol flag storage/sphinx/CMakeLists.txt: compiler warnings
* | | | | | | fixes for test failuresSergei Golubchik2012-09-271-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and small collateral changes mysql-test/lib/My/Test.pm: somehow with "print" we get truncated writes sometimes mysql-test/suite/perfschema/r/digest_table_full.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/perfschema/r/dml_handler.result: host table is not ported over yet mysql-test/suite/perfschema/r/information_schema.result: host table is not ported over yet mysql-test/suite/perfschema/r/nesting.result: this differs, because we don't rewrite general log queries, and multi-statement packets are logged as a one entry. this result file is identical to what mysql-5.6.5 produces with the --log-raw option. mysql-test/suite/perfschema/r/relaylog.result: MariaDB modifies the binlog index file directly, while MySQL 5.6 has a feature "crash-safe binlog index" and modifies a special "crash-safe" shadow copy of the index file and then moves it over. That's why this test shows "NONE" index file writes in MySQL and "MANY" in MariaDB. mysql-test/suite/perfschema/r/server_init.result: MariaDB initializes the "manager" resources from the "manager" thread, and starts this thread only when --flush-time is not 0. MySQL 5.6 initializes "manager" resources unconditionally on server startup. mysql-test/suite/perfschema/r/stage_mdl_global.result: this differs, because MariaDB disables query cache when query_cache_size=0. MySQL does not do that, and this causes useless mutex locks and waits. mysql-test/suite/perfschema/r/statement_digest.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/perfschema/r/statement_digest_consumers.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/perfschema/r/statement_digest_long_query.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result: will be updated to match 5.6 when alfranio.correia@oracle.com-20110512172919-c1b5kmum4h52g0ni and anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y are merged mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result: will be updated to match 5.6 when anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y is merged
* | | | | | Building RPMs with CPackSergei Golubchik2012-05-221-0/+3
| |/ / / / |/| | | | | | | | | | | | | | configure with cmake -DRPM=distro
View Lorry Controller Status