mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Update of manual with 4.0 changes
Create innodb table space if configuring with InnoDB and not using --skip-innodb Fixes for TRUNCATE TABLE and DROP DATABASE. Docs/manual.texi: Update of manual with 4.0 changes. mysql-test/mysql-test-run.sh: Fixed option --mysqld mysql-test/r/innodb.result: More test cases mysql-test/r/truncate.result: More test cases mysql-test/t/drop.test: More test cases mysql-test/t/innodb.test: More test cases mysql-test/t/truncate.test: More test cases sql/gen_lex_hash.cc: Smaller array sql/ha_innobase.cc: Create innodb table space if not using --skip-innodb sql/lock.cc: Fixed wrong mutex handling in global read lock. sql/md5.c: Fixed bug from merge sql/sql_base.cc: cleanup sql/sql_db.cc: Use new global lock functions. Fixed new bug that database wasn't always dropped. sql/sql_delete.cc: Fixed problem with mysql_truncate() when called from restore_table sql/sql_parse.cc: Fixed error message handling. sql/sql_table.cc: cleanup
This commit is contained in:
@ -171,7 +171,7 @@ while test $# -gt 0; do
|
||||
;;
|
||||
--mysqld=*)
|
||||
TMP=`$ECHO "$1" | $SED -e "s;--mysqld=;;"`
|
||||
EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT $TMP"
|
||||
EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT $TMP"
|
||||
EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT $TMP"
|
||||
;;
|
||||
--gcov )
|
||||
|
@ -479,3 +479,5 @@ id name value uid
|
||||
1 one one value 101
|
||||
3 three three value 103
|
||||
6 two other value 102
|
||||
a
|
||||
a
|
||||
|
@ -2,3 +2,4 @@ count(*)
|
||||
0
|
||||
count(*)
|
||||
1
|
||||
a b c1
|
||||
|
@ -28,16 +28,16 @@ drop database foo;
|
||||
# test drop/create database and FLUSH TABLES WITH READ LOCK
|
||||
drop database if exists foo;
|
||||
flush tables with read lock;
|
||||
--error 1209
|
||||
--error 1209,1218;
|
||||
create database foo;
|
||||
unlock tables;
|
||||
create database foo;
|
||||
show databases;
|
||||
flush tables with read lock;
|
||||
--error 1208
|
||||
--error 1208,1218;
|
||||
drop database foo;
|
||||
unlock tables;
|
||||
drop database foo;
|
||||
show databases;
|
||||
|
||||
|
||||
--error 1008
|
||||
drop database foo;
|
||||
|
@ -512,3 +512,37 @@ replace into t1 (value,name,uid) values ('other value','two',102);
|
||||
select * from t1;
|
||||
drop table t1;
|
||||
|
||||
#
|
||||
# Test DROP DATABASE
|
||||
#
|
||||
|
||||
create database test_$1;
|
||||
create table test_$1.t1 (a int not null) type= innodb;
|
||||
insert into test_$1.t1 values(1);
|
||||
create table test_$1.t2 (a int not null) type= myisam;
|
||||
insert into test_$1.t2 values(1);
|
||||
create table test_$1.t3 (a int not null) type= heap;
|
||||
insert into test_$1.t3 values(1);
|
||||
commit;
|
||||
drop database test_$1;
|
||||
--error 12
|
||||
show tables from test_$1;
|
||||
|
||||
#
|
||||
# Test truncate table
|
||||
#
|
||||
|
||||
create table t1 (a int not null) type= innodb;
|
||||
insert into t1 values(1),(2);
|
||||
--error 1192
|
||||
truncate table t1;
|
||||
commit;
|
||||
truncate table t1;
|
||||
select * from t1;
|
||||
insert into t1 values(1),(2);
|
||||
delete from t1;
|
||||
select * from t1;
|
||||
commit;
|
||||
drop table t1;
|
||||
|
||||
|
||||
|
@ -2,10 +2,14 @@
|
||||
# Test of truncate
|
||||
#
|
||||
create table t1 (a integer, b integer,c1 CHAR(10));
|
||||
insert into t1 (a) values (1),(2);
|
||||
truncate table t1;
|
||||
select count(*) from t1;
|
||||
insert into t1 values(1,2,"test");
|
||||
select count(*) from t1;
|
||||
delete from t1;
|
||||
select * from t1;
|
||||
drop table t1;
|
||||
# The following should fail
|
||||
!$1146 select count(*) from t1;
|
||||
--error 1146
|
||||
select count(*) from t1;
|
||||
|
Reference in New Issue
Block a user