summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | perfschema 5.6.24Sergei Golubchik2015-05-05151-1681/+2138
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | including the big commit commit 305130361bf72726de220f3d2b2787395e10be61 Author: Marc Alff <marc.alff@oracle.com> Date: Tue Feb 10 11:31:32 2015 +0100 WL#8354 BACKPORT DIGEST IMPROVEMENTS TO MYSQL 5.6 (with the following commits) and related changes in sql/
| | | * | | | | 5.6.24Sergei Golubchik2015-05-04128-1663/+731
| | | | | | | |
| | * | | | | | .gitignore: add generated mroonga *.result filesSergei Golubchik2015-05-051-16/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and remove duplicates
| | * | | | | | Merge branch 'Kentoku:10.0' into 10.0Sergei Golubchik2015-05-05426-5486/+24759
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'ks-Mroonga-5.02' into 10.0Kentoku SHIBA2015-05-05419-5434/+24597
| | | |\ \ \ \ \ \
| | | | * | | | | | revert CMakeList.txt at groonga-normalizer-mysql/normalizersKentoku SHIBA2015-05-052-20/+1
| | | | | | | | | |
| | | | * | | | | | add -fPIC for groonga-normalizer-mysqlKentoku SHIBA2015-05-051-0/+8
| | | | | | | | | |
| | | | * | | | | | add -fPIC for groonga-normalizer-mysqlKentoku SHIBA2015-05-0549-1468/+7
| | | | | | | | | |
| | | | * | | | | | Update Mroonga to the latest version on 2015-04-30T04:44:30+0900Kentoku SHIBA2015-04-30413-5251/+25886
| | | | | | | | | |
| | | * | | | | | | update Spider to 3.2.21Kentoku SHIBA2015-05-057-52/+162
| | | |/ / / / / /
| | * | | | | | | Merge branch 'Buggynours:10.0' into 10.0Sergei Golubchik2015-05-0547-696/+2033
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | - Fix Catalog JSON table crash when no JpathOlivier Bertrand2015-04-1725-393/+894
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added JSON OBJECT specification for pretty != 2. - Fix NULL values not recognized for nullable JSON columns - Issue an error message when a JSON table is created without specifying LRECL if PRETTY != 2. - Make JSONColumns use a TDBJSON class. - Make JSON table using MAPFAM modified: filamap.h filamtxt.h ha_connect.cc json.result tabjson.cpp tabjson.h table.cpp - Implementing Discovery for the XML table type. modified: domdoc.cpp domdoc.h ha_connect.cc libdoc.cpp plgxml.cpp plgxml.h reldef.cpp reldef.h tabxml.cpp tabxml.h - Providing an error message when creating an ODBC table via discovery returns columns of more than one table. modified: ha_connect.cc - TableOptionStruct declaration moved from ha_connect.h to mycat.h To make it easier to use by other classes. modified: ha_connect.cc ha_connect.h mycat.cc mycat.h reldef.cpp tabmysql.cpp taboccur.cpp tabpivot.cpp tabtbl.cpp tabutil.cpp tabxcl.cpp
| | | * | | | | | Fix MDEV-7890Olivier Bertrand2015-04-045-16/+48
| | | | | | | | |
| | | * | | | | | Correct a typo that made multiple 1 tables to return 0 lines on LinuxOlivier Bertrand2015-04-021-1/+1
| | | | | | | | |
| | | * | | | | | - Fix MDEV-7879 by adding a test in all SetValue_pval function to return ↵Olivier Bertrand2015-03-302-35/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when valp == this. - Fix MDEV-7840 by making proper datetime constant in ha_connect::CheckCond on a second place.
| | | * | | | | | D:\Ber\Develop\git3.msgOlivier Bertrand2015-03-281-0/+8
| | | | | | | | |
| | | * | | | | | - Fix a bug that caused a crash when doing delete on a json table with wrong ↵Olivier Bertrand2015-03-228-70/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | syntax file - Suppress MYSQL_SUPPORT preprocessor variable
| | | * | | | | | This commit includes changes done in a previous (deleted) branch plus new ones.Olivier Bertrand2015-03-1820-393/+958
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the previous branch: commit eda4928ff122a0845baf5ade83b4aa29244a3a89 Author: Olivier Bertrand <bertrandop@gmail.com> Date: Mon Mar 9 22:34:56 2015 +0100 - Add discovery to JSON tables When columns are not defined, CONNECT analyses the json file to find column definitions. This wors only on table that are an array of objects. Pair keys are used to generate the column names and pair values are used for its definition. When the LEVEL option is defined as a not null integer, the eventual JPATH is scanned up to the LEVEL value. From the current one: - Fix MDEV-7521 when column names are utf8 encoded (not a general multi-charset fix) - Adds more to JSON discovery processing and UDF's - Use PlugDup everywhere it replaces PlugSubAlloc + strcpy.
| | | * | | | | | - Adding files to ignore from C C++ and Visual StudioOlivier Bertrand2015-03-162-0/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Making result files to be ended by LF to avoid test failures
| | | * | | | | | Add #include <ostream> in dict0mem.h and change iterator to const_iterator ↵Buggynours2015-03-034-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in dic0mem.cc This fix compiling error when compiled with Visual Studio 9 2008
| | * | | | | | | XtraDB-5.6.23-72.1Sergei Golubchik2015-05-0530-86/+273
| | |\ \ \ \ \ \ \
| | | * | | | | | | 5.6.23-72.1Sergei Golubchik2015-05-0430-85/+272
| | | | | | | | | |
| | * | | | | | | | InnoDB-5.6.24Sergei Golubchik2015-05-0520-492/+439
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | 5.6.24Sergei Golubchik2015-05-0419-491/+438
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'merge-pcre' into 10.0Sergei Golubchik2015-05-0441-768/+1695
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | 8.37Sergei Golubchik2015-05-0479-7082/+10402
| | | | | | | | | | | |
| | * | | | | | | | | | Null-merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2015-05-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | move to storage/xtradbSergei Golubchik2015-05-04365-0/+0
| | | | | | | | | | | |
| | * | | | | | | | | | Null-merge branch 'merge-sphinx' into 10.0Sergei Golubchik2015-05-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | move to storage/sphinxSergei Golubchik2015-05-0413-0/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | Null-merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2015-05-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | move to storage/innobaseSergei Golubchik2015-05-04360-0/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2015-05-04179-1214/+5739
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge branch '5.5' into bb-5.5-sergmariadb-5.5.43Sergei Golubchik2015-04-2910-41/+66
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Fix failing test cases for MDEV-7912 patchVicentiu Ciorbaru2015-04-293-17/+14
| | | | | | | | | | | | | |
| | | | * | | | | | | | | | MDEV-7779 View definition changes upon creation.Alexey Botchkov2015-04-283-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed by using POINT instead of ST_POINT in the item. Later need to fix that with proper ST_POINT implementation
| | | | * | | | | | | | | | MDEV-8020: innodb.innodb-mdev-7055 produces valgrind warnings in buildbotJan Lindström2015-04-284-31/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed by reverting incorrect fix of MDEC-7055 (reopened) and removing the test case (because it now crashes).
| | | | * | | | | | | | | | MDEV-7912 multitable delete with wrongly set sort_buffer_size crashes in ↵Vicentiu Ciorbaru2015-04-283-6/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge_buffers Fixed overflow error that caused fewer bites to be allocated than necessary on Windows 64 bit. This is due to ulong being 32 bit on 64 bit Windows and 64 bit on 64 bit Linux.
| | | * | | | | | | | | | | MDEV-7987 Fatal error: Please read "Security" section of the manual to find ↵Sergei Golubchik2015-04-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out how to run mysqld as root! update the error message to refer to the knowledge base that (now) has an article about this use case
| | | * | | | | | | | | | | post-merge fixesSergei Golubchik2015-04-2911-198/+194
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Merge branch 'openquery/MDEV-6916-maria-5.5-check_view-r4408' into 5.5Sergei Golubchik2015-04-2822-78/+918
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | quote table name in mysql_check:is_view. increment version tooDaniel Black2015-04-141-2/+4
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | Don't run upgrade-views if not mysql or --upgrade-system-tablesDaniel Black2015-04-141-0/+5
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | mysqlcheck fix-view-algorithm -> upgrade-viewsDaniel Black2015-04-146-30/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change mysqlcheck option to upgrade-views={NO,YES,FROM_MYSQL} mysql_upgrade now runs upgrade-views=yes to perform a checksum of all views and add mariadb-version by default. upgrade-views=from_mysql if MySQL is detected as teh origin version.
| | | | * | | | | | | | | | | corrected mysql_upgrade to always list output for every phaseDaniel Black2015-04-141-1/+5
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | Update tests for mysql_upgrade_viewDaniel Black2015-04-143-7/+242
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add bad checksum test Validate REPAIR VIEW {table} add mariadb-version to the frm Add tests for the binary logging of REPAIR VIEW
| | | | * | | | | | | | | | | sql_print_information correctedDaniel Black2015-04-131-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as checksum/swap don't always occur
| | | | * | | | | | | | | | | mariadb_fix_view to allow fixing of view->mariadb_versionDaniel Black2015-04-131-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverts the wrong_checksum part of 29721d7d5f85fe323d70f1856aa1e5294e14074a
| | | | * | | | | | | | | | | avoid calling runctiosn in DBUG_RETURNDaniel Black2015-04-131-1/+3
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | mariadb_fix_view need only check view->mariadb_versionDaniel Black2015-04-131-2/+1
| | | | | | | | | | | | | | |
View Lorry Controller Status