mirror of
https://github.com/MariaDB/server.git
synced 2025-08-29 00:08:14 +03:00
Fix merges.
mysql-test/r/func_misc.result: case change in SHOW CREATE keywords. mysql-test/r/mysql.result: Revert clobber of charset special chars. mysql-test/t/mysql.test: Revert clobber of charset special chars.
This commit is contained in:
@@ -61,16 +61,16 @@ database()
|
||||
test
|
||||
unlock tables;
|
||||
drop table t1;
|
||||
\
|
||||
\
|
||||
<EFBFBD>\
|
||||
<EFBFBD>\
|
||||
c_cp932
|
||||
\
|
||||
\
|
||||
\
|
||||
<EFBFBD>\
|
||||
<EFBFBD>\
|
||||
<EFBFBD>\
|
||||
ソ
|
||||
ソ
|
||||
\
|
||||
\
|
||||
<EFBFBD>\
|
||||
<EFBFBD>\
|
||||
+----------------------+------------+--------+
|
||||
| concat('>',col1,'<') | col2 | col3 |
|
||||
+----------------------+------------+--------+
|
||||
|
Reference in New Issue
Block a user