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

Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0

Browse Source 
into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/5.1-merge


client/mysql.cc:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_class.h:
  conflicting hunk is for log.h
This commit is contained in:
unknown
2007-10-04 12:27:14 +03:00
parent 345716937c d0b076b66c
commit 7258005cd4
5 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/mysql.result
View File

@@ -178,5 +178,7 @@ ERROR at line 1: DELIMITER cannot contain a backslash character
1
1
1
This is a file starting with UTF8 BOM 0xEFBBBF
This is a file starting with UTF8 BOM 0xEFBBBF
End of 5.0 tests
WARNING: --server-arg option not supported in this configuration.