summaryrefslogtreecommitdiff
path: root/.bzrignore
Commit message (Collapse)AuthorAgeFilesLines
* 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
* MDEV-207 Install headers required to build external storage pluginsSergei Golubchik2012-05-051-0/+1
| | | | 5.5 version. for cmake, not autotools.
* Ignore install_manifest.txt (created by 'make install')Michael Widenius2012-04-021-0/+1
|
* Merge MWL#192: Non-blocking client library, into MariaDB 5.5.unknown2012-02-211-0/+2
|\
| * MWL#192: Non-blocking client API for libmysqlclient.unknown2011-09-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All client functions that can block on I/O have alternate _start() and _cont() versions that do not block but return control back to the application, which can then issue I/O wait in its own fashion and later call back into the library to continue the operation. Works behind the scenes by spawning a co-routine/fiber to run the blocking operation and suspend it while waiting for I/O. This co-routine/fiber use is invisible to applications. For i368/x86_64 on GCC, uses very fast assembler co-routine support. On Windows uses native Win32 Fibers. Falls back to POSIX ucontext on other platforms. Assembler routines for more platforms are relatively easy to add by extending mysys/my_context.c, eg. similar to the Lua lcoco library. For testing, mysqltest and mysql_client_test are extended with the option --non-blocking-api. This causes the programs to use the non-blocking API for database access. mysql-test-run.pl has a similar option --non-blocking-api that uses this, as well as additional testcases. An example program tests/async_queries.c is included that uses the new non-blocking API with libevent to show how, in a single-threaded program, to issue many queries in parallel against a database. client/async_example.c: Fix const warning ****** Fix bug with wrong timeout value for poll(). include/Makefile.am: Fix missing include for `make dist` include/mysql.h: Add prototypes for all non-blocking API calls. include/mysql.h.pp: Add prototypes for all non-blocking API calls. mysys/my_context.c: Fix type warning for makecontext() function pointer argument. sql-common/mysql_async.c: Fix crashes in the non-blocking API for functions that can take MYSQL argument that is NULL. tests/Makefile.am: Add header file to `make dist` tests/mysql_client_test.c: Replace blocking calls with wrappers around the non-blocking calls, used in mysql_client_test to test the new non-blocking API. tests/nonblock-wrappers.h: Replace blocking calls with wrappers around the non-blocking calls, used in mysql_client_test to test the new non-blocking API.
* | Don't crash with: UPDATE performance_schema.setup_instruments SET ENABLED="NO";Michael Widenius2012-01-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't log updates to performance schema in replication log. Ensure that we don't call ha_update after ha_index_or_rnd_end() is called on slave. .bzrignore: Ignore some generated files mysql-test/include/show_slave_status.inc: Ensure that ./ is removed from file names mysql-test/suite/perfschema/r/binlog_mix.result: Updated results mysql-test/suite/perfschema/r/binlog_row.result: Updated results mysql-test/suite/perfschema/r/binlog_stmt.result: Updated results mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result: Updated results mysql-test/suite/rpl/r/rpl_performance_schema.result: Ensure that we don't crash slave when we update performance schema mysql-test/suite/rpl/t/rpl_performance_schema.test: Ensure that we don't crash slave when we update performance schema sql/log_event.cc: Ensure that we don't call ha_update after ha_index_or_rnd_end() is called. Remove old code that is not needed anymore (like restarting read loop over all rows if no matcing row is found) Simplify code sql/log_event_old.cc: Ensure that we don't call ha_update after ha_index_or_rnd_end() is called. storage/myisam/ha_myisam.cc: More DBUG_PRINT storage/perfschema/ha_perfschema.h: Don't log updates to performance schema in replication log.
* | 5.3 mergeSergei Golubchik2012-01-131-0/+2
|\ \
| * | Added new file (for netware)Michael Widenius2011-12-021-0/+2
| | | | | | | | | | | | Added some file to ignore
* | | Added ignore of generated fileMichael Widenius2011-12-271-0/+1
| | |
* | | 5.3->5.5 mergeSergei Golubchik2011-11-221-7/+5
|\ \ \ | |/ /
| * | fix a compilation failure for perl Net::HandlerSocket moduleSergei Golubchik2011-10-121-0/+5
| | |
| * | mergeSergei Golubchik2011-10-111-1/+5
| |\ \
| | * \ merge with 5.1Sergei Golubchik2011-10-071-1/+5
| | |\ \ | | | |/ | | |/|
| | | * support for plugins on windowsSergei Golubchik2011-10-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMakeLists.txt: 1. add -DSAFEMALLOC -DSAFE_MUTEX in the top-level CMakeLists.txt don't force plugins to copy-paste these lines in their CMakeLists.txt 2.1 search plugin/* for plugins (not only storage/*), 2.2 recognize MYSQL_PLUGIN (not only MYSQL_STORAGE_ENGINE), 2.3 extract library names from the plug.in (don't force library names to be ha_<engine>.dll and <engine>.lib) include/mysql/plugin.h: define MYSQL_PLUGIN_EXPORT appropriately (backport from 5.5) libmysqld/CMakeLists.txt: remove unnecessary workaround plugin/fulltext/CMakeLists.txt: build fulltext example plugin on windows storage/maria/CMakeLists.txt: The library is called libmaria_s.lib, not maria.lib storage/maria/unittest/CMakeLists.txt: The library is called libmaria_s.lib, not maria.lib storage/myisam/CMakeLists.txt: The library is called libmyisam_s.lib, not myisam.lib storage/mysql_storage_engine.cmake: introduce MYSQL_PLUGIN macro. don't force library names to be ha_<engine>.dll and <engine>.lib storage/xtradb/CMakeLists.txt: remove a condition from include win/README: don't use deprecated syntax win/configure-mariadb.sh: don't use deprecated syntax win/configure.js: 1. support MYSQL_PLUGIN in addition to MYSQL_STORAGE_ENGINE. 2. support plugin/* in addition to storage/*
* | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+5
|\ \ \ \
| * | | | removed some duplicate/redundant entries from .bzrignoreBjorn Munch2011-09-291-68/+0
| | | | |
| * | | | Bug #12373393 PB2 SHOULD ALLOW TO CREATE COLLECTIONS AS SUPER SET OF ↵Bjorn Munch2011-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EXISTING COLLECTIONS Let CMake parse files with a ".in" suffix containing includes Added default.release.in to replace default.release Explained in README New patch: replace 'include' with '#include' to avoid accidental matches
* | | | | Fixed that oqgraph and libmysqld/examples compiles on OpenSuse 11.4Michael Widenius2011-10-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .bzrignore: Ignore generated file emacs.h libmysqld/CMakeLists.txt: Remove direct usage of 'dbug' library This fixes that 'BUILD/compile-dist' works storage/oqgraph/CMakeLists.txt: Remove compiler option '-fno-rtti' as BOOST requires this
* | | | | cleanupsSergei Golubchik2011-10-191-0/+1
| | | | |
* | | | | merge with 5.3Sergei Golubchik2011-10-191-0/+29
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_insert.cc: CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. ****** CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. sql/sql_table.cc: small cleanup ****** small cleanup
| * | | | Automerge 5.2->5.3unknown2011-07-311-0/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge with 5.1Michael Widenius2011-07-251-0/+1
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fixed lp:814237: Wrong mutex usage in Aria storage/maria/ma_bitmap.c: Added call to _ma_bitmap_mark_file_changed() when flushing bitmap. This fixes lp:814237
| * | | | Added mytop to distribution (with some small trivial changes to make it ↵Michael Widenius2011-06-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | workg good also for MariaDB) scripts/CMakeLists.txt: Added mytop scripts/Makefile.am: Added mytop scripts/make_binary_distribution.sh: Added mytop scripts/make_win_bin_dist: Added mytop scripts/mytop.sh: Added mytop (with some small trivial changes to make it workg good also for MariaDB) support-files/mysql.spec.sh: Added mytop
| * | | | Merge with MariaDB 5.2Michael Widenius2011-05-101-5/+18
| |\ \ \ \ | | |/ / /
| | * | | Merge with MariaDB 5.1Michael Widenius2011-05-031-5/+18
| | |\ \ \ | | | |/ /
| | | * | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-5/+18
| | | |\ \ | | | | | | | | | | | | | | | | | | Moved some BSD string functions from Unireg
| * | | \ \ Merge MWL#180, binlog checksum backport, into MariaDB 5.3-based tree.unknown2011-05-031-0/+3
| |\ \ \ \ \
| | * | | | | Backport MySQL WL#2540 into MariaDB.unknown2011-05-031-0/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch backported: bzr diff '-rrevid:alfranio.correia@oracle.com-20101121143257-se3vpqus73l4mum0 ..revid:luis.soares@oracle.com-20101124111752-9b8260bd1qak87hr' --old=lp:mysql-server --new=lp:mysql-server
| * | | | | Merge with 5.2Michael Widenius2011-03-091-1/+10
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-1/+10
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-1/+7
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed some issues with partitions and connection_string, which also fixed lp:716890 "Pre- and post-recovery crash in Aria" - Fixed wrong assert in Aria Now need to merge with latest xtradb before pushing sql/ha_partition.cc: Ensure that m_ordered_rec_buffer is not freed before close. sql/mysqld.cc: Changed to use opt_stack_trace instead of opt_pstack. Removed references to pstack sql/partition_element.h: Ensure that connect_string is initialized storage/maria/ma_key_recover.c: Fixed wrong assert
| | | * | | | Ignore some linked filesMichael Widenius2011-01-301-0/+3
| | | | | | |
| * | | | | | Added HandlerSocket pluginMichael Widenius2011-02-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed compiler errors - Modified Makefiles to be part of plugin directory - Some minor changes in database.cpp to use the new MariaDB handler interface
* | | | | | | update .bzrignoreSergei Golubchik2011-07-101-0/+33
| | | | | | |
* | | | | | | 5.5-mergeSergei Golubchik2011-07-021-23/+16
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Ignore auto-generated files (source_downloads).Alexander Nozdrin2011-06-071-0/+1
| | | | | | |
| * | | | | | Ignore auto-generated files.Alexander Nozdrin2011-05-161-0/+1
| | | | | | |
| * | | | | | Ignore auto-generated files.Alexander Nozdrin2011-05-111-0/+3
| | | | | | |
| * | | | | | Manual merge from 5.1Mattias Jonsson2011-04-201-0/+9
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | mergeMattias Jonsson2011-04-201-0/+9
| | |\ \ \ \ \
| | | * | | | | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAKMattias Jonsson2011-03-251-0/+12
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When executing row-ordered-retrieval index merge, the handler was cloned, but it used the wrong memory root, so instead of allocating memory on the thread/query's mem_root, it used the table's mem_root, resulting in non released memory in the table object, and was not freed until the table was closed. Solution was to ensure that memory used during cloning of a handler was allocated from the correct memory root. This was implemented by fixing handler::clone() to also take a name argument, so it can be used with partitioning. And in ha_partition only allocate the ha_partition's ref, and call the original ha_partition partitions clone() and set at cloned partitions. Fix of .bzrignore on Windows with VS 2010
| * | | | | | merge mysql-5.1->mysql-5.5Georgi Kodinov2011-03-281-1/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Added support for VS10.Georgi Kodinov2011-03-281-1/+5
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixed RelWithDebugInfo bzr ignores.
| * | | | | merge mysql-5.5->mysql-5.5-bugteamGeorgi Kodinov2010-12-161-0/+2
| |\ \ \ \ \
| | * \ \ \ \ Manual-merge from 5.5-bugfixing.Ramil Kalimullin2010-11-181-0/+8
| | |\ \ \ \ \
| | * \ \ \ \ \ mergeGeorgi Kodinov2010-10-291-0/+2
| | |\ \ \ \ \ \
| * | | | | | | | Add VERSION.dep to the bzr ignore list. The file is generatedDavi Arnaut2010-12-151-0/+1
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | automatically to place a dependency on the VERSION file.
| * | | | | | | mergeGeorgi Kodinov2010-11-031-0/+8
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | | | |/ / / / | | |/| | | |
| | * | | | | added windows cmake binariesGeorgi Kodinov2010-11-031-0/+9
| | |/ / / /
View Lorry Controller Status