summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* merge 10.0-base -> 10.0unknown2013-09-2641-203/+278
|\
| * merge 5.5 -> 10.0-baseunknown2013-09-2542-203/+279
| |\
| | * merge 5.3 -> 5.5unknown2013-09-2518-167/+130
| | |\
| | | * MDEV-5039: incorrect Item_func_regex::update_used_tables()unknown2013-09-2517-170/+135
| | | | | | | | | | | | | | | | | | | | Other fix of maybe_null problem and revert of revno: 3608 "MDEV-3873 & MDEV-3876 & MDEV-3912 : Wrong result (extra rows) with ALL subquery from a MERGE view."
| | * | MDEV-5062 : disable jemalloc by default everywhere, except Linux and OSX.Vladislav Vaintroub2013-09-242-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bundled jemalloc can only be on Linux and OSX without problems. On BSDs, build fails because make does not understand GNU extensions (also BSDs do not need jemalloc, it is already system malloc). On Solaris, build fails with compile error.
| | * | MDEV-5053 - fix cyclic dependency when building with Ninja CMake generatorVladislav Vaintroub2013-09-232-2/+9
| | | |
| | * | Allow unique prefix for command line options, like any GNU program.Michael Widenius2013-09-231-6/+0
| | | |
| | * | TokuDB fixes:Michael Widenius2013-09-234-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Better error message when using huge pages - Fixed link error - Test suite should run even on system with huge pages storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake: Fixed that linking works on systems that uses lib64 storage/tokudb/ft-index/portability/huge_page_detection.cc: Better error message storage/tokudb/mysql-test/rpl/suite.pm: Test suite should run even on system with huge pages storage/tokudb/mysql-test/tokudb/suite.pm: Test suite should run even on system with huge pages
| | * | MDEV-4684 - Enhancement request: --init-command support for mysqlslapSergey Vojtovich2013-09-174-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | Added --init-command argument to mysqlslap: SQL Command to execute when connecting to MySQL server. Will automatically be re-executed when reconnecting.
| | * | Merge fix for MDEV-5037 into 5.5Sergey Petrunya2013-09-236-12/+65
| | |\ \
| | | * | MDEV-5037: Server crash on a JOIN on a derived table with join_cache_level > 2Sergey Petrunya2013-09-206-12/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The crash was caused because the optimizer called handler->multi_range_read_info() on a derived temporary table. That table has been created, but not opened yet. Because of that, handler::table was NULL, which caused crash. Fixed by changing DS-MRR methods to use handler::table_share instead. handler::table_share is set in handler ctor, so this should be safe.
| | * | | Tokudb made compilig.unknown2013-09-235-6/+6
| | | | |
| | * | | Update feedback plugin to recognize Windows 8.1 / Windows Server 2012 R2.Vladislav Vaintroub2013-09-201-1/+5
| | | | |
* | | | | TokuuDB: add handlerton::discover_table_existence() methodSergei Golubchik2013-09-251-1/+11
| | | | |
* | | | | Enable TokuDB online ALTERSergei Golubchik2013-09-2539-206/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/create_options.cc: an utility function to compare two filled-in engine_option structures sql/sql_table.cc: * two keys are different if their option_struct's differ (for ALTER TABLE DROP key, ADD key) * engines doing inplace alter must see the new frm image
* | | | | update ALTER ONLINE to mean ALTER LOCK=NONE, not ALTER ALGORITHM=INPLACE.Sergei Golubchik2013-09-253-44/+28
| | | | | | | | | | | | | | | | | | | | Fix test results accordingly.
* | | | | extract privilege tests from delete_returning.test into ↵Sergei Golubchik2013-09-254-135/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delete_returning_grant.test that is not run for embedded server
* | | | | fix TZ setting to be Windows-compatibleSergei Golubchik2013-09-252-21/+21
| | | | |
* | | | | update /etc/my.cnf.d/server.cnf to say 10.0, not 5.5Sergei Golubchik2013-09-251-7/+5
| | | | |
* | | | | bzr ignoreSergei Golubchik2013-09-251-0/+3
| | | | |
* | | | | simplify CMakeLists.txt for cassandra/connect enginesSergei Golubchik2013-09-259-48/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now, if the dynamic plugin puts itself in a distinct component, then * ${plugin}.cnf file is generated and installed automatically * a separate RPM is generated automatically * necessary FILELIST/PROVIDES/OBSOLETES/REQUIRES are filled in automatically
* | | | | fix debian packaging (again).Sergei Golubchik2013-09-212-2/+0
| | | | | | | | | | | | | | | | | | | | we don't build innodb plugin in 10.0 yet
* | | | | A clean-up for the base64 functions.Alexander Barkov2013-09-241-15/+3
| | | | | | | | | | | | | | | | | | | | | | | | | SIZEOF_INT can never be 8. Removing the redundant #ifdef code.
* | | | | Added information about the MariaDB foundationMichael Widenius2013-09-2310-45/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated information in SHOW AUTHORS and SHOW CONTRIBUTORS SHOW AUTHORS and SHOW CONTRIBUTORS are not depricated anymore. CMakeLists.txt: Install TODO and CREDITS files CREDITS: Information about the MariaDB foundation README: Updated to include the MariaDB foundation mysql-test/r/contributors.result: Updated contributors mysql-test/r/show_check.result: SHOW AUTHORS and SHOW CONTRIBUTORS are not depricated anymore. scripts/make_binary_distribution.sh: Added TODO and CREDITS sql/authors.h: Updated list of active authors sql/contributors.h: Updated list of active contributors and members of the MariaDB foundation sql/sql_show.cc: Extend comment lengths sql/sql_yacc.yy: SHOW AUTHORS and SHOW CONTRIBUTORS are not depricated anymore
* | | | | Fixed issue where tokudb xz used lib64 in some cases, which caused a link ↵Michael Widenius2013-09-231-0/+1
| | | | | | | | | | | | | | | | | | | | failure
* | | | | Merging TO_BASE64() and FROM_BASE64() from MySQL-5.6Alexander Barkov2013-09-2312-110/+2103
| | | | |
* | | | | Merge Spider updates. FixesSergey Vojtovich2013-09-232-9/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-4735 - Assertion `! is_set()' fails in Diagnostics_area::set_ok_status on attempt to create a temporary SPIDER table connecting to non-existing source MDEV-4737 - Server crashes in spider_mysql_handler::append_match_against on SELECT .. MATCH .. AGAINST .. BOOLEAN MODE MDEV-4738 - INSERT DELAYED on a SPIDER table doesn't produce ER_DELAYED_NOT_SUPPORTED, doesn't work like delayed, and doesn't honor lock_wait_timeout like normal INSERT
| * | | | | fix MDEV-4735 Assertion `! is_set()' fails in ↵Kentoku SHIBA2013-09-191-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | Diagnostics_area::set_ok_status on attempt to create a temporary SPIDER table connecting to non-existing source
| * | | | | fix MDEV-4738 INSERT DELAYED on a SPIDER table doesn't produce ↵Kentoku SHIBA2013-09-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | ER_DELAYED_NOT_SUPPORTED, doesn't work like delayed, and doesn't honor lock_wait_timeout like normal INSERT
| * | | | | fix MDEV-4737 Server crashes in spider_mysql_handler::append_match_against ↵Kentoku SHIBA2013-09-191-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | on SELECT .. MATCH .. AGAINST .. BOOLEAN MODE
* | | | | | MDEV-4879 - Merge test cases for new CREATE TEMPORARY TABLE privilege modelSergey Vojtovich2013-09-2015-2/+1429
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - merged test cases for MySQL bug#27480 - fixed that LOCK TABLES was unable to open temporary table (covered by grant2 test, merged appropriate code from 5.6) - commented lines that cause server crash in merge test, reported MDEV-5042 (not relevant to bug#27480)
* | | | | | remove unused LEX::contains_plaintext_passwordSergei Golubchik2013-09-213-8/+0
| | | | | |
* | | | | | TokuDB now compiles and passes all tests as in 5.5Sergei Golubchik2013-09-2114-26/+42
| | | | | |
* | | | | | 10.0-base merge.Sergei Golubchik2013-09-213468-85929/+1907605
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | 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.33a mergeSergei Golubchik2013-09-2013-47/+48
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | 5.5.33aSergei Golubchik2013-09-191-1/+1
| | | | | |
| | * | | | MDEV-4979 mysqld_safe section in my.cnf doesn't have mariadb equivalentSergei Golubchik2013-09-192-39/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | read also [mariadb_safe] section. modify the manpage accordingly (and remove a netware-specific option from it)
| | * | | | MDEV-5035 debian package conflict libmariadbclient18 5.5.33+maria-1~wheezy ↵Sergei Golubchik2013-09-192-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | vs. mariadb-server-5.3 5.3.12-mariadb122~wheezy
| | * | | | MDEV-5021 tokudb ft-index libraries are build with -DWITHOUT_TOKUDB=1Sergei Golubchik2013-09-191-1/+2
| | | | | |
| | * | | | MDEV-5026 cannot use system jemallocSergei Golubchik2013-09-191-3/+12
| | | | | |
| | * | | | MDEV-5029 Crash in MariaDB 5.5.33 with .frm from older MariaDB releaseSergei Golubchik2013-09-187-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't fail when an frm is inconsistent (legacy DB_TYPE_xxx code doesn't match the engine name), use the engine name, ignore the legacy code.
| * | | | | fix debian builds. don't use WITH_MAX anymoreSergei Golubchik2013-09-191-1/+0
| | | | | |
| * | | | | mergeSergei Golubchik2013-09-183622-85813/+1904839
| |\ \ \ \ \
| | * \ \ \ \ 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-183622-85813/+1904839
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | fix upgrades when mariadb-galera-server-5.5 is installedSergei Golubchik2013-09-182-4/+4
| | | | | | |
| | | * | | | MDEV-5029 Crash in MariaDB 5.5.33 with .frm from older MariaDB releaseSergei Golubchik2013-09-184-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't set TABLE_SHARE::keys before TABLE_SHARE::key_info is set, otherwise an error might leave only the first property set and it will confuse TABLE_SHARE::destroy()
| | | * | | | merge with 5.5-releaseSergei Golubchik2013-09-172-6/+6
| | | |\ \ \ \
| | | | * | | | mariadb-tokudb-engine deb package is not architecture-independentSergei Golubchik2013-09-172-2/+2
| | | | | | | |
| | | | * | | | specify deb conflicts correctlySergei Golubchik2013-09-162-4/+4
| | | | | | | |
| | | * | | | | Fixed tokudb with ccache build failure.Sergey Vojtovich2013-09-171-1/+1
| | | | | | | |
View Lorry Controller Status