summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed LP bug #872735.Igor Babaev2011-10-134-0/+91
| | | | | | This bug happened because the maps of covering keys for mergeable derived tables/views was not recalculated after the derived tables/vies had been merged into the main query.
* typo.Sergei Golubchik2011-10-131-1/+1
|
* Remove garbage commentSergey Petrunya2011-10-131-1/+0
|
* BUG#872702: Crash in add_ref_to_table_cond() when grouping by a PKSergey Petrunya2011-10-122-0/+33
| | | | - Testcase
* Code cleanup: move variable into branch that uses itSergey Petrunya2011-10-121-1/+1
|
* fix a compilation failure for perl Net::HandlerSocket moduleSergei Golubchik2011-10-125-3/+14
|
* mergeVladislav Vaintroub2011-10-122-2/+62
|\
| * mergeVladislav Vaintroub2011-10-122-2/+62
| |\
| | * Add option to enable feedback plugin to the MSI installer.Vladislav Vaintroub2011-10-122-2/+62
| | |
* | | Fix compile error: ‘cond_copy’ may be used uninitialized in this function.Sergey Petrunya2011-10-121-2/+3
|/ /
* | BUG#869001: Wrong result with semijoin + materialization + firstmatch + ↵Sergey Petrunya2011-10-125-0/+121
| | | | | | | | | | | | | | multipart key - Make advance_sj_state() not to attempt building duplicate removal strategies when we're doing optimization of an SJM-nest.
* | Update subselect_sj{,2}_mat.result with changes that were lost when Sergey Petrunya2011-10-122-4/+25
| | | | | | | | they were deleted and re-created.
* | Restore files accidentally deleted in previous merge.unknown2011-10-112-0/+2590
| |
* | Merge: fix subselect_sj2*.test: add missing DROP TABLE statementSergey Petrunya2011-10-113-1/+3
|\ \
| * | Fix testcases from the previous push: add missing DROP TABLE statementSergey Petrunya2011-10-113-1/+3
| | |
* | | when freeing a possibly NULL pointer under safemalloc - use MY_ALLOW_ZERO_PTRSergei Golubchik2011-10-111-1/+1
| | |
* | | mergeVladislav Vaintroub2011-10-111-3/+0
|\ \ \ | |/ / |/| |
| * | mergeVladislav Vaintroub2011-10-116-2591/+61
| |\ \ | |/ / |/| |
* | | Merge fix for BUG#869012Sergey Petrunya2011-10-116-2591/+61
|\ \ \
| * | | BUG#869012: Wrong result with semijoin + materialization + AND in WHERESergey Petrunya2011-10-116-2591/+61
| | | | | | | | | | | | | | | | | | | | | | | | - in make_join_select(), use the correct condition to check whether the current table is a SJM nest (the previous condition used to be correct before, but then sj-materialization temp table creation was moved to happen before make_join_select was called)
| | * | mergeVladislav Vaintroub2011-10-111-3/+0
| | |\ \ | |/ / / |/| | / | | |/
| | * mergeVladislav Vaintroub2011-10-111-3/+0
| | |\
| | | * remove unconditional SAFEMALLOC/SAFEMUTEX from debug flagsVladislav Vaintroub2011-10-111-3/+0
| | | |
* | | | mergeSergei Golubchik2011-10-1159-181/+1979
|\ \ \ \ | | |/ / | |/| |
| * | | mergeSergei Golubchik2011-10-101-0/+5
| |\ \ \ | | | |/ | | |/|
| | * | add a missing definitionSergei Golubchik2011-10-101-0/+5
| | | |
| * | | fix feedback plugin for 5.2Sergei Golubchik2011-10-081-1/+19
| | | |
| * | | merge with 5.1Sergei Golubchik2011-10-0749-143/+1848
| |\ \ \ | | |/ /
| | * | sort results in tests to make them stableSergei Golubchik2011-10-065-6/+8
| | | |
| | * | disable feedback plugin by default. Now on windows too.Sergei Golubchik2011-10-061-1/+3
| | | |
| | * | merge the feedback treeSergei Golubchik2011-10-0648-149/+1845
| | |\ \
| | | * | Implement uname() on Windows.Vladislav Vaintroub2011-10-061-1/+89
| | | | | | | | | | | | | | | | | | | | Also, fix code to get physical memory size.
| | | * | merge with feedback-pluginSergei Golubchik2011-10-062-0/+7
| | | |\ \ | | | | | | | | | | | | | | | | | | and disable feedback plugin by default, if it's compiled in.
| | | | * | add #define WITH_FEEDBACK_PLUGINSergei Golubchik2011-10-061-0/+3
| | | | | |
| | | * | | fix fulltext_plugin.test on windowsSergei Golubchik2011-10-051-1/+2
| | | | | |
| | | * | | tests for feedback plugin,Sergei Golubchik2011-10-0410-0/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: garbage in PLUGIN_VAR_STR variables when INSTALL'ing a plugin mysql-test/include/default_mysqld.cnf: disable feedback plugin by default. when enabled - tag is as a test run
| | | * | | merge feedback pluginSergei Golubchik2011-10-049-0/+1430
| | | |\ \ \ | | | | |/ /
| | | | * | fix for static plugins in mariadb.Sergei Golubchik2011-10-044-24/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | send "startup" message 5 minutes after startup, not immediately Makefile.am: mariadb uses .la libraries for static plugins. mysql - .a libraries plug.in: mariadb uses .la libraries for static plugins. mysql - .a libraries sender_thread.cc: send "startup" message 5 minutes after startup, not immediately url_http.cc: avoid "unused variable https" warning
| | | | * | don't use https url by default, if ssl is not availableSergei Golubchik2011-10-031-1/+7
| | | | | |
| | | | * | initial checkinSergei Golubchik2011-10-019-0/+1417
| | | | /
| | | * | support for plugins on windowsSergei Golubchik2011-10-0414-115/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/*
| | | * | my_gethwaddr() on Solaris and WindowsSergei Golubchik2011-10-043-22/+87
| | | | |
| | | * | remove redundant declarationsSergei Golubchik2011-10-0411-11/+0
| | | | |
| * | | | Fixed that when using a trigger mysql.proc is now accessedMichael Widenius2011-10-0610-45/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup: Changed procedure type from a int/char to an enum for easier to manage and debug code. mysql-test/r/trigger.result: Test that mysql.proc is not used as part of creating or using a trigger. mysql-test/t/trigger.test: Test that mysql.proc is not used as part of creating or using a trigger. sql/sp.cc: The main bug fix is to not look up triggers in mysql.proc; This is done by ignoreing type == TYPE_ENUM_TRIGGER in sp_add_used_routine() Cleanup: Changed procedure type from a int/char to an enum. sql/sp.h: Cleanup: Changed procedure type from a int/char to an enum. sql/sp_head.h: Cleanup: Changed procedure type from a int/char to an enum. sql/sql_db.cc: Fix include order sql/sql_lex.cc: Fix include order sql/sql_parse.cc: Cleanup: Changed procedure type from a int/char to an enum. sql/sql_show.cc: Fix include order sql/sql_view.cc: Fix include order
* | | | | Fixed LP bug #870046.Igor Babaev2011-10-113-2/+44
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug is a consequence of the fix in the function add_ref_to_table_cond for LP bug 826935 that turned out to be not quite correct: it tried to AND the same generated condition with two different other conditions. This patch creates a copy of the generated condition if the condition needs to be ANDed with two different items.
* | | | Mergeunknown2011-10-1027-254/+255
|\ \ \ \
| * | | | Making subquery cache on by default.unknown2011-10-0526-229/+230
| | | | |
* | | | | remove unnecessary defineSergei Golubchik2011-10-101-1/+0
| | | | |
* | | | | make sure that cast(... as date) returns a valid date, as specified by the ↵Sergei Golubchik2011-09-294-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | caller. make Item::send() request a date according to the current SQL mode limitations.
* | | | | Merge fix for BUG#860580Sergey Petrunya2011-10-061-0/+14
|\ \ \ \ \