Commit 6f767647 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

parents d3419b05 52b83ea2

Docs/manual.texi

+4 −15
Original line number Diff line number Diff line
@@ -5680,11 +5680,10 @@ this without sacrifying the speed or compromise the code. 
@node TODO MySQL 4.0, TODO future, TODO, TODO

@subsection Things that should be in 4.0













We plan to make MySQL Version 4.0 a ``quick'' release where we only













add some new stuff to enable others to help us with developing new features













into Version 4.1.  The MySQL 4.0 version should only take us about













a month to make after which we want to stabilize it and start working on













Version 4.1.  Version 4.0 should have the following new features:













We have now shifted development to MySQL Version 4.0.  Most of the basic













things we want to have in 4.0 is already done.  The target is to quickly













implement the rest of the following features and then shift development













to MySQL 4.1.





























The news section for 4.0 includes a list of the features we have already















implemented in the 4.0 tree. @xref{News-4.0.x}.










@@ -5717,13 +5716,6 @@ Replication should work with @code{RAND()} and user variables @code{@@var}.













Online backup with very low performance penalty.  The online backup will















make it easy to add a new replication slave without taking down the















master.













@item













@code{DELETE FROM table_name} will return the number of deleted rows. For













fast execution one should use @code{TRUNCATE table_name}.













@item













Multi-table @code{DELETE} (cascading @code{DELETE} and multi-table













@code{DELETE}.













@item















Allow @code{DELETE} on @code{MyISAM} tables to use the record cache.















To do this, we need to update the threads record cache when we update















the @code{.MYD} file.









@@ -5741,9 +5733,6 @@ Help for all commands from the client.













@item















Secure connections (with SSL).















@item













Extend the optimizer to be able to optimize some @code{ORDER BY key_name DESC}













queries.













@item















@code{SHOW COLUMNS FROM table_name} (used by @code{mysql} client to allow















expansions of column names) should not open the table, but only the















definition file. This will require less memory and be much faster.

























include/global.h
deleted100644 → 0



+0
−968




























File deleted.
Preview size limit exceeded, changes collapsed.
























mysql-test/r/union.result



+3
−0






























Original line number
Diff line number
Diff line








@@ -59,3 +59,6 @@ t2	f	1













table	type	possible_keys	key	key_len	ref	rows	Extra















t1	ALL	NULL	NULL	NULL	NULL	4	















t2	ALL	NULL	NULL	NULL	NULL	4	













pseudo













dekad













joce
























mysql-test/t/union.test



+20
−5






























Original line number
Diff line number
Diff line








@@ -19,19 +19,19 @@ select 't1',b,count(*) from t1 group by b UNION select 't2',b,count(*) from t2 g













# Test some error conditions with UNION















explain select a,b from t1 union all select a,b from t2;





























--error 1215













--error 1216















select a,b from t1 into outfile 'skr' union select a,b from t2;





























--error 1215













--error 1216















select a,b from t1 order by a union select a,b from t2;





























--error 1216













--error 1217















create table t3 select a,b from t1 union select a from t2;





























--error 1215













--error 1216















insert into t3 select a from t1 order by a union select a from t2;





























--error 1216













--error 1217















select a,b from t1 union select a from t2;































# Test CREATE, INSERT and REPLACE









@@ -40,3 +40,18 @@ insert into t3 select a,b from t1 union all select a,b from t2;













replace into t3 select a,b as c from t1 union all select a,b from t2;































drop table t1,t2,t3;



























#













# Test bug reported by joc@presence-pc.com













#



























CREATE TABLE t1 (













  `pseudo` char(35) NOT NULL default '',













  `pseudo1` char(35) NOT NULL default '',













  `same` tinyint(1) unsigned NOT NULL default '1',













  PRIMARY KEY  (`pseudo1`),













  KEY `pseudo` (`pseudo`)













) TYPE=MyISAM;













INSERT INTO t1 (pseudo,pseudo1,same) VALUES ('joce', 'testtt', 1),('joce', 'tsestset', 1),('dekad', 'joce', 1);













SELECT pseudo FROM t1 WHERE pseudo1='joce' UNION SELECT pseudo FROM t1 WHERE pseudo='joce';













drop table t1;
























mysys/my_lib.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -183,7 +183,7 @@ MY_DIR	*my_dir(const char *path, myf MyFlags)













  my_errno=errno;















  if (dirp)















    (void) closedir(dirp);













  if (MyFlags & (MY_FAE+MY_WME))













  if (MyFlags & (MY_FAE | MY_WME))















    my_error(EE_DIR,MYF(ME_BELL+ME_WAITTANG),path,my_errno);















  DBUG_RETURN((MY_DIR *) NULL);















} /* my_dir */