Commit a6ef1dc3 authored by unknown's avatar unknown
Browse files

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

into  zim.(none):/home/brian/mysql/cluster-5.1


mysql-test/r/information_schema.result:
  Auto merged
parents eff9369d ac270838

client/client_priv.h

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ enum options_client 
  OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING,

#endif

  OPT_TRIGGERS,

  OPT_MYSQL_ONLY_PRINT,

  OPT_MYSQL_PRESERVE_SCHEMA_ENTER, OPT_MYSQL_PRESERVE_SCHEMA_EXIT,

  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,

  OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_CREATE_SLAP_SCHEMA,

  OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT, OPT_SERVER_ID

client/mysqlslap.c

+356 −293

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/r/mysqlslap.result

+573 −1
Original line number Diff line number Diff line 
# this test result intentionally blank due to running in silent mode.
 
DROP SCHEMA IF EXISTS `mysqlslap`;

CREATE SCHEMA `mysqlslap`;

use mysqlslap;

set storage_engine=`MYISAM`;

CREATE TABLE t1 (id int, name varchar(64));

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

DROP SCHEMA IF EXISTS `mysqlslap`;

CREATE SCHEMA `mysqlslap`;

use mysqlslap;

set storage_engine=`MYISAM`;

CREATE TABLE t1 (id int, name varchar(64));

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

DROP SCHEMA IF EXISTS `mysqlslap`;

CREATE SCHEMA `mysqlslap`;

use mysqlslap;

set storage_engine=`MYISAM`;

CREATE TABLE t1 (id int, name varchar(64));

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

DROP SCHEMA IF EXISTS `mysqlslap`;

CREATE SCHEMA `mysqlslap`;

use mysqlslap;

set storage_engine=`MYISAM`;

CREATE TABLE t1 (id int, name varchar(64));

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

DROP SCHEMA IF EXISTS `mysqlslap`;

CREATE SCHEMA `mysqlslap`;

use mysqlslap;

set storage_engine=`MYISAM`;

CREATE TABLE t1 (id int, name varchar(64));

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

INSERT INTO t1 VALUES (1, 'This is a test');

DROP SCHEMA IF EXISTS `mysqlslap`;

CREATE SCHEMA `mysqlslap`;

use mysqlslap;

set storage_engine=`MYISAM`;

CREATE TABLE t1 (id int, name varchar(64));

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

DROP SCHEMA IF EXISTS `mysqlslap`;

CREATE SCHEMA `mysqlslap`;

use mysqlslap;

set storage_engine=`MYISAM`;

CREATE TABLE t1 (id int, name varchar(64));

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

DROP SCHEMA IF EXISTS `mysqlslap`;

CREATE SCHEMA `mysqlslap`;

use mysqlslap;

set storage_engine=`MYISAM`;

CREATE TABLE t1 (id int, name varchar(64));

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

DROP SCHEMA IF EXISTS `mysqlslap`;

CREATE SCHEMA `mysqlslap`;

use mysqlslap;

set storage_engine=`MYISAM`;

CREATE TABLE t1 (id int, name varchar(64));

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

DROP SCHEMA IF EXISTS `mysqlslap`;

CREATE SCHEMA `mysqlslap`;

use mysqlslap;

set storage_engine=`MYISAM`;

CREATE TABLE t1 (id int, name varchar(64));

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

DROP SCHEMA IF EXISTS `mysqlslap`;

CREATE SCHEMA `mysqlslap`;

use mysqlslap;

set storage_engine=`MYISAM`;

CREATE TABLE t1 (id int, name varchar(64));

DROP SCHEMA IF EXISTS `mysqlslap`;

DROP SCHEMA IF EXISTS `mysqlslap`;

CREATE SCHEMA `mysqlslap`;

use mysqlslap;

set storage_engine=`MYISAM`;

CREATE TABLE t1 (id int, name varchar(64));

create table t2(foo1 varchar(32), foo2 varchar(32));

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

DROP SCHEMA IF EXISTS `mysqlslap`;

CREATE SCHEMA `mysqlslap`;

use mysqlslap;

set storage_engine=`MYISAM`;

CREATE TABLE t1 (id int, name varchar(64));

create table t2(foo1 varchar(32), foo2 varchar(32));

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

DROP SCHEMA IF EXISTS `mysqlslap`;

CREATE SCHEMA `mysqlslap`;

use mysqlslap;

set storage_engine=`MYISAM`;

CREATE TABLE t1 (id int, name varchar(64));

create table t2(foo1 varchar(32), foo2 varchar(32));

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

DROP SCHEMA IF EXISTS `mysqlslap`;

CREATE SCHEMA `mysqlslap`;

use mysqlslap;

set storage_engine=`MYISAM`;

CREATE TABLE t1 (id int, name varchar(64));

create table t2(foo1 varchar(32), foo2 varchar(32));

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

