Commit 88b5cf40 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/bar/mysql-5.1.b22823 

into  mysql.com:/usr/home/bar/mysql-5.1-rpl
parents fcb7576f 7595cb06

mysql-test/r/xml.result

+73 −0
Original line number Diff line number Diff line
@@ -736,3 +736,76 @@ test 
select extractValue('<x.-_:>test</x.-_:>','//*');

extractValue('<x.-_:>test</x.-_:>','//*')

test

set @xml= "<entry><id>pt10</id><pt>10</pt></entry><entry><id>pt50</id><pt>50</pt></entry>";

select ExtractValue(@xml, "/entry[(pt=10)]/id");

ExtractValue(@xml, "/entry[(pt=10)]/id")

pt10

select ExtractValue(@xml, "/entry[(pt!=10)]/id");

ExtractValue(@xml, "/entry[(pt!=10)]/id")

pt50

select ExtractValue(@xml, "/entry[(pt<10)]/id");

ExtractValue(@xml, "/entry[(pt<10)]/id")



select ExtractValue(@xml, "/entry[(pt<=10)]/id");

ExtractValue(@xml, "/entry[(pt<=10)]/id")

pt10

select ExtractValue(@xml, "/entry[(pt>10)]/id");

ExtractValue(@xml, "/entry[(pt>10)]/id")

pt50

select ExtractValue(@xml, "/entry[(pt>=10)]/id");

ExtractValue(@xml, "/entry[(pt>=10)]/id")

pt10 pt50

select ExtractValue(@xml, "/entry[(pt=50)]/id");

ExtractValue(@xml, "/entry[(pt=50)]/id")

pt50

select ExtractValue(@xml, "/entry[(pt!=50)]/id");

ExtractValue(@xml, "/entry[(pt!=50)]/id")

pt10

select ExtractValue(@xml, "/entry[(pt<50)]/id");

ExtractValue(@xml, "/entry[(pt<50)]/id")

pt10

select ExtractValue(@xml, "/entry[(pt<=50)]/id");

ExtractValue(@xml, "/entry[(pt<=50)]/id")

pt10 pt50

select ExtractValue(@xml, "/entry[(pt>50)]/id");

ExtractValue(@xml, "/entry[(pt>50)]/id")



select ExtractValue(@xml, "/entry[(pt>=50)]/id");

ExtractValue(@xml, "/entry[(pt>=50)]/id")

pt50

select ExtractValue(@xml, "/entry[(10=pt)]/id");

ExtractValue(@xml, "/entry[(10=pt)]/id")

pt10

select ExtractValue(@xml, "/entry[(10!=pt)]/id");

ExtractValue(@xml, "/entry[(10!=pt)]/id")

pt50

select ExtractValue(@xml, "/entry[(10>pt)]/id");

ExtractValue(@xml, "/entry[(10>pt)]/id")



select ExtractValue(@xml, "/entry[(10>=pt)]/id");

ExtractValue(@xml, "/entry[(10>=pt)]/id")

pt10

select ExtractValue(@xml, "/entry[(10<pt)]/id");

ExtractValue(@xml, "/entry[(10<pt)]/id")

pt50

select ExtractValue(@xml, "/entry[(10<=pt)]/id");

ExtractValue(@xml, "/entry[(10<=pt)]/id")

pt10 pt50

select ExtractValue(@xml, "/entry[(50=pt)]/id");

ExtractValue(@xml, "/entry[(50=pt)]/id")

pt50

select ExtractValue(@xml, "/entry[(50!=pt)]/id");

ExtractValue(@xml, "/entry[(50!=pt)]/id")

pt10

select ExtractValue(@xml, "/entry[(50>pt)]/id");

ExtractValue(@xml, "/entry[(50>pt)]/id")

pt10

select ExtractValue(@xml, "/entry[(50>=pt)]/id");

ExtractValue(@xml, "/entry[(50>=pt)]/id")

pt10 pt50

select ExtractValue(@xml, "/entry[(50<pt)]/id");

ExtractValue(@xml, "/entry[(50<pt)]/id")



select ExtractValue(@xml, "/entry[(50<=pt)]/id");

ExtractValue(@xml, "/entry[(50<=pt)]/id")

pt50

mysql-test/t/xml.test

+30 −0
Original line number Diff line number Diff line
@@ -376,3 +376,33 @@ select extractValue('<:>test</:>','//*'); 
select extractValue('<_>test</_>','//*');

# dot, dash, underscore and semicolon are good identifier middle characters

