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

Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean

Browse Source 
into  hh-nb.hungers:/work/merge/mysql-5.1-build


BitKeeper/etc/ignore:
  auto-union
mysql-test/t/disabled.def:
  Auto merged
BitKeeper/deleted/.del-group_concat_max_len_func.result:
  Delete: mysql-test/r/group_concat_max_len_func.result
BitKeeper/deleted/.del-group_concat_max_len_func.test:
  Delete: mysql-test/t/group_concat_max_len_func.test
BitKeeper/deleted/.del-max_allowed_packet_func.test:
  Delete: mysql-test/t/max_allowed_packet_func.test
This commit is contained in:
unknown
2008-04-23 11:59:31 +02:00
parent adf397e708 9fd9785a4a
commit 7875d9241c
7 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,4 @@
SET @save = @@global.group_concat_max_len;
drop table if exists t1;
## Creating new table t1 ##
CREATE TABLE t1
@@ -75,3 +76,4 @@ id rollno group_concat(name)
## Dropping table t1 ##
DROP table t1;
## Disconnecting both the connection ##
SET @@group_concat_max_len = @save;

12
mysql-test/r/timestamp_func.result
View File

@@ -7,18 +7,18 @@
SET @ts_old = @@SESSION.timestamp;
waiting 1 sec
SET @ts_new = @@SESSION.timestamp;
SELECT @ts_new - @ts_old AS 'Timestamp Difference';
SELECT @ts_new - @ts_old >= 1 AS 'Timestamp Difference';
Timestamp Difference
1
1 Expected
1 means >=1 expected is true
** Connection con1 **
SET @ts_old = @@SESSION.timestamp;
waiting 4 sec
SET @ts_new = @@SESSION.timestamp;
SELECT @ts_new - @ts_old AS 'Timestamp Difference';
SELECT @ts_new - @ts_old >= 4 AS 'Timestamp Difference';
Timestamp Difference
4
4 Expected
1
1 means >=4 expected is true
'#-----------------------------FN_DYNVARS_179_02---------------------#'
SET @ts_old = @@SESSION.timestamp;
Changing time zone
@@ -27,7 +27,7 @@ SET @ts_new = @@SESSION.timestamp;
SELECT @ts_new - @ts_old >= 1 AS 'Timestamp Difference';
Timestamp Difference
1
>=1 Expected
1 means >=1 expected is true
** Cleanup **
** Connection default **
Disconnecting Connections con0, con1