diff --git a/mysql-test/r/xml.result b/mysql-test/r/xml.result
index 5ff210106dd..21e8f804192 100644
--- a/mysql-test/r/xml.result
+++ b/mysql-test/r/xml.result
@@ -640,32 +640,32 @@ select extractValue('a','/a');
extractValue('a','/a')
NULL
Warnings:
-Warning 1504 Incorrect XML value: 'parse error at line 1 pos 5: unexpected END-OF-INPUT'
+Warning 1512 Incorrect XML value: 'parse error at line 1 pos 5: unexpected END-OF-INPUT'
select extractValue('a<','/a');
extractValue('a<','/a')
NULL
Warnings:
-Warning 1504 Incorrect XML value: 'parse error at line 1 pos 6: END-OF-INPUT unexpected (ident or '/' wanted)'
+Warning 1512 Incorrect XML value: 'parse error at line 1 pos 6: END-OF-INPUT unexpected (ident or '/' wanted)'
select extractValue('a','/a');
extractValue('a','/a')
NULL
Warnings:
-Warning 1504 Incorrect XML value: 'parse error at line 1 pos 7: END-OF-INPUT unexpected (ident wanted)'
+Warning 1512 Incorrect XML value: 'parse error at line 1 pos 7: END-OF-INPUT unexpected (ident wanted)'
select extractValue('aa' wanted)'
+Warning 1512 Incorrect XML value: 'parse error at line 1 pos 8: END-OF-INPUT unexpected ('>' wanted)'
select extractValue('a','/a');
extractValue('a','/a')
NULL
Warnings:
-Warning 1504 Incorrect XML value: 'parse error at line 1 pos 12: '' unexpected (END-OF-INPUT wanted)'
+Warning 1512 Incorrect XML value: 'parse error at line 1 pos 12: '' unexpected (END-OF-INPUT wanted)'
select extractValue('a','/a');
extractValue('a','/a')
NULL
Warnings:
-Warning 1504 Incorrect XML value: 'parse error at line 1 pos 7: '>' unexpected (ident or string wanted)'
+Warning 1512 Incorrect XML value: 'parse error at line 1 pos 7: '>' unexpected (ident or string wanted)'
select extractValue('1','position()');
ERROR HY000: XPATH syntax error: ''
select extractValue('1','last()');