From b4a0b2c2f862ab0de853dc34e1e56f6159043e45 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sat, 2 Jul 2011 22:12:12 +0200 Subject: post-merge fixes. most tests pass. 5.3 merge is next --- mysql-test/r/sp_notembedded.result | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysql-test/r/sp_notembedded.result') diff --git a/mysql-test/r/sp_notembedded.result b/mysql-test/r/sp_notembedded.result index 58744a3be2d..c4f276774d5 100644 --- a/mysql-test/r/sp_notembedded.result +++ b/mysql-test/r/sp_notembedded.result @@ -198,7 +198,7 @@ VALUES('%', 'mysqltest_1', password(''), 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'N', 'N', 'N', 'N', 'N', 'Y', 'Y', 'N', 'N', 'Y', 'Y', 'N', 'N', 'N', 'N', 'N', 'Y', 'Y', 'N', '', '', '', '', '0', '0', '0', '0'); Warnings: -Warning 1364 Field 'auth_string' doesn't have a default value +Warning 1364 Field 'authentication_string' doesn't have a default value FLUSH PRIVILEGES; CREATE PROCEDURE p1(i INT) BEGIN END; DROP PROCEDURE p1; -- cgit v1.2.1