diff options
| author | unknown <msvensson@shellback.(none)> | 2006-10-14 19:55:06 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-10-14 19:55:06 +0200 |
| commit | b2bf4843c71d90f698f431ff4de0e4cf2bc9fdca (patch) | |
| tree | b1cd0e654e2c0f0d79c0d78077202a716a57b267 /mysql-test/t/func_time.test | |
| parent | 591d09a9609f26b44176cf6d33cbca1f8b41ac99 (diff) | |
| parent | 9a506df0c2f831ed91a6ca4dea9f44982f28f2f7 (diff) | |
| download | mariadb-git-b2bf4843c71d90f698f431ff4de0e4cf2bc9fdca.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
include/my_dbug.h:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/csv.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/csv.test:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
mysql-test/r/innodb_mysql.result:
Manual merge
mysql-test/t/func_time.test:
Manual merge, test already there
mysql-test/t/innodb_mysql.test:
Manual merge
Diffstat (limited to 'mysql-test/t/func_time.test')
| -rw-r--r-- | mysql-test/t/func_time.test | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test index e76afebf778..ae3811a3257 100644 --- a/mysql-test/t/func_time.test +++ b/mysql-test/t/func_time.test @@ -488,8 +488,6 @@ DROP TABLE t1; # # check if SEC_TO_TIME() handles BIGINT UNSIGNED values correctly SELECT SEC_TO_TIME(CAST(-1 AS UNSIGNED)); - -# # 21913: DATE_FORMAT() Crashes mysql server if I use it through # mysql-connector-j driver. # |