summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* 10.0-base mergeSergei Golubchik2013-06-0622-32/+121
|\ | | | | | | (without InnoDB - all InnoDB changes were ignored)
| * 5.5 mergeSergei Golubchik2013-06-0622-32/+121
| |\
| | * MDEV-4553 - Fixes for compilation under NetBSD.Vladislav Vaintroub2013-05-272-1/+7
| | |
| | * Fixed MDEV-4291: Assertion `trid >= info->s->state.create_trid' failure or ↵Michael Widenius2013-05-131-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | data corruption (key points to record outside datafile) on INSERT into an Aria table. The isssue was that the check if a table was moved between systems didn't take into account that create_trid could be bigger than the current max trid on the new system. This could only happen if one tried to move a table that one had just done a 'REPAIR TABLE' on. Tables that one had run 'aria_chk --zerofill' on worked. Fixed this by assuming that if create_trid is too big then the table has been moved from one system to another and we have to do an automatic zerofill. Other fixed: - Added a check to detect a wrong create_trid in 'check table'. - aria_chk -dvv will now write out also the create_trid (to make future error finding easier) - aria_chk --zerofill doesn't anymore require a aria_control_file - Removed some warnings from safemalloc when using aria_chk, ma_test1 and ma_test2. include/myisamchk.h: Removed wrong 'QQ' flags (the flags are used by myisamchk and aria_chk) storage/maria/ha_maria.cc: maria_chk_status() can now also return an error. storage/maria/ma_check.c: In maria_chk_status() check if create_trid value is too big. storage/maria/ma_open.c: Changed check if table is moved so that we can detect wrong create_trid values. Don't set STATE_NOT_MOVABLE flag if we are doing repair/check. This was done so that aria_chk can print out the movable flag. storage/maria/ma_test1.c: Added code to suppress memory leaks from safemalloc storage/maria/ma_test2.c: Added code to suppress memory leaks from safemalloc storage/maria/maria_chk.c: Added code to suppress memory leaks from safemalloc. Make help text a bit better for --HELP and --zerofill. Incresed version number. Don't require a control file if we are only doing --zerofill Print out 'create_trid' when doing --describe --verbose storage/maria/unittest/ma_test_recovery.expected: Updated result file
| | * centos5 gcc 4.1 asm bugSergei Golubchik2013-05-071-3/+3
| | | | | | | | | | | | | | | | | | include/atomic/x86-gcc.h: force %esi register, don't give gcc a choice. (otherwise it could choose %ebx, and 4.1 did)
| | * mysql-5.5.31 mergeSergei Golubchik2013-05-0715-16/+25
| | |\
| | | * Updated/added copyright headersMurthy Narkedimilli2013-02-2615-15/+21
| | | |\
| | | | * Updated/added copyright headers.Murthy Narkedimilli2013-02-2536-38/+36
| | | | |
| | | * | BUG#14303860 - EXECUTING A SELECT QUERY WITH TOO Neeraj Bisht2013-01-141-0/+2
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | MANY WILDCARDS CAUSES A SEGFAULT Back port from 5.6 and trunk
| | | | * BUG#14303860 - EXECUTING A SELECT QUERY WITH TOO Neeraj Bisht2013-01-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MANY WILDCARDS CAUSES A SEGFAULT Back port from 5.6 and trunk
| | * | | MDEV-260 auditing table accessesSergei Golubchik2013-04-192-1/+66
| | | | |
| | * | | MDEV-4332 Increase username length from 16 charactersSergei Golubchik2013-04-181-1/+1
| | | | |
| | * | | strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1)Sergei Golubchik2013-04-171-0/+9
| | | | | | | | | | | | | | | | | | | | with a bit of lame protection against abuse.
* | | | | Merge 10.0-base -> 10.0unknown2013-05-283-11/+15
|\ \ \ \ \ | |/ / / /
| * | | | Added some fixes that should make MyISAM & Aria REPAIR work with more than ↵Michael Widenius2013-05-103-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4G records - If one specifies --force twice to myisamchk and aria_chk, then we will try to finnish the repair even if sort_buffer would be too small. This was done by dynamically allocate buffer handler objects as long as memory lasts. - New option for myisamchk and aria_chk: create-missing-keys - Changed default size of myisam_sort_buffer_size from 8M to 128M. - Changed default size of sort_buffer_size in aria_chk from 128M to 256M. - Increased information in error message about 'sort_buffer_size' beeing to small. - Print also to 'show warnings' if repair was retried. - Increased size of internal sort-buffer-readers from 16K to 128K - Changed printing of 'number of records' to use %ll instead of casting to long - Changed buffer sizes for myisam and aria to use MY_ALIGN_DOWN() to get same number of bytes allocated on different machines. include/my_global.h: Added MY_ALIGN_DOWN() to get previous alignment (for big memory areas) include/myisam.h: Increased size of types to be able to handle more records include/myisamchk.h: Increased size of types to be able to handle more records Added T_FORCE_SORT_MEMORY to force repair to work even if sort_buffer would not be big enough mysql-test/r/myisam.result: Updated result mysql-test/r/mysqld--help.result: Updated result mysql-test/r/repair.result: Updated result mysql-test/suite/maria/maria.result: Added test cases for some fixed bugs in MyISAM to verify that Aria doesn't have them too. mysql-test/suite/maria/maria.test: Added test cases for some fixed bugs in MyISAM to verify that Aria doesn't have them too. mysql-test/suite/maria/maria3.result: Updated result after sort buffer size increase mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic.result: Updated result after sort buffer size increase mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic.result: Updated result after sort buffer size increase mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic.test: Updated result after sort buffer size increase mysql-test/t/myisam.test: Fixed error messages to not print system specific data mysql-test/t/repair.test: Fixed error messages to not print system specific data storage/maria/ha_maria.cc: Print also to 'show warnings' if repair was retried Changed default size of sort_buffer_size from 128M to 256M (same as in mysqld) storage/maria/ma_check.c: Renamed USE_BUFFER_INIT -> PAGE_BUFFER_INIT storage/maria/ma_sort.c: Increased size of internal sort-buffer-readers from 16K to 128K Increased size of types to be able to handle more records Added support for T_FORCE_SORT_MEMORY Don't allocate too many extra BUFFPEK at a time (they are probably not needed) Improved error message for "sort_buffer_size is too small" Changed printing of 'number of records' to use %ll instead of casting to long Fixed bug where maria_update_key_parts() was called too early. Fixed bug in detecting result from read_to_buffer(). Added 'out of memory' checking when calling 'alloc_dynamic()'. storage/maria/maria_chk.c: Added --create-missing-keys If one specifies --force twice then we will try to finnish the repair even if sort_buffer would be too small. check_param.sort_buffer_length varialble was used with wrong type. storage/maria/maria_def.h: Increased size of types to be able to handle more records Use MY_ALIGN_DOWN() to get same number of bytes allocated on different machines Renamed USE_BUFFER_INIT -> PAGE_BUFFER_INIT storage/maria/maria_ftdump.c: Renamed USE_BUFFER_INIT -> PAGE_BUFFER_INIT storage/maria/maria_read_log.c: Use PAGE_BUFFER_INIT for page cache storage/myisam/ha_myisam.cc: Changed default size of myisam_sort_buffer_size from 8M to 128M storage/myisam/mi_check.c: Renamed USE_BUFFER_INIT -> KEY_BUFFER_INIT storage/myisam/myisam_ftdump.c: Renamed USE_BUFFER_INIT -> KEY_BUFFER_INIT storage/myisam/myisamchk.c: Added --create-missing-keys If one specifies --force twice then we will try to finnish the repair even if sort_buffer would be too small. check_param.sort_buffer_length varialble was used with wrong type. Renamed USE_BUFFER_INIT -> KEY_BUFFER_INIT storage/myisam/myisamdef.h: Increased SORT_BUFFER_INIT to 64M (speeds up repair a lot and most machines have nowadays a lot of memory) Use MY_ALIGN_DOWN() to get same number of bytes allocated on different machines Renamed USE_BUFFER_INIT -> KEY_BUFFER_INIT storage/myisam/sort.c: Increased size of internal sort-buffer-readers from 16K to 128K Increased size of types to be able to handle more records Added support for T_FORCE_SORT_MEMORY Don't allocate too many extra BUFFPEK at a time (they are probably not needed) Improved error message for "sort_buffer_size is too small" Changed printing of 'number of records' to use %ll instead of casting to long Fixed bug in detecting result from read_to_buffer(). Added 'out of memory' checking when calling 'alloc_dynamic()'.
* | | | | 10.0-base mergeSergei Golubchik2013-04-182-7/+9
|\ \ \ \ \ | |/ / / /
| * | | | Changed the client library to only mark memory as THREAD_SPECIFIC if one has ↵Michael Widenius2013-04-172-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | called mysql_options() with MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY include/mysql.h: Added MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY include/mysql.h.pp: Updated file sql-common/client.c: Marked client memory as THREAD_SPECIFIC sql/event_db_repository.cc: Fixed compiler warning sql/slave.cc: Marked client memory as THREAD_SPECIFIC storage/federatedx/federatedx_io_mysql.cc: Marked client memory as THREAD_SPECIFIC storage/federatedx/ha_federatedx.cc: Marked client memory as THREAD_SPECIFIC storage/sphinx/ha_sphinx.cc: Marked client memory as THREAD_SPECIFIC
* | | | | Merge 10.0-base -> 10.0 (GTID).unknown2013-04-171-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-26: Global transaction ID. First alpha release.unknown2013-04-151-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge of 10.0-mdev26 feature tree into 10.0-base. Global transaction ID is prepended to each event group in the binlog. Slave connect can request to start from GTID position instead of specifying file name/offset of master binlog. This facilitates easy switch to a new master. Slave GTID state is stored in a table mysql.rpl_slave_state, which can be InnoDB to get crash-safe slave state. GTID includes a replication domain ID, allowing to keep track of distinct positions for each of multiple masters.
| | * | | | MDEV-26: Global transaction ID.unknown2013-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix remaining two sporadic test failures in the full test suite: - Remove crash in DBUG_ASSERT() in _db_flush() (bug also exists in main tree). - Fix locking order violation for LOCK_status by temporarily unlocking it while locking LOCK_active_mi (like a similar fix for LOCK_global_variables).
* | | | | | remove numerous #ifdef HAVE_PSI_TABLE_INTERFACESergei Golubchik2013-04-151-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | simplify ha_table_share_psi()
* | | | | | 10.0-base mergeSergei Golubchik2013-04-1523-217/+153
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 5.5 mergeSergei Golubchik2013-04-142-1/+20
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | 5.3 mergeSergei Golubchik2013-04-122-1/+27
| | |\ \ \ \
| | | * \ \ \ 5.2 mergeSergei Golubchik2013-04-112-1/+27
| | | |\ \ \ \
| | | | * \ \ \ 5.1 mergeSergei Golubchik2013-04-112-1/+27
| | | | |\ \ \ \
| | | | | * | | | MDEV-4244 [PATCH] Buffer overruns and use-after-free errorsSergei Golubchik2013-04-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes for gcc 4.8 - compilation warnings and -fsanitize=address
| | | | | * | | | MDEV-4088 Replication 10.0 -> 5.5 failsSergei Golubchik2013-04-041-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update 5.1 to replicate from 10.0 and to show the server version (as of 10.0) correctly sql-common/client.c: mdev:4088 sql/slave.cc: use the version number, not just the first character of the version string (we want 10 > 4 not "10" < "4").
| | | * | | | | | 5.2 -> 5.3Sergei Golubchik2013-02-281-2/+2
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | 5.1 -> 5.2 mergeSergei Golubchik2013-02-281-2/+2
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | mysql-5.1 mergeSergei Golubchik2013-02-281-2/+2
| | | | | |\ \ \ \ | | | | | | | |_|/ | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysys/errors.c: revert upstream's fix. use a much simpler one mysys/my_write.c: revert upstream's fix. use a simpler one sql/item_xmlfunc.cc: useless, but ok sql/mysqld.cc: simplify upstream's fix storage/heap/hp_delete.c: remove upstream's fix. we'll use a much less expensive approach.
| * | | | | | | | MDEV-4088 Replication 10.0 -> 5.5 failsSergei Golubchik2013-04-091-0/+7
| | | | | | | | |
| * | | | | | | | post-review comments and other minor editsSergei Golubchik2013-04-091-1/+1
| | | | | | | | |
| * | | | | | | | * frm extra2 segment.Sergei Golubchik2013-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * persistent table versions in the extra2 * ha_archive::frm_compare using TABLE_SHARE::tabledef_version * distinguish between "important" and "optional" extra2 frm values * write engine-defined attributes (aka "table options") to extra2, not to extra, but still read from the old location, if they're found there.
| * | | | | | | | CREATE TABLE and frm-less discovering engines.Sergei Golubchik2013-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now CREATE TABLE does not write the frm file on disk, if the engine can discover it
| * | | | | | | | remove ha_create_table_from_engine()Sergei Golubchik2013-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replace enum read_frm_op with a bitmap flags. remove always-unused 'error' argument of get_table_share
| * | | | | | | | * don't use 1-8 numbers for open_table_error codes, use an enum.Sergei Golubchik2013-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * print "table doesn't exist in engine" when a table doesn't exist in the engine, instead of "file not found" (if no file was involved) * print a complete filename that cannot be found ('t1.MYI', not 't1') * it's not an error for a DROP if a table doesn't exist in the engine (or some table files cannot be found) - if the DROP succeeded regardless
| * | | | | | | | simpler fix for mysql bug #56085, no need to write an error interceptor,Sergei Golubchik2013-04-071-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when the function has a dedicated flag for this very use case.
| * | | | | | | | macro do {} while(0) safetySergei Golubchik2013-04-071-1/+1
| | | | | | | | |
| * | | | | | | | my_dir() cleanupSergei Golubchik2013-04-072-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * replace pointer acrobatics with a struct * make sorting explicit: MY_DONT_SORT -> MY_WANT_SORT (if you want something to be done - say it. fixes all places where my_dir() was used without thinking) * typo s/number_off_files/number_of_files/ * directory_file_name() doesn't need to be extern * remove #ifdef __BORLANDC__ * ignore '.' and '..' entries
| * | | | | | | | remove the service for installing the closed-source mysql thread pool pluginSergei Golubchik2013-04-076-93/+4
| | | | | | | | |
| * | | | | | | | small cleanupSergei Golubchik2013-04-071-7/+5
| | | | | | | | |
| * | | | | | | | remove ULL() and LL(), because they're totally unnecessarySergei Golubchik2013-04-073-37/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and sometimes harmful (used with expressions)
| * | | | | | | | Merge 5.5->10.0-baseIgor Babaev2013-03-311-56/+59
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | MDEV-4243 : remove several clang warnings.Vladislav Vaintroub2013-03-291-56/+59
| | | | | | | | |
| * | | | | | | | 5.5 mergeSergei Golubchik2013-03-278-9/+19
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | MDEV-4307 Support at least 48 utf8 characters in username in server and PAMSergei Golubchik2013-03-263-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend plugin auth api to support up to 512 bytes in the user names. Use the API versioning to support old auth plugins too!
| | * | | | | | | MDEV-4186 Test case main.myisampack fails on ppc32 (only)Sergei Golubchik2013-03-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix the declaration to use the correct type for st_handler_check_param::sort_buffer_length. remove redundant casts.
| | * | | | | | | MDEV-4068 rpm scriptlet chown command dangerousSergei Golubchik2013-03-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add --mysqld option to my_print_defaults change server-postin script to use that
| | * | | | | | | merge with mysql-5.5.30 minus few incorrect or not applicable changesetsSergei Golubchik2013-02-283-2/+4
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |