database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +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

1
.bzrignore
View File

@@ -1324,6 +1324,7 @@ mysql-test/r/im_client_port.log
mysql-test/r/index_merge_load.result mysql-test/r/index_merge_load.result
mysql-test/r/isam.err mysql-test/r/isam.err
mysql-test/r/lowercase_table2.err mysql-test/r/lowercase_table2.err
mysql-test/r/max_allowed_packet_func.result
mysql-test/r/multi_update.err mysql-test/r/multi_update.err
mysql-test/r/mysql_protocols.err mysql-test/r/mysql_protocols.err
mysql-test/r/mysqlbinlog.err mysql-test/r/mysqlbinlog.err

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; drop table if exists t1;
## Creating new table t1 ## ## Creating new table t1 ##
CREATE TABLE t1 CREATE TABLE t1
@@ -75,3 +76,4 @@ id rollno group_concat(name)
## Dropping table t1 ## ## Dropping table t1 ##
DROP table t1; DROP table t1;
## Disconnecting both the connection ## ## 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; SET @ts_old = @@SESSION.timestamp;
waiting 1 sec waiting 1 sec
SET @ts_new = @@SESSION.timestamp; SET @ts_new = @@SESSION.timestamp;
SELECT @ts_new - @ts_old AS 'Timestamp Difference'; SELECT @ts_new - @ts_old >= 1 AS 'Timestamp Difference';
Timestamp Difference Timestamp Difference
1 1
1 Expected 1 means >=1 expected is true
** Connection con1 ** ** Connection con1 **
SET @ts_old = @@SESSION.timestamp; SET @ts_old = @@SESSION.timestamp;
waiting 4 sec waiting 4 sec
SET @ts_new = @@SESSION.timestamp; SET @ts_new = @@SESSION.timestamp;
SELECT @ts_new - @ts_old AS 'Timestamp Difference'; SELECT @ts_new - @ts_old >= 4 AS 'Timestamp Difference';
Timestamp Difference Timestamp Difference
4 1
4 Expected 1 means >=4 expected is true
'#-----------------------------FN_DYNVARS_179_02---------------------#' '#-----------------------------FN_DYNVARS_179_02---------------------#'
SET @ts_old = @@SESSION.timestamp; SET @ts_old = @@SESSION.timestamp;
Changing time zone Changing time zone
@@ -27,7 +27,7 @@ SET @ts_new = @@SESSION.timestamp;
SELECT @ts_new - @ts_old >= 1 AS 'Timestamp Difference'; SELECT @ts_new - @ts_old >= 1 AS 'Timestamp Difference';
Timestamp Difference Timestamp Difference
1 1
>=1 Expected 1 means >=1 expected is true
** Cleanup ** ** Cleanup **
** Connection default ** ** Connection default **
Disconnecting Connections con0, con1 Disconnecting Connections con0, con1

1
mysql-test/t/disabled.def
View File

@@ -21,4 +21,5 @@ ps_ddl : Bug#12093 2007-12-14 pending WL#4165 / WL#4166
csv_alter_table : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables csv_alter_table : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
event_scheduler_basic: BUG#35997 server seems to crash. event_scheduler_basic: BUG#35997 server seems to crash.
event_scheduler_func: BUG#35997 server seems to crash. event_scheduler_func: BUG#35997 server seems to crash.
thread_cache_size_func: BUG#35988 Due to not deterministic results

4
mysql-test/t/group_concat_max_len_func.test
View File

@@ -19,6 +19,7 @@
# # # #
############################################################################### ###############################################################################
SET @save = @@global.group_concat_max_len;
--disable_warnings --disable_warnings
drop table if exists t1; drop table if exists t1;
@@ -124,4 +125,7 @@ DROP table t1;
DISCONNECT test_con2; DISCONNECT test_con2;
DISCONNECT test_con1; DISCONNECT test_con1;
connection default;
SET @@group_concat_max_len = @save;

2
mysql-test/t/max_allowed_packet_func.test
View File

@@ -19,6 +19,8 @@
# # # #
############################################################################### ###############################################################################
#due to lost connection on win64
--source include/not_windows.inc
let $start_global_value = `SELECT @@global.max_allowed_packet`; let $start_global_value = `SELECT @@global.max_allowed_packet`;
--echo $start_global_value --echo $start_global_value

10
mysql-test/t/timestamp_func.test
View File

@@ -38,8 +38,8 @@ SET @ts_old = @@SESSION.timestamp;
--echo waiting 1 sec --echo waiting 1 sec
--sleep 1 --sleep 1
SET @ts_new = @@SESSION.timestamp; SET @ts_new = @@SESSION.timestamp;
SELECT @ts_new - @ts_old AS 'Timestamp Difference'; SELECT @ts_new - @ts_old >= 1 AS 'Timestamp Difference';
--echo 1 Expected --echo 1 means >=1 expected is true
# #
@@ -51,8 +51,8 @@ SET @ts_old = @@SESSION.timestamp;
--echo waiting 4 sec --echo waiting 4 sec
--sleep 4 --sleep 4
SET @ts_new = @@SESSION.timestamp; SET @ts_new = @@SESSION.timestamp;
SELECT @ts_new - @ts_old AS 'Timestamp Difference'; SELECT @ts_new - @ts_old >= 4 AS 'Timestamp Difference';
--echo 4 Expected --echo 1 means >=4 expected is true
--echo '#-----------------------------FN_DYNVARS_179_02---------------------#' --echo '#-----------------------------FN_DYNVARS_179_02---------------------#'
# #
@@ -65,7 +65,7 @@ SET @ts_old = @@SESSION.timestamp;
SET time_zone = 'MET'; SET time_zone = 'MET';
SET @ts_new = @@SESSION.timestamp; SET @ts_new = @@SESSION.timestamp;
SELECT @ts_new - @ts_old >= 1 AS 'Timestamp Difference'; SELECT @ts_new - @ts_old >= 1 AS 'Timestamp Difference';
--echo >=1 Expected --echo 1 means >=1 expected is true
# #
# Cleanup # Cleanup