database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.6 into 10.8

Browse Source
This commit is contained in:
Marko Mäkelä
2023-03-29 15:16:42 +03:00
parent e4b83f0feb 0760ad3336
commit dd2fe81122
113 changed files with 3104 additions and 3031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/engines/funcs/r/rpl_sp.result
View File

@@ -775,7 +775,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq
SET @@session.sql_mode=0/*!*/;
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
/*!\C latin1 *//*!*/;
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
SET @@session.lc_time_names=0/*!*/;
SET @@session.collation_database=DEFAULT/*!*/;
drop database if exists mysqltest1