mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875
into mysql.com:/home/bar/mysql-work/mysql-5.1.b28875
This commit is contained in:
@@ -731,6 +731,31 @@ DROP TABLE t1;
|
||||
# Check if using GROUP BY with TIME_FORMAT() produces correct results
|
||||
|
||||
SELECT TIME_FORMAT(SEC_TO_TIME(a),"%H:%i:%s") FROM (SELECT 3020399 AS a UNION SELECT 3020398 ) x GROUP BY 1;
|
||||
|
||||
#
|
||||
# Bug#28875 Conversion between ASCII and LATIN1 charsets does not function
|
||||
#
|
||||
set names latin1;
|
||||
create table t1 (a varchar(15) character set ascii not null);
|
||||
insert into t1 values ('070514-000000');
|
||||
# Conversion of date_format() result to ASCII
|
||||
# is safe with the default locale en_US
|
||||
--replace_column 1 #
|
||||
select concat(a,ifnull(min(date_format(now(), '%Y-%m-%d')),' ull')) from t1;
|
||||
# Error for swe7: it is not ASCII compatible
|
||||
set names swe7;
|
||||
--error 1267
|
||||
select concat(a,ifnull(min(date_format(now(), '%Y-%m-%d')),' ull')) from t1;
|
||||
set names latin1;
|
||||
# Conversion of date_format() result to ASCII
|
||||
# is not safe with the non-default locale fr_FR
|
||||
# because month and day names can have accented characters
|
||||
set lc_time_names=fr_FR;
|
||||
--error 1267
|
||||
select concat(a,ifnull(min(date_format(now(), '%Y-%m-%d')),' ull')) from t1;
|
||||
set lc_time_names=en_US;
|
||||
drop table t1;
|
||||
|
||||
--echo End of 5.0 tests
|
||||
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user