database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2020-09-03 15:53:38 +03:00
parent b795adcff7 33ae1616e0
commit c9cf6b13f6
78 changed files with 1535 additions and 1150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/binlog_encryption/binlog_row_annotate.result
View File

@ -456,7 +456,6 @@ START TRANSACTION
### DELETE FROM `test1`.`t1`
### WHERE
### @1=3 /* INT meta=0 nullable=1 is_null=0 */
'/*!*/;
# at #
#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
SET TIMESTAMP=1000000000/*!*/;