mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 02:51:44 +01:00
869c89feaa
Remember UNION for ALTER TABLE Added test for if we are supporting transactions. Don't allow REPLACE to replace a row when we have generated an auto_increment key Fixed bug when using BLOB keys Fixed bug in SET @variable=user. Docs/manual.texi: Added some examples and moved the Error access denied section to the error section. client/mysqltest.c: Changed to use the new mysql_send_query() include/mysql.h: Changed mysql_reap_query() to mysql_send_query(). libmysql/libmysql.c: Changed mysql_reap_query() to mysql_send_query() Merged some functions and removed some unused functions. mysql-test/r/bdb.result: New test case mysql-test/r/distinct.result: New test case mysql-test/r/key.result: New test case mysql-test/r/merge.result: New test case mysql-test/r/replace.result: New test case mysql-test/t/bdb.test: New test case mysql-test/t/key.test: New test case mysql-test/t/merge.test: New test case mysql-test/t/replace.test: New test case mysys/my_lock.c: Moved global lock variable to static sql-bench/test-insert.sh: Added test case for index-read only sql/field.h: Fixed that one can optimize ORDER BY with ISAM and GEMINI sql/ha_berkeley.cc: Added type casts needed for Windows sql/ha_innobase.cc: Removed reference to manual from comment. sql/ha_myisammrg.cc: Remember UNION for ALTER TABLE sql/ha_myisammrg.h: Remember UNION for ALTER TABLE sql/handler.cc: Added test for if we are supporting transactions. Don't allow REPLACE to replace a row when we have generated an auto_increment key. sql/handler.h: Remember UNION for ALTER TABLE sql/key.cc: Fixed bug when using BLOB keys sql/mysql_priv.h: Added new variables sql/mysqld.cc: Added new variables sql/opt_range.cc: Fixed problem with BLOB keys sql/opt_sum.cc: Fix for BLOB keys sql/sql_class.cc: Added test if we need to init/clean transaction variables sql/sql_insert.cc: Fix for REPLACE and auto_increment keys sql/sql_parse.cc: Fixed bug in max_user_connections sql/sql_select.cc: Fixed problem with key on BLOB sql/sql_yacc.yy: Fixed bug in SET @variable=user. sql/table.cc: Fixed problem with keys on BLOB
129 lines
1.4 KiB
Text
129 lines
1.4 KiB
Text
a b
|
|
1 Testing
|
|
2 table
|
|
3 t1
|
|
1 Testing
|
|
2 table
|
|
3 t2
|
|
a b
|
|
3 t1
|
|
3 t2
|
|
2 table
|
|
2 table
|
|
1 Testing
|
|
1 Testing
|
|
table type possible_keys key key_len ref rows Extra
|
|
t3 range a a 4 NULL 10 where used
|
|
table type possible_keys key key_len ref rows Extra
|
|
t3 range a a 4 NULL 10 where used
|
|
a b
|
|
10 Testing
|
|
10 Testing
|
|
a b
|
|
1 Testing
|
|
1 Testing
|
|
2 table
|
|
2 table
|
|
3 t1
|
|
3 t2
|
|
4 Testing
|
|
4 Testing
|
|
5 table
|
|
5 table
|
|
6 t1
|
|
6 t2
|
|
7 Testing
|
|
7 Testing
|
|
8 table
|
|
8 table
|
|
9 t2
|
|
9 t2
|
|
a b
|
|
11 table
|
|
11 table
|
|
12 t1
|
|
12 t1
|
|
13 Testing
|
|
13 Testing
|
|
14 table
|
|
14 table
|
|
15 t2
|
|
15 t2
|
|
16 Testing
|
|
16 Testing
|
|
17 table
|
|
17 table
|
|
18 t2
|
|
18 t2
|
|
19 Testing
|
|
19 Testing
|
|
table type possible_keys key key_len ref rows Extra
|
|
t3 index NULL a 4 NULL 1131 Using index
|
|
a
|
|
699
|
|
698
|
|
697
|
|
696
|
|
695
|
|
694
|
|
693
|
|
692
|
|
691
|
|
690
|
|
a
|
|
416
|
|
415
|
|
415
|
|
414
|
|
414
|
|
413
|
|
413
|
|
412
|
|
412
|
|
411
|
|
Table Create Table
|
|
t3 CREATE TABLE `t3` (
|
|
`a` int(11) NOT NULL default '0',
|
|
`b` char(20) default NULL,
|
|
KEY `a` (`a`)
|
|
) TYPE=MRG_MyISAM UNION=(t1,t2)
|
|
c
|
|
test1
|
|
test1
|
|
test1
|
|
test2
|
|
test2
|
|
test2
|
|
c
|
|
test1
|
|
test1
|
|
test1
|
|
test2
|
|
test2
|
|
test2
|
|
c
|
|
c
|
|
incr othr
|
|
incr othr
|
|
1 10
|
|
2 24
|
|
4 33
|
|
3 53
|
|
count(*)
|
|
10
|
|
count(*)
|
|
20
|
|
count(*)
|
|
20
|
|
Table Create Table
|
|
t3 CREATE TABLE `t3` (
|
|
`incr` int(11) NOT NULL default '0',
|
|
`othr` int(11) NOT NULL default '0',
|
|
PRIMARY KEY (`incr`)
|
|
) TYPE=MRG_MyISAM UNION=(t1,t2)
|
|
Table Create Table
|
|
t3 CREATE TABLE `t3` (
|
|
`incr` int(11) NOT NULL default '0',
|
|
`othr` int(11) NOT NULL default '0'
|
|
) TYPE=MRG_MyISAM UNION=(t1,t2)
|
|
a
|