DROP SCHEMA IF EXISTS `mysqlslap`;

CREATE SCHEMA `mysqlslap`;

use mysqlslap;

set storage_engine=`MYISAM`;

CREATE TABLE t1 (id int, name varchar(64));

create table t2(foo1 varchar(32), foo2 varchar(32));

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

INSERT INTO t1 VALUES (1, 'This is a test');

insert into t2 values ('test', 'test2');

DROP SCHEMA IF EXISTS `mysqlslap`;

CREATE SCHEMA `mysqlslap`;

use mysqlslap;

set storage_engine=`MYISAM`;

CREATE TABLE t1 (id int, name varchar(64));

create table t2(foo1 varchar(32), foo2 varchar(32));

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

DROP SCHEMA IF EXISTS `mysqlslap`;

CREATE SCHEMA `mysqlslap`;

use mysqlslap;

set storage_engine=`MYISAM`;

CREATE TABLE t1 (id int, name varchar(64));

create table t2(foo1 varchar(32), foo2 varchar(32));

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

DROP SCHEMA IF EXISTS `mysqlslap`;

CREATE SCHEMA `mysqlslap`;

use mysqlslap;

set storage_engine=`MYISAM`;

CREATE TABLE t1 (id int, name varchar(64));

create table t2(foo1 varchar(32), foo2 varchar(32));

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

DROP SCHEMA IF EXISTS `mysqlslap`;

CREATE SCHEMA `mysqlslap`;

use mysqlslap;

set storage_engine=`MYISAM`;

CREATE TABLE t1 (id int, name varchar(64));

create table t2(foo1 varchar(32), foo2 varchar(32));

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

DROP SCHEMA IF EXISTS `mysqlslap`;

CREATE SCHEMA `mysqlslap`;

use mysqlslap;

set storage_engine=`MYISAM`;

CREATE TABLE t1 (id int, name varchar(64));

create table t2(foo1 varchar(32), foo2 varchar(32));

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

select * from t1;

select * from t2;

DROP SCHEMA IF EXISTS `mysqlslap`;

CREATE SCHEMA `mysqlslap`;

use mysqlslap;

set storage_engine=`MYISAM`;

CREATE TABLE t1 (id int, name varchar(64));

create table t2(foo1 varchar(32), foo2 varchar(32));

DROP SCHEMA IF EXISTS `mysqlslap`;

mysql-test/t/mysqlslap.test

+7 −3
Original line number Diff line number Diff line
@@ -2,8 +2,12 @@ 
--source include/not_embedded.inc

--source include/not_windows.inc



--exec $MYSQL_SLAP --silent --drop-schema --concurrency=5 --concurrency-load=5 --iterations=20 --number-int-cols=2 --number-char-cols=3 --number-rows=12 --auto-generate-sql

--exec $MYSQL_SLAP --silent --concurrency=5 --concurrency-load=5 --iterations=20 --number-int-cols=2 --number-char-cols=3 --number-rows=12 --auto-generate-sql



--exec $MYSQL_SLAP --silent --drop-schema --concurrency=5 --concurrency-load=5 --iterations=20 --number-rows=10 --query="select * from t1" --data="INSERT INTO t1 VALUES (1, 'This is a test')" --create="CREATE TABLE t1 (id int, name varchar(64))"

--exec $MYSQL_SLAP --only-print --concurrency=5 --concurrency-load=5 --iterations=20 --number-rows=10 --query="select * from t1" --data="INSERT INTO t1 VALUES (1, 'This is a test')" --create="CREATE TABLE t1 (id int, name varchar(64))"



--exec $MYSQL_SLAP --silent --drop-schema --concurrency=5 --concurrency-load=5 --iterations=20 --delimiter=";" --number-rows=10 --query="select * from t1;select * from t2" --data="INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2')" --create="CREATE TABLE t1 (id int, name varchar(64)); create table t2(foo1 varchar(32), foo2 varchar(32))"
 
--exec $MYSQL_SLAP --silent --concurrency=5 --concurrency-load=5 --iterations=20 --number-rows=10 --query="select * from t1" --data="INSERT INTO t1 VALUES (1, 'This is a test')" --create="CREATE TABLE t1 (id int, name varchar(64))"



--exec $MYSQL_SLAP --only-print --concurrency=5 --concurrency-load=5 --iterations=20 --delimiter=";" --number-rows=10 --query="select * from t1;select * from t2" --data="INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2')" --create="CREATE TABLE t1 (id int, name varchar(64)); create table t2(foo1 varchar(32), foo2 varchar(32))"



--exec $MYSQL_SLAP --silent --concurrency=5 --concurrency-load=5 --iterations=20 --delimiter=";" --number-rows=10 --query="select * from t1;select * from t2" --data="INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2')" --create="CREATE TABLE t1 (id int, name varchar(64)); create table t2(foo1 varchar(32), foo2 varchar(32))"