select extractValue('<x.-_:>test</x.-_:>','//*');



#

# Bug#22823 gt and lt operators appear to be

# reversed in ExtractValue() command

#

set @xml= "<entry><id>pt10</id><pt>10</pt></entry><entry><id>pt50</id><pt>50</pt></entry>";

select ExtractValue(@xml, "/entry[(pt=10)]/id");

select ExtractValue(@xml, "/entry[(pt!=10)]/id");

select ExtractValue(@xml, "/entry[(pt<10)]/id");

select ExtractValue(@xml, "/entry[(pt<=10)]/id");

select ExtractValue(@xml, "/entry[(pt>10)]/id");

select ExtractValue(@xml, "/entry[(pt>=10)]/id");

select ExtractValue(@xml, "/entry[(pt=50)]/id");

select ExtractValue(@xml, "/entry[(pt!=50)]/id");

select ExtractValue(@xml, "/entry[(pt<50)]/id");

select ExtractValue(@xml, "/entry[(pt<=50)]/id");

select ExtractValue(@xml, "/entry[(pt>50)]/id");

select ExtractValue(@xml, "/entry[(pt>=50)]/id");

select ExtractValue(@xml, "/entry[(10=pt)]/id");

select ExtractValue(@xml, "/entry[(10!=pt)]/id");

select ExtractValue(@xml, "/entry[(10>pt)]/id");

select ExtractValue(@xml, "/entry[(10>=pt)]/id");

select ExtractValue(@xml, "/entry[(10<pt)]/id");

select ExtractValue(@xml, "/entry[(10<=pt)]/id");

select ExtractValue(@xml, "/entry[(50=pt)]/id");

select ExtractValue(@xml, "/entry[(50!=pt)]/id");

select ExtractValue(@xml, "/entry[(50>pt)]/id");

select ExtractValue(@xml, "/entry[(50>=pt)]/id");

select ExtractValue(@xml, "/entry[(50<pt)]/id");

select ExtractValue(@xml, "/entry[(50<=pt)]/id");

sql/item_xmlfunc.cc

+8 −8
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ class Item_nodeset_to_const_comparator :public Item_bool_func 
  longlong val_int()

  {

    Item_func *comp= (Item_func*)args[1];

    Item_string *fake= (Item_string*)(comp->arguments()[1]);

    Item_string *fake= (Item_string*)(comp->arguments()[0]);

    String *res= args[0]->val_nodeset(&tmp_nodeset);

    MY_XPATH_FLT *fltbeg= (MY_XPATH_FLT*) res->ptr();

    MY_XPATH_FLT *fltend= (MY_XPATH_FLT*) (res->ptr() + res->length());
@@ -884,7 +884,7 @@ static Item *eq_func(int oper, Item *a, Item *b) 
    Create a comparator function for scalar arguments,

    for the given arguments and reverse operation, e.g.



    A >= B  is converted into  A < B

    A > B  is converted into  B < A



  RETURN

    The newly created item.
@@ -895,10 +895,10 @@ static Item *eq_func_reverse(int oper, Item *a, Item *b) 
  {

    case '=': return new Item_func_eq(a, b);

    case '!': return new Item_func_ne(a, b);

    case MY_XPATH_LEX_GE: return new Item_func_lt(a, b);

    case MY_XPATH_LEX_LE: return new Item_func_gt(a, b);

    case MY_XPATH_LEX_GREATER: return new Item_func_le(a, b);

    case MY_XPATH_LEX_LESS: return new Item_func_ge(a, b);

    case MY_XPATH_LEX_GE: return new Item_func_le(a, b);

    case MY_XPATH_LEX_LE: return new Item_func_ge(a, b);

    case MY_XPATH_LEX_GREATER: return new Item_func_lt(a, b);

    case MY_XPATH_LEX_LESS: return new Item_func_gt(a, b);

  }

  return 0;

}
@@ -951,13 +951,13 @@ static Item *create_comparator(MY_XPATH *xpath, 
    {

      nodeset= (Item_nodeset_func*) a;

      scalar= b;

      comp= eq_func(oper, scalar, fake);

      comp= eq_func(oper, fake, scalar);

    }

    else

    {

      nodeset= (Item_nodeset_func*) b;

      scalar= a;

      comp= eq_func_reverse(oper, scalar, fake);

      comp= eq_func_reverse(oper, fake, scalar);

    }

    return new Item_nodeset_to_const_comparator(nodeset, comp, xpath->pxml);

  }