Commit a98a7ffe authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

Merge work:/home/bk/mysql-4.0

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
parents 09eda84f 7e2d4d8f
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -45712,6 +45712,10 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.
@itemize @bullet
@item
Speed up all internal list handling.
@item
Added support for @code{UNION}.
@item
Allow ANSI SQL syntax @code{X'hexadecimal-number'}
@item
Tree-like cache to speed up bulk inserts and
+7 −4
Original line number Diff line number Diff line
@@ -210,7 +210,10 @@
#define ER_READ_ONLY_TRANSACTION 1207
#define ER_DROP_DB_WITH_READ_LOCK 1208
#define ER_CREATE_DB_WITH_READ_LOCK 1209
#define ER_CONNECT_TO_MASTER 1210
#define ER_QUERY_ON_MASTER 1211
#define ER_ERROR_WHEN_EXECUTING_COMMAND 1212
#define ER_ERROR_MESSAGES 213
#define ER_WRONG_ARGUMENTS 1210
#define ER_CONNECT_TO_MASTER 1211
#define ER_QUERY_ON_MASTER 1212
#define ER_ERROR_WHEN_EXECUTING_COMMAND 1213
#define ER_WRONG_USAGE 1214
#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1215
#define ER_ERROR_MESSAGES 216
+60 −0
Original line number Diff line number Diff line
a	b
1	a
2	b
3	c
4	d
5	f
6	e
a	b
1	a
2	b
3	c
3	c
3	c
4	d
5	f
6	e
a	b
1	a
2	b
3	c
3	c
3	c
4	d
6	e
5	f
a	b
1	a
2	b
3	c
3	c
3	c
4	d
5	f
6	e
7	g
0	#
0	#
1	a
2	b
3	c
3	c
3	c
4	d
5	f
6	e
7	g
a	b
1	a
2	b
3	c
t1	b	count(*)
t1	a	1
t1	b	1
t1	c	2
t2	c	1
t2	d	1
t2	e	1
t2	f	1
table	type	possible_keys	key	key_len	ref	rows	Extra
t2	ALL	NULL	NULL	NULL	NULL	4	

mysql-test/r/unions_one.result

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line
a	b
1 a
2 b
3 c
4 d
5 e
6 f
a	b
1 a
2 b
3 c
3 c
4 d
5 e
6 f
+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@
# Test of procedure analyse
#

drop table if exists t1,t2;
create table t1 (i int, j int);
insert into t1 values (1,2), (3,4), (5,6), (7,8);
select * from t1 procedure analyse();
Loading