diff options
author | unknown <monty@narttu.mysql.fi> | 2003-09-24 10:24:55 +0300 |
---|---|---|
committer | unknown <monty@narttu.mysql.fi> | 2003-09-24 10:24:55 +0300 |
commit | 4e09f14b18ededb18aab527abe582fca34afe79c (patch) | |
tree | 7a953ea10b82122bdf37cf7efc4cfd3fd9a20b17 /strings/xml.c | |
parent | 48869febe61d1aef3e05af6bd17bab3e27b90f6d (diff) | |
parent | 07001f78eca148d143ebf7fea66f4296a19a6d51 (diff) | |
download | mariadb-git-4e09f14b18ededb18aab527abe582fca34afe79c.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'strings/xml.c')
-rw-r--r-- | strings/xml.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/xml.c b/strings/xml.c index 793c155ea63..7d7839e1603 100644 --- a/strings/xml.c +++ b/strings/xml.c @@ -255,7 +255,7 @@ int my_xml_parse(MY_XML_PARSER *p,const char *str, uint len) if(MY_XML_EQ==(lex=my_xml_scan(p,&b))) { lex=my_xml_scan(p,&b); - if ( (lex==MY_XML_IDENT) || (lex=MY_XML_STRING) ) + if ( (lex==MY_XML_IDENT) || (lex==MY_XML_STRING) ) { if((MY_XML_OK!=my_xml_enter(p,a.beg,a.end-a.beg)) || (MY_XML_OK!=my_xml_value(p,b.beg,b.end-b.beg)) || |