database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

Browse Source 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


Makefile.am:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
This commit is contained in:
unknown
2007-04-23 13:28:09 +02:00
parent 361649b906 09e6e6618f
commit 6e5abcaf03
7 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,6 +176,4 @@ ERROR at line 1: DELIMITER cannot contain a backslash character
ERROR at line 1: DELIMITER cannot contain a backslash character
1
1
1
1
End of 5.0 tests