1
0
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:
unknown
2006-11-29 12:49:21 -05:00
parent b88f4ecf51
commit 724e06e733
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 |
+----------------------+------------+--------+