summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorBrandon Nesterenko <brandon.nesterenko@mariadb.com>2021-05-12 11:46:58 -0600
committerBrandon Nesterenko <brandon.nesterenko@mariadb.com>2021-05-13 11:07:21 -0600
commitd4ba8ce6bce4a81197be85497cfafe5952ad45de (patch)
tree7edd3495ba0eda6ccef99522c18919cda5a18ef9 /sql
parent4d53a7585c532c2cfcea184259e3153f95b35683 (diff)
downloadmariadb-git-10.5-MDEV-25222.tar.gz
MDEV-25222: mysqlbinlog --base64-output wrong option default drops BINLOG from output10.5-MDEV-25222
Problem: ======= The ALWAYS option of the mariadb-binlog --base64-output formats its output incorrectly. This option is deprecated, and MySQL 8.0 has removed it entirely. Solution: ======== Adhere to MySQL and remove this option from MariaDB. Behavioral Changes: ================== Use Case: ./mariadb-binlog --base64-output Previous Behavior: Sets base64-output mode to always New Behavior: Error message indicating incomplete argument Use Case: ./mariadb-binlog --base64-output=always Previous Behavior: Sets base64-output mode to always New Behavior: Error message indicating invalid argument value
Diffstat (limited to 'sql')
-rw-r--r--sql/log_event.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/log_event.h b/sql/log_event.h
index 3e08653a211..6a224b7b6a1 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -822,9 +822,8 @@ bool copy_event_cache_to_file_and_reinit(IO_CACHE *cache, FILE *file);
enum enum_base64_output_mode {
BASE64_OUTPUT_NEVER= 0,
BASE64_OUTPUT_AUTO= 1,
- BASE64_OUTPUT_ALWAYS= 2,
- BASE64_OUTPUT_UNSPEC= 3,
- BASE64_OUTPUT_DECODE_ROWS= 4,
+ BASE64_OUTPUT_UNSPEC= 2,
+ BASE64_OUTPUT_DECODE_ROWS= 3,
/* insert new output modes here */
BASE64_OUTPUT_MODE_COUNT
};