1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Update version number and date

Browse Source 
- Replace test on args[i]->type() by args[i]->field_type() in ha_connect::CheckCond.
  This to take care of cached items generated by executing a query in a procedure.

modified:
  storage/connect/ha_connect.cc
  storage/connect/mysql-test/connect/r/xml.result
This commit is contained in:
Olivier Bertrand 2013-10-29 16:21:57 +01:00
parent 3a424fc119
commit 671e5cbb7f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/connect/ha_connect.cc
View File

@ -165,7 +165,7 @@ extern "C" char nmfile[];
extern "C" char pdebug[]; extern "C" char pdebug[];
extern "C" { extern "C" {
char version[]= "Version 1.01.0008 August 18, 2013"; char version[]= "Version 1.01.0009 October 29, 2013";
#if defined(XMSG) #if defined(XMSG)
char msglang[]; // Default message language char msglang[]; // Default message language
@ -1702,7 +1702,7 @@ PFIL ha_connect::CheckCond(PGLOBAL g, PFIL filp, AMT tty, Item *cond)
return NULL; return NULL;
// Append the value to the filter // Append the value to the filter
if (args[i]->type() == COND::STRING_ITEM) if (args[i]->field_type() == MYSQL_TYPE_VARCHAR)
strcat(strcat(strcat(filp, "'"), res->ptr()), "'"); strcat(strcat(strcat(filp, "'"), res->ptr()), "'");
else else
strncat(filp, res->ptr(), res->length()); strncat(filp, res->ptr(), res->length());

2
storage/connect/mysql-test/connect/r/xml.result
View File

@ -413,7 +413,7 @@ DROP TABLE t1;
SET @a=LOAD_FILE('MYSQLD_DATADIR/test/t1.xml'); SET @a=LOAD_FILE('MYSQLD_DATADIR/test/t1.xml');
SELECT CAST(@a AS CHAR CHARACTER SET latin1); SELECT CAST(@a AS CHAR CHARACTER SET latin1);
CAST(@a AS CHAR CHARACTER SET latin1) <?xml version="1.0" encoding="iso-8859-1"?> CAST(@a AS CHAR CHARACTER SET latin1) <?xml version="1.0" encoding="iso-8859-1"?>
<!-- Created by CONNECT Version 1.01.0008 August 18, 2013 --> <!-- Created by CONNECT Version 1.01.0009 October 29, 2013 -->
<t1> <t1>
<line> <line>
<node>ÀÁÂÃ</node> <node>ÀÁÂÃ</node>