Manual merge.

This commit is contained in:
Alexey Kopytov 2009-05-08 21:24:15 +04:00
commit 5390ad33f9
3 changed files with 16 additions and 2 deletions

View file

@ -471,4 +471,7 @@ IS NOT NULL
1
*** Unsigned server_id 4294967295 is found: 1 ***
SET @@global.server_id= 1;
RESET MASTER;
FLUSH LOGS;
End of 5.0 tests
End of 5.1 tests