Commit c4651808 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/hf/work/mysql-5.1.mrg
parents 6513ddab 7e2a9aa4

mysql-test/r/ndb_partition_range.result

+3 −3
Original line number Diff line number Diff line
@@ -246,17 +246,17 @@ PARTITION BY RANGE(f1) 
PARTITION part2 VALUES LESS THAN (1000));

INSERT INTO t1 VALUES(1, '---1---');

INSERT INTO t1 VALUES(2, '---2---');

select * from t1;

select * from t1 order by f1;

f1	f2

1	---1---

2	---2---

UPDATE t1 SET f1 = f1 + 4 WHERE f1 = 2;

select * from t1;

select * from t1 order by f1;

f1	f2

1	---1---

6	---2---

UPDATE t1 SET f1 = f1 + 4 WHERE f1 = 1;

select * from t1;

select * from t1 order by f1;

f1	f2

5	---1---

6	---2---

mysql-test/r/xml.result

+12 −0
Original line number Diff line number Diff line
@@ -65,6 +65,9 @@ c1 
SELECT extractValue(@xml,'/a/child::*');

extractValue(@xml,'/a/child::*')

b1 b2

SELECT extractValue(@xml,'/a/self::*');

extractValue(@xml,'/a/self::*')

a1 a2

SELECT extractValue(@xml,'/a/descendant::*');

extractValue(@xml,'/a/descendant::*')

b1 c1 b2
@@ -546,6 +549,15 @@ select extractvalue('<a>A</a>','/<a>'); 
ERROR HY000: XPATH syntax error: '>'

select extractvalue('<a><b>b</b><b!>b!</b!></a>','//b!');

ERROR HY000: XPATH syntax error: '!'

select extractvalue('<a>A<b>B<c>C</c></b></a>','/a/descendant::*');

extractvalue('<a>A<b>B<c>C</c></b></a>','/a/descendant::*')

B C

select extractvalue('<a>A<b>B<c>C</c></b></a>','/a/self::*');

extractvalue('<a>A<b>B<c>C</c></b></a>','/a/self::*')

A

select extractvalue('<a>A<b>B<c>C</c></b></a>','/a/descendant-or-self::*');

extractvalue('<a>A<b>B<c>C</c></b></a>','/a/descendant-or-self::*')

A B C

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

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

A

mysql-test/t/ndb_partition_range.test

+3 −3
Original line number Diff line number Diff line
@@ -252,9 +252,9 @@ PARTITION BY RANGE(f1) 
PARTITION part2 VALUES LESS THAN (1000));

INSERT INTO t1 VALUES(1, '---1---');

INSERT INTO t1 VALUES(2, '---2---');

select * from t1;

select * from t1 order by f1;

UPDATE t1 SET f1 = f1 + 4 WHERE f1 = 2;

select * from t1;

select * from t1 order by f1;

UPDATE t1 SET f1 = f1 + 4 WHERE f1 = 1;

select * from t1;

select * from t1 order by f1;

drop table t1;

mysql-test/t/xml.test

+6 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ SELECT extractValue(@xml,'/*/*'); 
SELECT extractValue(@xml,'/*/*/*');



SELECT extractValue(@xml,'/a/child::*');

SELECT extractValue(@xml,'/a/self::*');

SELECT extractValue(@xml,'/a/descendant::*');

SELECT extractValue(@xml,'/a/descendant-or-self::*');

SELECT extractValue(@xml,'/a/attribute::*');
@@ -245,6 +246,11 @@ select extractvalue('<a>A</a>','/<a>'); 
select extractvalue('<a><b>b</b><b!>b!</b!></a>','//b!');



#

# Bug #16315 XML: extractvalue() handles self badly

#

select extractvalue('<a>A<b>B<c>C</c></b></a>','/a/descendant::*');

select extractvalue('<a>A<b>B<c>C</c></b></a>','/a/self::*');

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');

sql/ha_ndbcluster.cc

+5 −2
Original line number Diff line number Diff line
@@ -4728,13 +4728,14 @@ int ha_ndbcluster::final_drop_index(TABLE *table_arg) 
int ha_ndbcluster::rename_table(const char *from, const char *to)

{

  NDBDICT *dict;

  char old_dbname[FN_HEADLEN];

  char new_tabname[FN_HEADLEN];

  const NDBTAB *orig_tab;

  int result;



  DBUG_ENTER("ha_ndbcluster::rename_table");

  DBUG_PRINT("info", ("Renaming %s to %s", from, to));

  set_dbname(from);

  set_dbname(from, old_dbname);

  set_tabname(from);

  set_tabname(to, new_tabname);
@@ -4742,6 +4743,7 @@ int ha_ndbcluster::rename_table(const char *from, const char *to) 
    DBUG_RETURN(my_errno= HA_ERR_NO_CONNECTION);



  Ndb *ndb= get_ndb();

  ndb->setDatabaseName(old_dbname);

  dict= ndb->getDictionary();

  if (!(orig_tab= dict->getTable(m_tabname)))

    ERR_RETURN(dict->getNdbError());
@@ -4833,7 +4835,8 @@ int ha_ndbcluster::rename_table(const char *from, const char *to) 
                               current_thd->query, current_thd->query_length,

                               m_dbname, new_tabname,

                               0, 0,

                               SOT_RENAME_TABLE);

                               SOT_RENAME_TABLE,

                               old_dbname, m_tabname);

  }

  if (share)

    free_share(&share);