Commit 6e8d8b62 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


mysql-test/r/ndb_lock.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
parents 7373f112 df4afa6e

mysql-test/r/grant.result

+2 −2
Original line number Diff line number Diff line
@@ -911,7 +911,7 @@ ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table ' 
SHOW CREATE TABLE mysqltest2.t_nn;

Table	Create Table

t_nn	CREATE TABLE `t_nn` (

  `c1` int(11) default NULL

  `c1` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

SHOW CREATE VIEW  mysqltest2.t_nn;

ERROR HY000: 'mysqltest2.t_nn' is not VIEW
@@ -930,7 +930,7 @@ v_nn CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER 
SHOW CREATE TABLE mysqltest2.t_nn;

Table	Create Table

t_nn	CREATE TABLE `t_nn` (

  `c1` int(11) default NULL

  `c1` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

SHOW CREATE VIEW mysqltest2.t_nn;

ERROR HY000: 'mysqltest2.t_nn' is not VIEW

sql/ha_ndbcluster.cc

+0 −1
Original line number Diff line number Diff line
@@ -7810,7 +7810,6 @@ ha_ndbcluster::read_multi_range_first(KEY_MULTI_RANGE **found_range_p, 
   */

  m_current_multi_operation= 

    lastOp ? lastOp->next() : m_active_trans->getFirstDefinedOperation();

  if (!(res= execute_no_commit_ie(this, m_active_trans, true)))

  {

    m_multi_range_defined= multi_range_curr;

    multi_range_curr= ranges;