summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-4506: Parallel replication: intermediate commit.unknown2013-06-252-2/+19
| | | | | Fix typo in worker thread free list management. Simple parallel INSERT from worker threads runs now.
* MDEV-4506: Parallel replication: Intermediate commit.unknown2013-06-253-4/+57
| | | | | A few fixes following tests. Now can apply one INSERT event in a separate worker thread.
* MDEV-4506: Parallel replication of group-committed transactions: ↵unknown2013-06-2416-39/+747
| | | | | | | Intermediate commit First very rough sketch. We spawn and retire a pool of slave threads. Test main.alias works, most likely not much else does.
* Forgotten .result file update.unknown2013-06-082-3/+3
|
* MDEV-4490: Old-style master position points at the last GTID event after ↵unknown2013-06-074-38/+125
| | | | | | | | | | | | | | slave restart Now whenever we reach the GTID point requested from the slave (when using GTID position to connect), we send a fake Gtid_list event. This event is used by the slave to know the current old-style position for MASTER_POS_WAIT(), and later the similar binlog position for MASTER_GTID_WAIT(). Without this fake event, if the slave is already fully up-to-date with the master, there may be no events sent at the given position for an indeterminate time.
* MDEV-4486: Allow to start old-style replication even if ↵unknown2013-06-074-2/+152
| | | | | | | | | | | | | | | mysql.rpl_slave_state is unavailable If the mysql.gtid_slave_pos table is not available, we cannot load nor update the current GTID position persistently. This can happen eg. after an upgrade, before mysql_upgrade_db is run, or if the table is InnoDB and the server is restarted without the InnoDB storage engine enabled. Before, replication always failed to start if the table was unavailable. With this patch, we try to continue with old-style replication, after suitable complaints in the error log. In strict mode, or if slave is configured to use GTID, slave still refuses to start.
* MDEV-4591:Setting gtid* values from inside a transaction might cause ↵unknown2013-06-074-1/+65
| | | | | | | | unexpected results Now we give an error on attempts to set @@SESSION.gtid_domain_id or @@SESSION.gtid_seq_no when a transaction is active.
* MDEV-4483: CHANGE MASTER TO master_use_gtid=xxx looses old-style coordinates.unknown2013-06-078-14/+129
| | | | | | | | | | | There was some old code that cleared the position in CHANGE MASTER, it was forgotten to be removed. In addition, add code that saves/restores the old-style position when we nuke the old relay logs as part of GTID slave start. Normally we will not use these, but it could be useful in case the GTID connect fails and user wants to go back to the old-style coordinates.
* 5.5 mergeSergei Golubchik2013-06-06464-3067/+7733
|\
| * Fix a compile warning on NetBSDVladislav Vaintroub2013-06-011-1/+1
| |
| * MDEV-4607 : libreadline-related compilation problems on NetBSD.Vladislav Vaintroub2013-06-011-1/+1
| | | | | | | | | | | | | | | | Problem : libreadline.so was already present on the machine, however the cmake check NEW_READLINE_INTERFACE was unsuccessfull indicating, thus bundled library had to be used instead of system library. The problem was that the value for HAVE_HIST_ENTRY cmake variable was cached with incorrect value (1 on NetBSD). The fix is to change HAVE_HIST_ENTRY to 0 with CACHE FORCE, after switching to bundled readline.
| * MDEV-4520: Assertion `0' fails in Query_cache::end_of_result on concurrent ↵unknown2013-05-301-2/+14
| | | | | | | | | | | | drop event and event executio Fix for embedded library, where thd->net.vio is not set which efficently switched off QC in emmbedded server for previous patch.
| * followup for revision 3751 "centos5 gcc 4.1 asm bug"Sergei Golubchik2013-05-281-6/+0
| | | | | | | | remove the workaround from cmake/os/FreeBSD.cmake
| * MDEV-4520: Assertion `0' fails in Query_cache::end_of_result on concurrent ↵unknown2013-05-235-4/+52
| | | | | | | | | | | | drop event and event execution If there is no net.vio then query cache cant't get data via net_real_write() so it is better just do not try to cache such query.
| * MDEV-4548 - compile sphinx.so/dll and include into packagesVladislav Vaintroub2013-05-222-13/+55
| | | | | | | | | | replaced snippets_udf.cc with the latest version (2.0.8 from sphinxsource.com), fixed trivial errors on Windows. It will be compiled and installed into plugins directory now.
| * MDEV-4553 - Fixes for compilation under NetBSD.Vladislav Vaintroub2013-05-273-5/+25
| |
| * MDEV-4516 SELECT from I_S.QUERY_CACHE_INFO produces ER_UNKNOWN_ERROR when ↵Sergei Golubchik2013-05-243-1/+7
| | | | | | | | | | | | query cache size is 0 if qc->try_lock() fails, it's not an error
| * fix for compiled-in FederatedXSergei Golubchik2013-05-211-1/+1
| |
| * MDEV-388 Creating a federated table with a non-existing server returns a ↵Sergei Golubchik2013-05-215-17/+27
| | | | | | | | | | | | random error code (part 2)
| * 5.3 mergeSergei Golubchik2013-05-212-2/+4
| |\
| | * fixes for buildbotSergei Golubchik2013-05-214-4/+6
| | |
| * | MDEV-388 Creating a federated table with a non-existing server returns a ↵Sergei Golubchik2013-05-204-2/+17
| | | | | | | | | | | | random error code
| * | increase MAX_HA (number of simultaneously installed storage engines) to 64 Sergei Golubchik2013-05-201-1/+1
| | |
| * | 5.3 merge.Sergei Golubchik2013-05-2025-33/+343
| |\ \ | | |/ | | | | | | change maria.distinct to use a function that doesn't require ssl-enabled builds
| | * 5.2 mergeSergei Golubchik2013-05-2021-33/+266
| | |\
| | | * 5.1 mergeSergei Golubchik2013-05-2016-25/+232
| | | |\
| | | | * Fixed compiler failure on solarisMichael Widenius2013-05-111-1/+1
| | | | |
| | | | * Fixed compiler warningMichael Widenius2013-05-111-1/+1
| | | | |
| | | | * MDEV-4280: Assertion `empty_size == empty_size_on_page' failure in ↵Michael Widenius2013-05-1113-22/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ma_blockrec.c or ER_NOT_KEYFILE on query with DISTINCT and GROUP BY This could happen when using Aria for internal temporary files (default case) and using DISTINCT. _ma_scan_restore_block_record() didn't work correctly if there was rows inserted, updated or deleted on the handler between calls to _ma_scan_remember_block_record() and _ma_scan_restore_block_record(). The effect was that some DISTINCT queries that used remove_dup_with_compare() could fail. .bzrignore: Ignore sql_yacc.hh mysql-test/suite/maria/r/distinct.result: Test case for MDEV-4280 mysql-test/suite/maria/t/distinct.test: Test case for MDEV-4280 mysql-test/t/mysql.test: Fixed test suite (we could get error -1 in some cases) sql/sql_select.cc: Break loop if restart_rnd_next() gives an error storage/maria/ha_maria.cc: scan_restore_pos() can return disk fault error. storage/maria/ma_blockrec.c: _ma_scan_remember_block_record() did incorrectly update scan.dir instead of scan_save.dir . _ma_scan_restore_block_record() didn't work correctly if there was rows inserted,updated or deleted on the handler between calls to _ma_scan_remember_block_record() and _ma_scan_restore_block_record(). Fixed by adding counters for row changes and reading the current scan page if changes had been made. storage/maria/ma_blockrec.h: scan_restore_pos() can return disk fault error. storage/maria/ma_delete.c: Increment row_changes storage/maria/ma_scan.c: scan_restore_pos() can return disk fault error. storage/maria/ma_update.c: Increment row_changes storage/maria/ma_write.c: Increment row_changes storage/maria/maria_def.h: scan_restore_pos() can return disk fault error.
| | | | * MDEV-4326 fix.unknown2013-04-092-2/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed "optimization" which caused preoblems on second execution of PS with string parameter in LIMIT clause. Fixed test_bug43560 to be able to skipp it if connection is UNIX socket.
| | | * | MDEV-4544 - update MSI to include HeidiSQL 8.0Vladislav Vaintroub2013-05-191-1/+1
| | | | |
| | | * | Fix cpack error - safe_process.pl does not exist anymore.Vladislav Vaintroub2013-05-191-1/+1
| | | | |
| | | * | MDEV-4462 mysqld gets SIGFPE when mysql.user table is emptySergei Golubchik2013-05-083-0/+32
| | | | | | | | | | | | | | | | | | | | avoid divison by zero
| | * | | MDEV-4290:unknown2013-05-036-5/+78
| | | | | | | | | | | | | | | | | | | | | | | | | Fix agregate function resolution in derived tables (no name resolution over a derived table border)
| | * | | MergeSergey Petrunya2013-05-051-1/+1
| | |\ \ \
| * | | | | remove start menu shortcut to upgrade wizardVladislav Vaintroub2013-05-191-0/+2
| | | | | |
| * | | | | MDEV-4544 : Update MSI installer to use latest HeidiSQL 8.0Vladislav Vaintroub2013-05-191-1/+1
| | | | | |
| * | | | | Bug#MDEV-4518 Server crashes in is_white_space when it's runAlexander Barkov2013-05-174-1/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with query cache, charset ucs2 and collation ucs2_unicode_ci @ mysql-test/r/ctype_ucs2_query_cache.result @ mysql-test/t/ctype_ucs2_query_cache-master.opt @ mysql-test/t/ctype_ucs2_query_cache.test Adding tests @ sql/sql_cache.cc Fixing not to use default_character_set->state_map, which can point to a non-ASCII character set (utc2, utf16, utf32) and thus have state_map undefined.
| * | | | | - Solaris fixes:Michael Widenius2013-05-156-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed that wait_timeout_func and wait_timeout tests works on solaris - We have to compile without NO_ALARM on Solaris as Solaris doesn't support timeouts on sockets with setsockopt(.. SO_RCVTIMEO). - Fixed that compile-solaris-amd64-debug works (before that we got a wrong ELF class: ELFCLASS64 on linkage) - Fixed some compiler warnings - Fixed some failing tests BUILD/compile-solaris-amd64-debug: Fixed that compile-solaris-amd64-debug works (before that we got a wrong ELF class: ELFCLASS64 on linkage) configure.cmake: We have to compile without NO_ALARM on Solaris as Solaris doesn't support timeouts on sockets with setsockopt(.. SO_RCVTIMEO) mysql-test/suite/parts/t/partition_basic_innodb.test: Mark test as big test (as otherwise we get timeout on our opensolaris machine in buildbot) mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test: Remove warning
| * | | | | MDEV-4266 Server upgrade via apt-get install does not work.Alexey Botchkov2013-05-152-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now empty 'highlevel' packages strictly depend on the same versions of files. These are mariadb-server, mariadb-client, mariadb-test per-file comments: debian/dist/Debian/control MDEV-4266 Server upgrade via apt-get install does not work. dependencies on the current version added. debian/dist/Ubuntu/control MDEV-4266 Server upgrade via apt-get install does not work. dependencies on the current version added.
| * | | | | MDEV-4521 MBRContains, MBRWithin no longer work with geometries of different ↵Alexey Botchkov2013-05-153-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | type. get_mm_leaf function can store all sorts of spatial features in one type of field it receives from an Item_field. So we just allow that by setting the type of this field to GEOMETRY. per-file comments: mysql-test/r/gis-rtree.result result updated mysql-test/t/gis-rtree.test test case added. sql/opt_range.cc set geom_type=GEOMETRY if we got Field_geom.
| * | | | | When one does 'REPAIR TABLE', update uuid() to the current systemMichael Widenius2013-05-146-7/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/maria/maria-autozerofill.result: Updated result mysql-test/suite/maria/maria-autozerofill.test: Added test that zerofilled table should not give any warnings when table is used mysql-test/suite/maria/maria-recovery2.result: More tests to make it easier to find bugs mysql-test/suite/maria/maria-recovery2.test: More tests to make it easier to find bugs storage/maria/ha_maria.cc: Set create_trid after repair (needed if table was moved from another system) Set uuid after repair (needed if table was moved from another system) storage/maria/maria_chk.c: Reset share->state.create_trid if we reset share->state.create_rename_lsn. Make the table moveable
| * | | | | Fix test failure in plugins.unix_socket when running tests as user root.unknown2013-05-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (The problem is that if $USER is root, then the authentication will log in with the mysqld user root. And then CURRENT_USER() returns a valid user, giving .result file difference).
| * | | | | MDEV-4514 After increasing user name length mysql.db is reported broken and ↵Sergei Golubchik2013-05-133-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | event scheduler does not start
| * | | | | MDEV-4505 Buffer overrun when processing --log-bin parameter without file nameSergei Golubchik2013-05-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because --log-bin sets opt_bin_logname to "" (same for any OPT_ARG GET_STR (or GET_STR_ALLOC) option)
| * | | | | MDEV-4199 Installing postfix on CentOS 5.9 requires MariaDB-serverSergei Golubchik2013-05-131-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to match distribution packages better: remove "mysql" from server.rpm Provides, add it to the shared.rpm Provides. fake provides that "mysql" and "mysql-libs" packages would've had. cleanup: remove auto-generated provides from the manual provides list.
| * | | | | fix test casesSergei Golubchik2013-05-134-7/+7
| | | | | |
| * | | | | Fixed MDEV-4291: Assertion `trid >= info->s->state.create_trid' failure or ↵Michael Widenius2013-05-138-238/+291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | MDEV-3999: Valgrind errors 'invalid write' or assorted server crashes on ↵Michael Widenius2013-05-126-28/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | concurrent flow with partitioned Aria tables MDEV-3989: Server crashes on import from MariaDB mysqldump export with partitioned Aria table. Problem was that bulk insert in aria was not properly protected against concurrent selects. storage/maria/ha_maria.cc: Move settings of file->state to _ma_block_start_trans() to ensure that lock_key_trees is not changed by a concurrent bulk_insert. storage/maria/ma_check.c: Added DBUG_ASSERT() storage/maria/ma_open.c: Set start_trans to ma_start_trans for default behaviour. storage/maria/ma_pagecrc.c: Removed test for 'non_transactional' as a now_transactinal could be reset while a flush was happening. storage/maria/ma_state.c: Moved setting of info->state from external_lock to start_trans to protect against concurrent running bulk inserts. This works as the other threads will wait in thr_lock() until bulk_insert is done and keys are re-generated. storage/maria/ma_state.h: Added _ma_start_trans()
| * | | | | Fixed that SHOW PROCESSLIST and information_schema.processlist uses the ↵Michael Widenius2013-05-118-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | right length for user names. Fixed some failing tests mysql-test/mysql-test-run.pl: Removed warning from mysql-test-run mysql-test/r/create.result: Updated result mysql-test/r/log_slow.result: Fixed failing test mysql-test/suite/funcs_1/r/is_columns_is.result: Updated result mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result: Updated result mysql-test/suite/funcs_1/r/processlist_val_no_prot.result: Updated result mysql-test/t/log_slow.test: Ensure variables are properly reset at end of test sql/sql_show.cc: Fixed max length for user names