database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1


sql/ha_ndbcluster.cc:
  Auto merged
This commit is contained in:
unknown
2005-06-20 09:37:31 +02:00
parent 5b50ea27ad 34dc6ac352
commit f258d561eb
21 changed files with 274 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/bdb_cache.result
View File

@ -12,10 +12,9 @@ show status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 0
drop table t1;
commit;
set autocommit=1;
begin;
create table t1 (a int not null) engine=bdb;
begin;
insert into t1 values (1),(2),(3);
select * from t1;
a
@ -26,7 +25,6 @@ show status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 0
drop table t1;
commit;
create table t1 (a int not null) engine=bdb;
create table t2 (a int not null) engine=bdb;
create table t3 (a int not null) engine=bdb;

2
mysql-test/r/ps_grant.result
View File

@ -78,4 +78,4 @@ drop database mysqltest;
prepare stmt4 from ' show full processlist ';
execute stmt4;
Id User Host db Command Time State Info
number root localhost test Query time NULL show full processlist
number root localhost test Execute time NULL show full processlist

585
mysql-test/r/rpl_ddl.result
View File

File diff suppressed because it is too large Load Diff