Commit dfa3c878 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents cc5abe68 905b6416

mysql-test/r/ndb_read_multi_range.result

+14 −0
Original line number Diff line number Diff line
@@ -367,3 +367,17 @@ a b c 
406994	67	2006-02-27 11:26:46

406995	67	2006-02-28 11:55:00

DROP TABLE t1, t11, t12, t21, t22;

CREATE TABLE t1 (id varchar(255) NOT NULL,

tag int(11) NOT NULL,

doc text NOT NULL,

type varchar(150) NOT NULL,

modified timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,

PRIMARY KEY (id)

) ENGINE=ndbcluster;

INSERT INTO t1 VALUES ('sakila',1,'Some text goes here','text',CURRENT_TIMESTAMP);

SELECT id, tag, doc, type FROM t1 WHERE id IN ('flipper','orka');

id	tag	doc	type

SELECT id, tag, doc, type FROM t1 WHERE id IN ('flipper','sakila');

id	tag	doc	type

sakila	1	Some text goes here	text

DROP TABLE t1;

mysql-test/t/ndb_read_multi_range.test

+15 −0
Original line number Diff line number Diff line
@@ -238,3 +238,18 @@ select * from t12 order by 1,2,3; 
select * from t21 order by 1,2,3;

select * from t22 order by 1,2,3;

DROP TABLE t1, t11, t12, t21, t22;



# bug#19956

CREATE TABLE t1 (id varchar(255) NOT NULL,

		 tag int(11) NOT NULL,

                 doc text NOT NULL,

                 type varchar(150) NOT NULL,

                 modified timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,

                 PRIMARY KEY (id)

                ) ENGINE=ndbcluster;



INSERT INTO t1 VALUES ('sakila',1,'Some text goes here','text',CURRENT_TIMESTAMP);

SELECT id, tag, doc, type FROM t1 WHERE id IN ('flipper','orka');

SELECT id, tag, doc, type FROM t1 WHERE id IN ('flipper','sakila');



DROP TABLE t1;

sql/ha_ndbcluster.cc

+4 −7
Original line number Diff line number Diff line
@@ -2955,13 +2955,10 @@ KEY* key_info; 
      DBUG_RETURN(error == HA_ERR_KEY_NOT_FOUND ? HA_ERR_END_OF_FILE : error);

    }

    else if (type == UNIQUE_INDEX)

    {

      error= unique_index_scan(key_info, 

      DBUG_RETURN(unique_index_scan(key_info, 

				    start_key->key, 

				    start_key->length, 

			       buf);

      DBUG_RETURN(error == HA_ERR_KEY_NOT_FOUND ? HA_ERR_END_OF_FILE : error);

    }

				    buf));

    break;

  default:

    break;

sql/mysqld.cc

+13 −2
Original line number Diff line number Diff line
@@ -4571,8 +4571,8 @@ enum options_mysqld 
  OPT_LOG_BIN_TRUST_FUNCTION_CREATORS,

  OPT_SAFE_SHOW_DB, OPT_INNODB_SAFE_BINLOG,

  OPT_INNODB, OPT_ISAM,

  OPT_ENGINE_CONDITION_PUSHDOWN,

  OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING, OPT_NDB_USE_EXACT_COUNT,

  OPT_ENGINE_CONDITION_PUSHDOWN, OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING, 

  OPT_NDB_USE_EXACT_COUNT, OPT_NDB_USE_TRANSACTIONS,

  OPT_NDB_FORCE_SEND, OPT_NDB_AUTOINCREMENT_PREFETCH_SZ,

  OPT_NDB_SHM, OPT_NDB_OPTIMIZED_NODE_SELECTION, OPT_NDB_CACHE_CHECK_TIME,

  OPT_NDB_MGMD, OPT_NDB_NODEID,
@@ -5203,6 +5203,17 @@ Disable with --skip-ndbcluster (will save memory).", 
   (gptr*) &global_system_variables.ndb_use_exact_count,

   (gptr*) &global_system_variables.ndb_use_exact_count,

   0, GET_BOOL, OPT_ARG, 1, 0, 0, 0, 0, 0},

  {"ndb-use-transactions", OPT_NDB_USE_TRANSACTIONS,

   "Use transactions for large inserts, if enabled then large "

   "inserts will be split into several smaller transactions",

   (gptr*) &global_system_variables.ndb_use_transactions,

   (gptr*) &global_system_variables.ndb_use_transactions,

   0, GET_BOOL, OPT_ARG, 1, 0, 0, 0, 0, 0},

  {"ndb_use_transactions", OPT_NDB_USE_TRANSACTIONS,

   "same as --ndb-use-transactions.",

   (gptr*) &global_system_variables.ndb_use_transactions,

   (gptr*) &global_system_variables.ndb_use_transactions,

   0, GET_BOOL, OPT_ARG, 1, 0, 0, 0, 0, 0},

  {"ndb-shm", OPT_NDB_SHM,

   "Use shared memory connections when available.",

   (gptr*) &opt_ndb_shm,