database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge siva.hindu.god:/usr/home/tim/m/bk/50

Browse Source 
into  siva.hindu.god:/usr/home/tim/m/bk/51


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
mysql-test/r/myisam.result:
  Manual merge
mysql-test/t/myisam.test:
  Manual merge
This commit is contained in:
unknown
2006-12-14 17:03:44 -07:00
parent 33ab28e9ad 3a5064205f
commit eedbe37a70
4 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mysql-test/r/myisam.result
View File

@@ -922,27 +922,7 @@ SET @@myisam_repair_threads=1;
SHOW VARIABLES LIKE 'myisam_repair%';
Variable_name Value
myisam_repair_threads 1
show create table t1;
Table Create Table
t1 CREATE TEMPORARY TABLE `t1` (
`a` int(11) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/'
show create table t1;
Table Create Table
t1 CREATE TEMPORARY TABLE `t1` (
`a` int(11) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/'
create table t1 (a int) engine=myisam select 42 a;
select * from t1;
a
9
select * from t1;
a
99
select * from t1;
a
42
drop table t1;
End of 4.1 tests
set storage_engine=MyISAM;
drop table if exists t1,t2,t3;
--- Testing varchar ---
@@ -1611,7 +1591,6 @@ show keys from t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t1 1 a 1 a A 8 NULL NULL YES BTREE
drop table t1;
End of 4.1 tests
create table t1 (c1 int) engine=myisam pack_keys=0;
create table t2 (c1 int) engine=myisam pack_keys=1;
create table t3 (c1 int) engine=myisam pack_keys=default;

1
mysql-test/r/symlink.result
View File

@@ -132,3 +132,4 @@ select * from t1;
a
42
drop table t1;
End of 4.1 tests

5
mysql-test/t/myisam.test
View File

@@ -846,6 +846,10 @@ DROP TABLE t1;
#
SET @@myisam_repair_threads=1;
SHOW VARIABLES LIKE 'myisam_repair%';
--echo End of 4.1 tests
# Test varchar
#
@@ -943,7 +947,6 @@ show keys from t1;
drop table t1;
--echo End of 4.1 tests
#
# Bug#10056 - PACK_KEYS option take values greater than 1 while creating table

4
mysql-test/t/symlink.test
View File

@@ -176,4 +176,6 @@ connection default;
select * from t1;
drop table t1;
# End of 4.1 tests
--echo End of 4.1 tests
--echo End of 5.0 tests