Commit f5a8a364 authored by unknown's avatar unknown
Browse files

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  clam.ndb.mysql.com:/space/pekka/ndb/version/my41
parents f260771d 184ff212

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1058,3 +1058,4 @@ vio/test-sslclient 
vio/test-sslserver

vio/viotest-ssl

libmysql/libmysql.ver

libmysqld/sql_locale.cc

libmysqld/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ 
	key.cc lock.cc log.cc log_event.cc sql_state.c \

	protocol.cc net_serv.cc opt_range.cc \

	opt_sum.cc procedure.cc records.cc sql_acl.cc \

	sql_load.cc discover.cc \

	sql_load.cc discover.cc sql_locale.cc \

	sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \

	sql_crypt.cc sql_db.cc sql_delete.cc sql_error.cc sql_insert.cc \

	sql_lex.cc sql_list.cc sql_manager.cc sql_map.cc sql_parse.cc \

mysql-test/r/date_formats.result

+16 −0
Original line number Diff line number Diff line
@@ -456,6 +456,22 @@ f1 f2 
Warnings:

Warning	1292	Truncated incorrect date value: '2003-04-05  g'

Warning	1292	Truncated incorrect datetime value: '2003-04-05 10:11:12.101010234567'

set names latin1;

select date_format('2004-01-01','%W (%a), %e %M (%b) %Y');

date_format('2004-01-01','%W (%a), %e %M (%b) %Y')

Thursday (Thu), 1 January (Jan) 2004

set lc_time_names=ru_RU;

set names koi8r;

select date_format('2004-01-01','%W (%a), %e %M (%b) %Y');

date_format('2004-01-01','%W (%a), %e %M (%b) %Y')

 (), 1  () 2004

set lc_time_names=de_DE;

set names latin1;

select date_format('2004-01-01','%W (%a), %e %M (%b) %Y');

date_format('2004-01-01','%W (%a), %e %M (%b) %Y')

Donnerstag (Do), 1 Januar (Jan) 2004

set names latin1;

set lc_time_names=en_US;

create table t1 (f1 datetime);

insert into t1 (f1) values ("2005-01-01");

insert into t1 (f1) values ("2005-02-01");

mysql-test/t/date_formats.test

+14 −0
Original line number Diff line number Diff line
@@ -260,6 +260,20 @@ select str_to_date("2003-04-05 g", "%Y-%m-%d") as f1, 
       str_to_date("2003-04-05 10:11:12.101010234567", "%Y-%m-%d %H:%i:%S.%f") as f2;

--enable_ps_protocol



#

# Test of locale dependent date format (WL#2928 Date Translation NRE)

#

set names latin1;

select date_format('2004-01-01','%W (%a), %e %M (%b) %Y');

set lc_time_names=ru_RU;

set names koi8r;

select date_format('2004-01-01','%W (%a), %e %M (%b) %Y');

set lc_time_names=de_DE;

set names latin1;

select date_format('2004-01-01','%W (%a), %e %M (%b) %Y');

set names latin1;

set lc_time_names=en_US;



#

# Bug #14016 

#

sql/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \ 
			mysqld.cc password.c hash_filo.cc hostname.cc \

			set_var.cc sql_parse.cc sql_yacc.yy \

			sql_base.cc table.cc sql_select.cc sql_insert.cc \

                        sql_prepare.cc sql_error.cc \

                        sql_prepare.cc sql_error.cc sql_locale.cc \

			sql_update.cc sql_delete.cc uniques.cc sql_do.cc \

			procedure.cc item_uniq.cc sql_test.cc \

			log.cc log_event.cc init.cc derror.cc sql_acl.cc \