1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Fix merges.

This commit is contained in:
cmiller@zippy.cornsilk.net
2006-11-29 12:49:21 -05:00
parent 80f695e3e6
commit d577e3d4a8
3 changed files with 12 additions and 12 deletions

View File

@ -61,16 +61,16 @@ database()
test
unlock tables;
drop table t1;
ƒ\
ƒ\
<EFBFBD>\
<EFBFBD>\
c_cp932
ƒ\
ƒ\
ƒ\
<EFBFBD>\
<EFBFBD>\
<EFBFBD>\
ƒ\
ƒ\
<EFBFBD>\
<EFBFBD>\
+----------------------+------------+--------+
| concat('>',col1,'<') | col2 | col3 |
+----------------------+------------+--------+