mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Fix merges.
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