Commit 73e4c474 authored by unknown's avatar unknown
Browse files

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/usr/home/bar/mysql-5.1-new.b16316
parents 7464c9f3 c76459ac

mysql-test/r/xml.result

+12 −0
Original line number Diff line number Diff line
@@ -561,3 +561,15 @@ A B C 
select extractvalue('<A_B>A</A_B>','/A_B');

extractvalue('<A_B>A</A_B>','/A_B')

A

select extractvalue('<a>Jack</a>','/a[contains(../a,"J")]');

extractvalue('<a>Jack</a>','/a[contains(../a,"J")]')

Jack

select extractvalue('<a>Jack</a>','/a[contains(../a,"j")]');

extractvalue('<a>Jack</a>','/a[contains(../a,"j")]')

Jack

select extractvalue('<a>Jack</a>','/a[contains(../a,"j")]' collate latin1_bin);

extractvalue('<a>Jack</a>','/a[contains(../a,"j")]' collate latin1_bin)



select extractvalue('<a>Jack</a>' collate latin1_bin,'/a[contains(../a,"j")]');

extractvalue('<a>Jack</a>' collate latin1_bin,'/a[contains(../a,"j")]')

mysql-test/t/xml.test

+8 −0
Original line number Diff line number Diff line
@@ -254,3 +254,11 @@ select extractvalue('<a>A<b>B<c>C</c></b></a>','/a/descendant-or-self::*'); 
# Bug #16320 XML: extractvalue() won't accept names containing underscores

#

select extractvalue('<A_B>A</A_B>','/A_B');



#

# Bug#16316: XML: extractvalue() is case-sensitive with contains()

#

select extractvalue('<a>Jack</a>','/a[contains(../a,"J")]');

select extractvalue('<a>Jack</a>','/a[contains(../a,"j")]');

select extractvalue('<a>Jack</a>','/a[contains(../a,"j")]' collate latin1_bin);

select extractvalue('<a>Jack</a>' collate latin1_bin,'/a[contains(../a,"j")]');

sql/item_xmlfunc.cc

+6 −1
Original line number Diff line number Diff line
@@ -206,7 +206,11 @@ class Item_nodeset_func :public Item_str_func 
    return str;

  }

  enum Item_result result_type () const { return STRING_RESULT; }

  void fix_length_and_dec() { max_length=  MAX_BLOB_WIDTH; }

  void fix_length_and_dec()

  {

    max_length= MAX_BLOB_WIDTH;

    collation.collation= pxml->charset();

  }

  const char *func_name() const { return "nodeset"; }

};
@@ -2373,6 +2377,7 @@ void Item_xml_str_func::fix_length_and_dec() 
  xpath.cs= collation.collation;

  xpath.debug= 0;

  xpath.pxml= &pxml;

  pxml.set_charset(collation.collation);



  rc= my_xpath_parse(&xpath, xp->ptr(), xp->ptr() + xp->length());