diff options
| author | unknown <monty@tik.mysql.fi> | 2002-02-13 22:37:19 +0200 |
|---|---|---|
| committer | unknown <monty@tik.mysql.fi> | 2002-02-13 22:37:19 +0200 |
| commit | 429abf3560a41f1c2cbed56b409bc99b7baa7d9a (patch) | |
| tree | f93a6d7f74bfe9a525304996a4bd5c965e755e8c /mysql-test | |
| parent | e0ccdc17a208abb21cf15e7fbbbc3b88b969e0ec (diff) | |
| download | mariadb-git-429abf3560a41f1c2cbed56b409bc99b7baa7d9a.tar.gz | |
Added --user=userid to mysqld
Fix for ctypes on windows
Cleanup max_queries_per_hour
mysql-test/t/dirty_close.test:
Rename: mysql-test/t/dirty-close.test -> mysql-test/t/dirty_close.test
mysql-test/r/dirty_close.result:
Rename: mysql-test/r/dirty-close.result -> mysql-test/r/dirty_close.result
Docs/manual.texi:
Added --user=userid
include/m_ctype.h:
Fix for ctypes on windows
mysql-test/r/join.result:
Update join results
sql/mysqld.cc:
Added --user=userid
sql/sql_parse.cc:
Cleanup max_queries_per_hour
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/dirty_close.result (renamed from mysql-test/r/dirty-close.result) | 0 | ||||
| -rw-r--r-- | mysql-test/r/join.result | 22 | ||||
| -rw-r--r-- | mysql-test/t/dirty_close.test (renamed from mysql-test/t/dirty-close.test) | 0 |
3 files changed, 22 insertions, 0 deletions
diff --git a/mysql-test/r/dirty-close.result b/mysql-test/r/dirty_close.result index c4fc19a35f8..c4fc19a35f8 100644 --- a/mysql-test/r/dirty-close.result +++ b/mysql-test/r/dirty_close.result diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result index 5069fbaf527..b8ec13e9f50 100644 --- a/mysql-test/r/join.result +++ b/mysql-test/r/join.result @@ -186,3 +186,25 @@ t3.CanRead='1' AND t3.Active='1'; COUNT(t1.Title) 1 drop table t1,t2,t3; +CREATE TABLE t1 ( +t1_id int(11) default NULL, +t2_id int(11) default NULL, +type enum('Cost','Percent') default NULL, +cost_unit enum('Cost','Unit') default NULL, +min_value double default NULL, +max_value double default NULL, +t3_id int(11) default NULL, +item_id int(11) default NULL +) TYPE=MyISAM; +INSERT INTO t1 VALUES (12,5,'Percent','Cost',-1,0,-1,-1),(14,4,'Percent','Cost',-1,0,-1,-1),(18,5,'Percent','Cost',-1,0,-1,-1),(19,4,'Percent','Cost',-1,0,-1,-1),(20,5,'Percent','Cost',100,-1,22,291),(21,5,'Percent','Cost',100,-1,18,291),(22,1,'Percent','Cost',100,-1,6,291),(23,1,'Percent','Cost',100,-1,21,291),(24,1,'Percent','Cost',100,-1,9,291),(25,1,'Percent','Cost',100,-1,4,291),(26,1,'Percent','Cost',100,-1,20,291),(27,4,'Percent','Cost',100,-1,7,202),(28,1,'Percent','Cost',50,-1,-1,137),(29,2,'Percent','Cost',100,-1,4,354),(30,2,'Percent','Cost',100,-1,9,137),(93,2,'Cost','Cost',-1,10000000,-1,-1); +CREATE TABLE t2 ( +id int(10) unsigned NOT NULL auto_increment, +name varchar(255) default NULL, +PRIMARY KEY (id) +) TYPE=MyISAM; +INSERT INTO t2 VALUES (1,'s1'),(2,'s2'),(3,'s3'),(4,'s4'),(5,'s5'); +select t1.*, t2.* from t1, t2 where t2.id=t1.t2_id limit 2; +t1_id t2_id type cost_unit min_value max_value t3_id item_id id name +22 1 Percent Cost 100 -1 6 291 1 s1 +23 1 Percent Cost 100 -1 21 291 1 s1 +drop table t1,t2; diff --git a/mysql-test/t/dirty-close.test b/mysql-test/t/dirty_close.test index 3ed22f26d5b..3ed22f26d5b 100644 --- a/mysql-test/t/dirty-close.test +++ b/mysql-test/t/dirty_close.test |