summaryrefslogtreecommitdiff
path: root/client
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-21786 mysqldump will forget sequence definition details on --no-data dumpAnel Husakovic2020-10-231-3/+74
| | | | | | | | | | | | | | | | | - Original patch was contributed by Jani Tolonen <jani.k.tolonen@gmail.com> https://github.com/an3l/server/commits/bb-10.3-anel-MDEV-21786-dump-sequence which distinguishes data structure (linked list) of sequences from tables. - Added standard sql output to prevent future changes of sequences and disabled locks for sequences. - Added test case for `MDEV-20070: mysqldump won't work correct on sequences` where table column depends on sequence value. - Restore sequence last value in the following way: - Find `next_not_cached_value` and use it to `setval()` - We just need for logical restore, so don't execute `setval()` - `setval()` should be showed also in case of `--no-data` option. Reviewed-by: daniel@mariadb.org
* Merge branch '10.2' into 10.3Sujatha2020-09-281-1/+1
|\
| * Merge branch '10.1' into 10.2Sujatha2020-09-281-1/+1
| |\
| | * Reverted wrong patch for mysql_upgradebb-10.1-danielblack-mysqlupgrade-revertMonty2020-09-261-1/+1
| | | | | | | | | | | | | | | The original code was correct. mysql_upgrade calls the mysql client to talk with MariaDB. It doesn't call itself!
* | | Merge 10.2 into 10.3Marko Mäkelä2020-09-221-1/+1
|\ \ \ | |/ /
| * | Merge 10.1 into 10.2Marko Mäkelä2020-09-221-1/+1
| |\ \ | | |/
| | * mysql_upgrade: fix error textDaniel Black2020-09-121-1/+1
| | |
| | * MDEV-16372 ER_BASE64_DECODE_ERROR upon replaying binary log via mysqlbinlog ↵Andrei Elkin2020-08-311-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --verbose (This commit is exclusively for 10.1 branch, do not merge it to upper ones) In case of a pattern of non-STMT_END-marked Rows-log-event (A) followed by a STMT_END marked one (B) mysqlbinlog mixes up the base64 encoded rows events with their pseudo sql representation produced by the verbose option: BINLOG ' base64 encoded data for A ### verbose section for A base64 encoded data for B ### verbose section for B '/*!*/; In effect the produced BINLOG '...' query is not valid and is rejected with the error. Examples of this way malformed BINLOG could have been found in binlog_row_annotate.result that gets corrected with the patch. The issue is fixed with introduction an auxiliary IO_CACHE to hold on the verbose comments until the terminal STMT_END event is found. The new cache is emptied out after two pre-existing ones are done at that time. The correctly produced output now for the above case is as the following: BINLOG ' base64 encoded data for A base64 encoded data for B '/*!*/; ### verbose section for A ### verbose section for B Thanks to Alexey Midenkov for the problem recognition and attempt to tackle, Venkatesh Duggirala who produced a patch for the upstream whose idea is exploited here, as well as to MDEV-23077 reporter LukeXwang who also contributed a piece of a patch aiming at this issue. Extra: mysqlbinlog_row_minimal refined to not produce mutable numeric values into the result file.
| * | MDEV-16372 ER_BASE64_DECODE_ERROR upon replaying binary log via mysqlbinlog ↵Andrei Elkin2020-08-311-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --verbose (This commit is exclusively for 10.2 branch. Do not merge it to 10.3) In case of a pattern of non-STMT_END-marked Rows-log-event (A) followed by a STMT_END marked one (B) mysqlbinlog mixes up the base64 encoded rows events with their pseudo sql representation produced by the verbose option: BINLOG ' base64 encoded data for A ### verbose section for A base64 encoded data for B ### verbose section for B '/*!*/; In effect the produced BINLOG '...' query is not valid and is rejected with the error. Examples of this way malformed BINLOG could have been found in binlog_row_annotate.result that gets corrected with the patch. The issue is fixed with introduction an auxiliary IO_CACHE to hold on the verbose comments until the terminal STMT_END event is found. The new cache is emptied out after two pre-existing ones are done at that time. The correctly produced output now for the above case is as the following: BINLOG ' base64 encoded data for A base64 encoded data for B '/*!*/; ### verbose section for A ### verbose section for B Thanks to Alexey Midenkov for the problem recognition and attempt to tackle, and to Venkatesh Duggirala who produced a patch for the upstream whose idea is exploited here, as well as to MDEV-23077 reporter LukeXwang who also contributed a piece of a patch aiming at this issue.
* | | MDEV-16372 ER_BASE64_DECODE_ERROR upon replaying binary log via mysqlbinlog ↵Andrei Elkin2020-08-311-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --verbose (This commit is for 10.3 and upper branches) In case of a pattern of non-STMT_END-marked Rows-log-event (A) followed by a STMT_END marked one (B) mysqlbinlog mixes up the base64 encoded rows events with their pseudo sql representation produced by the verbose option: BINLOG ' base64 encoded data for A ### verbose section for A base64 encoded data for B ### verbose section for B '/*!*/; In effect the produced BINLOG '...' query is not valid and is rejected with the error. Examples of this way malformed BINLOG could have been found in binlog_row_annotate.result that gets corrected with the patch. The issue is fixed with introduction an auxiliary IO_CACHE to hold on the verbose comments until the terminal STMT_END event is found. The new cache is emptied out after two pre-existing ones are done at that time. The correctly produced output now for the above case is as the following: BINLOG ' base64 encoded data for A base64 encoded data for B '/*!*/; ### verbose section for A ### verbose section for B Thanks to Alexey Midenkov for the problem recognition and attempt to tackle, and to Venkatesh Duggirala who produced a patch for the upstream whose idea is exploited here, as well as to MDEV-23077 reporter LukeXwang who also contributed a piece of a patch aiming at this issue.
* | | Merge 10.2 into 10.3Marko Mäkelä2020-08-211-2/+4
|\ \ \ | |/ /
| * | MDEV-23511 shutdown_server 10 times out, causing server kill at shutdownAndrei Elkin2020-08-211-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shutdown of mtr tests may be too impatient, esp on CI environment where 10 seconds of `arg` of `shutdown_server arg` may not be enough for the clean shutdown to complete. This is fixed to remove explicit non-zero timeout argument to `shutdown_server` from all mtr tests. mysqltest computes 60 seconds default value for the timeout for the argless `shutdown_server` command. This policy is additionally ensured with a compile time assert.
* | | Merge 10.2 into 10.3Marko Mäkelä2020-08-201-4/+0
|\ \ \ | |/ /
| * | Merge 10.1 into 10.2Marko Mäkelä2020-08-201-4/+0
| |\ \ | | |/
* | | Fixed bugs found by valgrindMonty2020-07-021-4/+7
| | | | | | | | | | | | | | | | | | | | | - Some of the bug fixes are backports from 10.5! - The fix in innobase/fil/fil0fil.cc is just a backport to get less error messages in mysqld.1.err when running with valgrind. - Renamed HAVE_valgrind_or_MSAN to HAVE_valgrind
* | | Merge 10.2 into 10.3Marko Mäkelä2020-06-137-28/+28
|\ \ \ | |/ /
| * | Merge branch '10.1' into 10.2Vicențiu Ciorbaru2020-06-117-30/+30
| |\ \ | | |/
| | * Client spelling mistakesIan Gilfillan2020-06-087-32/+32
| | |
* | | Merge 10.2 into 10.3Marko Mäkelä2020-05-151-4/+5
|\ \ \ | |/ /
| * | Fix GCC -WnonnullMarko Mäkelä2020-05-141-4/+5
| | |
* | | Use history.h include file if readline is usedMonty2020-05-151-16/+3
| | | | | | | | | | | | | | | This allows us to remove our own declarations of functions and structures that are declared in the history.h file.
* | | Merge 10.2 into 10.3Marko Mäkelä2020-05-131-1/+1
|\ \ \ | |/ /
| * | MDEV-22483 mysql_upgrade does not use current user as default for connecting ↵Sergei Golubchik2020-05-081-1/+1
| | | | | | | | | | | | | | | | | | to server correct the help text
* | | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-05-041-1/+1
|\ \ \ | |/ /
| * | Merge branch '10.1' into 10.2Oleksandr Byelkin2020-05-021-1/+1
| |\ \ | | |/
| | * Merge branch '5.5' into 10.1Oleksandr Byelkin2020-04-301-1/+1
| | |\
| | | * Correct the name of a contributorMarko Mäkelä2020-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | The name was correctly encoded in UTF-8 before commit 0ce12f70ed2eee1b92e2af27e7dda30db544f492.
* | | | Merge 10.2 into 10.3Marko Mäkelä2020-04-221-1/+1
|\ \ \ \ | |/ / /
| * | | Fixed compiler warning in mysqltest.ccMonty2020-04-181-1/+1
| | | |
* | | | Merge 10.2 into 10.3Marko Mäkelä2020-04-154-97/+60
|\ \ \ \ | |/ / /
| * | | MDEV-20604: Duplicate key value is silently truncated to 64 characters in ↵Oleksandr Byelkin2020-04-012-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | print_keydup_error Added indication of truncated string for "s" and "M" formats
| * | | MDEV-22035 Memory leak in main.mysqltestMarko Mäkelä2020-04-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test main.mysqltest could crash or hang with cmake -DWITH_ASAN=ON builds. The reason appears to be a memory leak, which was found out by manually invoking echo --replace_regex a > file ASAN_OPTIONS=log_path=/dev/shm/asan mysqltest ... < file and then examining the /dev/shm/asan.* file.
| * | | Merge 10.1 into 10.2Marko Mäkelä2020-04-013-74/+37
| |\ \ \ | | |/ /
| | * | MDEV-22037: Add ability to skip content of some tables (work around for ↵Oleksandr Byelkin2020-03-252-6/+37
| | | | | | | | | | | | | | | | | | | | | | | | MDEV-20939) --ignore-table-data parameter added.
| | * | remove redundant info on rpl test failureSergei Golubchik2020-03-231-68/+0
| | | | | | | | | | | | | | | | | | | | | | | | these three SHOW statements (and more) are issued from include/analyze-sync_with_master.test too. no need to do it twice.
* | | | Merge 10.2 into 10.3Marko Mäkelä2020-03-132-8/+67
|\ \ \ \ | |/ / /
| * | | MDEV-10047: table-based master info repositorySujatha2020-03-131-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: ======= When we upgrade from "mysql" to "mariadb" if slave is using repositories as tables their data is completely ignored and no warning is issued in error log. Fix: === "mysql_upgrade" test should check for the presence of data in "mysql.slave_master_info" and "mysql.slave_relay_log_info" tables. When tables have some data the upgrade script should report a warning which hints users that the data in repository tables will be ignored.
| * | | Merge 10.1 into 10.2Marko Mäkelä2020-03-131-7/+7
| |\ \ \ | | |/ /
| | * | Merge 5.5 into 10.1Marko Mäkelä2020-03-131-7/+7
| | |\ \ | | | |/
| | | * Cleanup: clang-10 -Wmisleading-indentationMarko Mäkelä2020-03-111-7/+7
| | | | | | | | | | | | | | | | | | | | Also, remove some trailing white space and add missing static qualifier to free_annotate_event().
* | | | Merge branch '10.2' into 10.3Oleksandr Byelkin2019-12-041-3/+3
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-12-031-3/+3
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.1Oleksandr Byelkin2019-12-031-3/+3
| | |\ \ | | | |/
| | | * Fixed some typos in mysql.ccHashir Sarwar2019-11-221-3/+3
| | | | | | | | | | | | | | | | Closes #1403
| | * | Merge branch '5.5' into 10.1Oleksandr Byelkin2019-10-301-11/+2
| | |\ \ | | | |/
| | | * Revert "MDEV-14448: Ctrl-C should not exit the client"mariadb-5.5.66Sergei Golubchik2019-10-301-13/+2
| | | | | | | | | | | | | | | | This reverts commit 396313d301b3567aeadd04ae6a9322da2adc0a8b.
| | | * compilation fix for Windowsbb-5.5-releaseSergei Golubchik2019-10-301-0/+2
| | | |
| | * | Merge 5.5 into 10.1Eugene Kosov2019-10-291-2/+11
| | |\ \ | | | |/
| | | * MDEV-14448: Ctrl-C should not exit the clientAnel Husakovic2019-10-281-2/+11
| | | |
* | | | Lintian complains on spelling errorFaustin Lammler2019-12-021-2/+2
| | | | | | | | | | | | | | | | | | | | The lintian check complains on spelling error: https://salsa.debian.org/mariadb-team/mariadb-10.3/-/jobs/95739
View Lorry Controller Status