diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
| commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
| tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /mysql-test/r/xml.result | |
| parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
| parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
| download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz | |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'mysql-test/r/xml.result')
| -rw-r--r-- | mysql-test/r/xml.result | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/xml.result b/mysql-test/r/xml.result index 8ca9ab84bf7..447f2d4e460 100644 --- a/mysql-test/r/xml.result +++ b/mysql-test/r/xml.result @@ -948,20 +948,20 @@ SELECT ExtractValue('<a><b>b1</b><b>b2</b></a>','/a/b["1 and string"]'); ExtractValue('<a><b>b1</b><b>b2</b></a>','/a/b["1 and string"]') b1 Warnings: -Warning 1292 Truncated incorrect INTEGER value: '1 and string"]' -Warning 1292 Truncated incorrect INTEGER value: '1 and string"]' +Warning 1292 Truncated incorrect INTEGER value: '1 and string' +Warning 1292 Truncated incorrect INTEGER value: '1 and string' SELECT ExtractValue('<a><b>b1</b><b>b2</b></a>','/a/b["string and 1"]'); ExtractValue('<a><b>b1</b><b>b2</b></a>','/a/b["string and 1"]') Warnings: -Warning 1292 Truncated incorrect INTEGER value: 'string and 1"]' -Warning 1292 Truncated incorrect INTEGER value: 'string and 1"]' +Warning 1292 Truncated incorrect INTEGER value: 'string and 1' +Warning 1292 Truncated incorrect INTEGER value: 'string and 1' SELECT ExtractValue('<a><b>b1</b><b>b2</b></a>','/a/b["string"]'); ExtractValue('<a><b>b1</b><b>b2</b></a>','/a/b["string"]') Warnings: -Warning 1292 Truncated incorrect INTEGER value: 'string"]' -Warning 1292 Truncated incorrect INTEGER value: 'string"]' +Warning 1292 Truncated incorrect INTEGER value: 'string' +Warning 1292 Truncated incorrect INTEGER value: 'string' String-to-number conversion from a user variable SET @i='1'; SELECT ExtractValue('<a><b>b1</b><b>b2</b></a>','/a/b[$@i]'); |