Commit 12bdc04b authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents 93f773aa 2919d442

innobase/fil/fil0fil.c

+2 −0
Original line number Diff line number Diff line
@@ -1513,6 +1513,8 @@ fil_decr_pending_ibuf_merges( 
	mutex_exit(&(system->mutex));

}



/************************************************************

Creates the database directory for a table if it does not exist yet. */

static

void

fil_create_directory_for_tablename(

mysql-test/mysql-test-run.sh

+4 −2
Original line number Diff line number Diff line
@@ -1450,9 +1450,11 @@ then 
  then

    echo "Starting ndbcluster"

    ./ndb/ndbcluster --port-base=$NDBCLUSTER_PORT --small --diskless --initial --data-dir=$MYSQL_TEST_DIR/var || exit 1

    export NDB_CONNECTSTRING="host=localhost:$NDBCLUSTER_PORT"

    NDB_CONNECTSTRING="host=localhost:$NDBCLUSTER_PORT"

    export NDB_CONNECTSTRING

  else

    export NDB_CONNECTSTRING="$USE_RUNNING_NDBCLUSTER"

    NDB_CONNECTSTRING="$USE_RUNNING_NDBCLUSTER"

    export NDB_CONNECTSTRING

    echo "Using ndbcluster at $NDB_CONNECTSTRING"

  fi

  fi

mysql-test/ndb/ndbcluster.sh

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ fs_name_1=$fs_ndb/node-1-fs 
fs_name_2=$fs_ndb/node-2-fs



NDB_HOME=

export NDB_CONNECTSTRING

if [ ! -x $fsdir ]; then

  echo "$fsdir missing"

  exit 1
@@ -102,7 +101,8 @@ fi 


ndb_host="localhost"

ndb_mgmd_port=$port_base

export NDB_CONNECTSTRING="host=$ndb_host:$ndb_mgmd_port"

NDB_CONNECTSTRING="host=$ndb_host:$ndb_mgmd_port"

export NDB_CONNECTSTRING



start_default_ndbcluster() {

mysql-test/r/ndb_alter_table.result

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ col2 varchar(30) not null, 
col3 varchar (20) not null,

col4 varchar(4) not null,

col5 enum('PENDING', 'ACTIVE', 'DISABLED') not null,

col6 int not null, to_be_deleted int);

col6 int not null, to_be_deleted int) ENGINE=ndbcluster;

insert into t1 values (2,4,3,5,"PENDING",1,7);

alter table t1

add column col4_5 varchar(20) not null after col4,

mysql-test/r/ndb_basic.result

+10 −6
Original line number Diff line number Diff line
@@ -6,20 +6,20 @@ attr2 INT, 
attr3 VARCHAR(10)

) ENGINE=ndbcluster;

INSERT INTO t1 VALUES (9410,9412, NULL, '9412'), (9411,9413, 17, '9413');

SELECT pk1 FROM t1;

SELECT pk1 FROM t1 ORDER BY pk1;

pk1

9410

9411

SELECT * FROM t1;

SELECT * FROM t1 ORDER BY pk1;

pk1	attr1	attr2	attr3

9410	9412	NULL	9412

9411	9413	17	9413

SELECT t1.* FROM t1;

SELECT t1.* FROM t1 ORDER BY pk1;

pk1	attr1	attr2	attr3

9410	9412	NULL	9412

9411	9413	17	9413

UPDATE t1 SET attr1=1 WHERE pk1=9410;

SELECT * FROM t1;

SELECT * FROM t1 ORDER BY pk1;

pk1	attr1	attr2	attr3

9410	1	NULL	9412

9411	9413	17	9413
@@ -115,13 +115,17 @@ SELECT * FROM t1; 
id	id2

1234	7890

DELETE FROM t1;

INSERT INTO t1 values(3456, 7890), (3456, 7890), (3456, 7890);

SELECT * FROM t1;

INSERT INTO t1 values(3456, 7890), (3456, 7890), (3456, 7890), (3454, 7890);

SELECT * FROM t1 ORDER BY id;

id	id2

3454	7890

3456	7890

3456	7890

3456	7890

DELETE FROM t1 WHERE id = 3456;

SELECT * FROM t1 ORDER BY id;

id	id2

3454	7890

DROP TABLE t1;

CREATE TABLE t1 (

pk1 INT NOT NULL PRIMARY KEY,