mirror of
https://github.com/MariaDB/server.git
synced 2025-08-27 13:04:36 +03:00
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb client/mysql.cc: Auto merged mysql-test/r/func_str.result: Auto merged mysql-test/r/rpl_temporary.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/t/rpl_temporary.test: Auto merged sql/item_strfunc.cc: Auto merged sql/sql_show.cc: Auto merged storage/ndb/src/ndbapi/ClusterMgr.cpp: Auto merged storage/ndb/src/ndbapi/ClusterMgr.hpp: Auto merged storage/ndb/src/ndbapi/DictCache.hpp: Auto merged storage/ndb/src/ndbapi/TransporterFacade.hpp: Auto merged storage/ndb/src/ndbapi/ndb_cluster_connection.cpp: Auto merged storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp: Auto merged mysql-test/r/information_schema.result: manual merge mysql-test/t/information_schema.test: manual merge sql/ha_ndbcluster.cc: manual merge storage/ndb/include/ndbapi/ndb_cluster_connection.hpp: manual merge storage/ndb/src/ndbapi/DictCache.cpp: manual merge
This commit is contained in:
unknown
@@ -1017,6 +1017,13 @@ t
|
||||
1000000
|
||||
1
|
||||
drop table t1;
|
||||
select load_file("lkjlkj");
|
||||
load_file("lkjlkj")
|
||||
NULL
|
||||
select ifnull(load_file("lkjlkj"),"it's null");
|
||||
ifnull(load_file("lkjlkj"),"it's null")
|
||||
it's null
|
||||
End of 4.1 tests
|
||||
create table t1 (d decimal default null);
|
||||
insert into t1 values (null);
|
||||
select format(d, 2) from t1;
|
||||
|
||||
@@ -1136,6 +1136,23 @@ table_schema='information_schema' and
|
||||
group by column_type order by num;
|
||||
column_type group_concat(table_schema, '.', table_name) num
|
||||
varchar(7) information_schema.ROUTINES,information_schema.VIEWS 2
|
||||
create table t1(f1 char(1) not null, f2 char(9) not null)
|
||||
default character set utf8;
|
||||
select CHARACTER_MAXIMUM_LENGTH, CHARACTER_OCTET_LENGTH from
|
||||
information_schema.columns where table_schema='test' and table_name = 't1';
|
||||
CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH
|
||||
1 3
|
||||
9 27
|
||||
drop table t1;
|
||||
use mysql;
|
||||
INSERT INTO `proc` VALUES ('test','','PROCEDURE','','SQL','CONTAINS_SQL',
|
||||
'NO','DEFINER','','','BEGIN\r\n \r\nEND','root@%','2006-03-02 18:40:03',
|
||||
'2006-03-02 18:40:03','','');
|
||||
select routine_name from information_schema.routines;
|
||||
routine_name
|
||||
|
||||
delete from proc where name='';
|
||||
use test;
|
||||
varchar(20) information_schema.COLUMNS,information_schema.FILES,information_schema.FILES,information_schema.PLUGINS,information_schema.PLUGINS,information_schema.PLUGINS 6
|
||||
select * from information_schema.engines WHERE ENGINE="MyISAM";
|
||||
ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS
|
||||
|
||||
@@ -700,8 +700,8 @@ ERROR 42S22: Unknown column 't1.b' in 'on clause'
|
||||
select * from information_schema.statistics join information_schema.columns
|
||||
using(table_name,column_name) where table_name='user';
|
||||
TABLE_NAME COLUMN_NAME TABLE_CATALOG TABLE_SCHEMA NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT TABLE_CATALOG TABLE_SCHEMA ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT
|
||||
user Host NULL mysql 0 mysql PRIMARY 1 A NULL NULL NULL BTREE NULL mysql 1 NO char 20 60 NULL NULL utf8 utf8_bin char(60) PRI select,insert,update,references
|
||||
user User NULL mysql 0 mysql PRIMARY 2 A 5 NULL NULL BTREE NULL mysql 2 NO char 5 16 NULL NULL utf8 utf8_bin char(16) PRI select,insert,update,references
|
||||
user Host NULL mysql 0 mysql PRIMARY 1 A NULL NULL NULL BTREE NULL mysql 1 NO char 60 180 NULL NULL utf8 utf8_bin char(60) PRI select,insert,update,references
|
||||
user User NULL mysql 0 mysql PRIMARY 2 A 5 NULL NULL BTREE NULL mysql 2 NO char 16 48 NULL NULL utf8 utf8_bin char(16) PRI select,insert,update,references
|
||||
drop table t1;
|
||||
drop table t2;
|
||||
drop table t3;
|
||||
|
||||
45
mysql-test/r/ndb_autodiscover3.result
Normal file
45
mysql-test/r/ndb_autodiscover3.result
Normal file
@@ -0,0 +1,45 @@
|
||||
drop table if exists t1, t2;
|
||||
create table t1 (a int key) engine=ndbcluster;
|
||||
begin;
|
||||
insert into t1 values (1);
|
||||
insert into t1 values (2);
|
||||
ERROR HY000: Got temporary error 4025 'Node failure caused abort of transaction' from ndbcluster
|
||||
commit;
|
||||
ERROR HY000: Got error 4350 'Transaction already aborted' from ndbcluster
|
||||
drop table t1;
|
||||
create table t2 (a int, b int, primary key(a,b)) engine=ndbcluster;
|
||||
insert into t2 values (1,1),(2,1),(3,1),(4,1),(5,1),(6,1),(7,1),(8,1),(9,1),(10,1);
|
||||
select * from t2 order by a limit 3;
|
||||
a b
|
||||
1 1
|
||||
2 1
|
||||
3 1
|
||||
create table t2 (a int key) engine=ndbcluster;
|
||||
insert into t2 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
|
||||
select * from t2 order by a limit 3;
|
||||
a
|
||||
1
|
||||
2
|
||||
3
|
||||
select * from t2 order by a limit 3;
|
||||
ERROR HY000: Can't lock file (errno: 241)
|
||||
select * from t2 order by a limit 3;
|
||||
a
|
||||
1
|
||||
2
|
||||
3
|
||||
show tables;
|
||||
Tables_in_test
|
||||
create table t2 (a int key) engine=ndbcluster;
|
||||
insert into t2 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
|
||||
select * from t2 order by a limit 3;
|
||||
a
|
||||
1
|
||||
2
|
||||
3
|
||||
select * from t2 order by a limit 3;
|
||||
a
|
||||
1
|
||||
2
|
||||
3
|
||||
drop table t2;
|
||||
Binary file not shown.
@@ -94,8 +94,6 @@ create temporary table t102 (id int);
|
||||
set @session.pseudo_thread_id=200;
|
||||
create temporary table t201 (id int);
|
||||
create temporary table `#not_user_table_prefixed_with_hash_sign_no_harm` (id int);
|
||||
set @con1_id=connection_id();
|
||||
kill @con1_id;
|
||||
create table t1(f int);
|
||||
insert into t1 values (1);
|
||||
select * from t1 /* must be 1 */;
|
||||
|
||||
@@ -3427,3 +3427,22 @@ id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE A range PRIMARY PRIMARY 12 NULL 3 Using where
|
||||
1 SIMPLE B ref PRIMARY PRIMARY 8 const,test.A.e 10
|
||||
drop table t1, t2;
|
||||
CREATE TABLE t1 (a int PRIMARY KEY, b int, INDEX(b));
|
||||
INSERT INTO t1 VALUES (1, 3), (9,4), (7,5), (4,5), (6,2),
|
||||
(3,1), (5,1), (8,9), (2,2), (0,9);
|
||||
CREATE TABLE t2 (c int, d int, f int, INDEX(c,f));
|
||||
INSERT INTO t2 VALUES
|
||||
(1,0,0), (1,0,1), (2,0,0), (2,0,1), (3,0,0), (4,0,1),
|
||||
(5,0,0), (5,0,1), (6,0,0), (0,0,1), (7,0,0), (7,0,1),
|
||||
(0,0,0), (0,0,1), (8,0,0), (8,0,1), (9,0,0), (9,0,1);
|
||||
EXPLAIN
|
||||
SELECT a, c, d, f FROM t1,t2 WHERE a=c AND b BETWEEN 4 AND 6;
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 range PRIMARY,b b 5 NULL 3 Using where
|
||||
1 SIMPLE t2 ref c c 5 test.t1.a 2 Using where
|
||||
EXPLAIN
|
||||
SELECT a, c, d, f FROM t1,t2 WHERE a=c AND b BETWEEN 4 AND 6 AND a > 0;
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE t1 range PRIMARY,b b 5 NULL 3 Using where
|
||||
1 SIMPLE t2 ref c c 5 test.t1.a 2 Using where
|
||||
DROP TABLE t1, t2;
|
||||
|
||||
Reference in New Issue
Block a user