Commit 1f4e0b61 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.1 

into  mysql.com:/home/mydev/mysql-5.1-bug11527
parents 2ad62445 eab8bb65

mysql-test/lib/init_db.sql

+2 −2
Original line number Diff line number Diff line
@@ -634,5 +634,5 @@ CREATE TABLE event ( 
  PRIMARY KEY  (definer, db, name)

) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';



CREATE DATABASE IF NOT EXISTS cluster_replication;

CREATE TABLE IF NOT EXISTS cluster_replication.binlog_index (Position BIGINT UNSIGNED NOT NULL, File VARCHAR(255) NOT NULL, epoch BIGINT UNSIGNED NOT NULL, inserts BIGINT UNSIGNED NOT NULL, updates BIGINT UNSIGNED NOT NULL, deletes BIGINT UNSIGNED NOT NULL, schemaops BIGINT UNSIGNED NOT NULL, PRIMARY KEY(epoch)) ENGINE=MYISAM;
 
CREATE DATABASE IF NOT EXISTS cluster;

CREATE TABLE IF NOT EXISTS cluster.binlog_index (Position BIGINT UNSIGNED NOT NULL, File VARCHAR(255) NOT NULL, epoch BIGINT UNSIGNED NOT NULL, inserts BIGINT UNSIGNED NOT NULL, updates BIGINT UNSIGNED NOT NULL, deletes BIGINT UNSIGNED NOT NULL, schemaops BIGINT UNSIGNED NOT NULL, PRIMARY KEY(epoch)) ENGINE=MYISAM;

mysql-test/mysql-test-run.pl

+2 −2
Original line number Diff line number Diff line
@@ -1508,8 +1508,8 @@ sub ndbcluster_start ($) { 


sub rm_ndbcluster_tables ($) {

  my $dir=       shift;

  foreach my $bin ( glob("$dir/cluster_replication/apply_status*"),

                    glob("$dir/cluster_replication/schema*") )

  foreach my $bin ( glob("$dir/cluster/apply_status*"),

                    glob("$dir/cluster/schema*") )

  {

    unlink($bin);

  }

mysql-test/mysql-test-run.sh

+2 −2
Original line number Diff line number Diff line
@@ -1326,8 +1326,8 @@ start_ndbcluster() 


rm_ndbcluster_tables()

{

  $RM -f $1/cluster_replication/apply_status*

  $RM -f $1/cluster_replication/schema*

  $RM -f $1/cluster/apply_status*

  $RM -f $1/cluster/schema*

}



stop_ndbcluster()

mysql-test/r/drop.result

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ create database mysqltest; 
show databases;

Database

information_schema

cluster_replication

cluster

mysql

mysqltest

test
@@ -59,7 +59,7 @@ drop database mysqltest; 
show databases;

Database

information_schema

cluster_replication

cluster

mysql

test

drop database mysqltest;

mysql-test/r/information_schema.result

+4 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ NULL test latin1 latin1_swedish_ci NULL 
select schema_name from information_schema.schemata;

schema_name

information_schema

cluster_replication

cluster

mysql

test

show databases like 't%';
@@ -23,7 +23,7 @@ test 
show databases;

Database

information_schema

cluster_replication

cluster

mysql

test

show databases where `database` = 't%';
@@ -339,7 +339,7 @@ create view v0 (c) as select schema_name from information_schema.schemata; 
select * from v0;

c

information_schema

cluster_replication

cluster

mysql

test

explain select * from v0;
@@ -835,7 +835,7 @@ delete from mysql.db where user='mysqltest_4'; 
flush privileges;

SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA;

table_schema	count(*)

cluster_replication	1

cluster	1

information_schema	22

mysql	21

create table t1 (i int, j int);