database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-09 11:41:36 +03:00
Code Activity

Post-merge fixes.

Browse Source
This commit is contained in:
unknown
2003-08-26 17:41:40 +02:00
parent 138f0adf2d
commit 55e776d145
17 changed files with 84 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/query_cache.result
View File

@@ -1248,10 +1248,10 @@ Variable_name Value
Qcache_queries_in_cache 0
show status like "Qcache_inserts";
Variable_name Value
Qcache_inserts 41
Qcache_inserts 1
show status like "Qcache_hits";
Variable_name Value
Qcache_hits 13
Qcache_hits 1
/**/ select * from t1;
a
/**/ select * from t1;
@@ -1261,8 +1261,8 @@ Variable_name Value
Qcache_queries_in_cache 1
show status like "Qcache_inserts";
Variable_name Value
Qcache_inserts 42
Qcache_inserts 2
show status like "Qcache_hits";
Variable_name Value
Qcache_hits 14
Qcache_hits 2
drop table t1;

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

@@ -29,10 +29,10 @@ drop table t1,t2;
CREATE TABLE t1 (
html varchar(5) default NULL,
rin int(11) default '0',
out int(11) default '0'
rout int(11) default '0'
) TYPE=MyISAM;
INSERT INTO t1 VALUES ('1',1,0);
SELECT DISTINCT html,SUM(out)/(SUM(rin)+1) as 'prod' FROM t1 GROUP BY rin;
SELECT DISTINCT html,SUM(rout)/(SUM(rin)+1) as 'prod' FROM t1 GROUP BY rin;
html prod
1 0.00
drop table t1;

2
mysql-test/r/sp-error.result
View File

@@ -35,7 +35,7 @@ call foo();
ERROR HY000: PROCEDURE foo does not exist
drop procedure if exists foo;
Warnings:
Warning 1272 PROCEDURE foo does not exist
Warning 1275 PROCEDURE foo does not exist
create procedure foo()
foo: loop
leave bar;

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

@@ -46,8 +46,6 @@ alter table t8 rename t7;
rename table t7 to t9;
drop table t1;
Got one of the listed errors
Warnings:
Note 1008 Can't drop database 'test_mysqltest'; database doesn't exist
Got one of the listed errors
Got one of the listed errors
Got one of the listed errors

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

@@ -311,7 +311,7 @@ set sql_log_bin=1;
set sql_log_off=1;
set sql_log_update=1;
Warnings:
Note 1282 The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored.
Note 1285 The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored.
set sql_low_priority_updates=1;
set sql_max_join_size=200;
select @@sql_max_join_size,@@max_join_size;