Commit ec83dd7c authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/mysql-4.1-10418
parents dd934da9 bc1815aa

mysql-test/r/func_time.result

+4 −0
Original line number Diff line number Diff line
@@ -626,3 +626,7 @@ last_day('2005-01-00') 
NULL

Warnings:

Warning	1292	Truncated incorrect datetime value: '2005-01-00'

select monthname(str_to_date(null, '%m')), monthname(str_to_date(null, '%m')),

monthname(str_to_date(1, '%m')), monthname(str_to_date(0, '%m'));

monthname(str_to_date(null, '%m'))	monthname(str_to_date(null, '%m'))	monthname(str_to_date(1, '%m'))	monthname(str_to_date(0, '%m'))

NULL	NULL	January	NULL

mysql-test/t/func_time.test

+7 −0
Original line number Diff line number Diff line
@@ -315,4 +315,11 @@ select last_day('2005-00-00'); 
select last_day('2005-00-01');

select last_day('2005-01-00');



#

# Bug #18501: monthname and NULLs

#



select monthname(str_to_date(null, '%m')), monthname(str_to_date(null, '%m')),

       monthname(str_to_date(1, '%m')), monthname(str_to_date(0, '%m'));



# End of 4.1 tests

ndb/src/kernel/blocks/dbtc/DbtcInit.cpp

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ Dbtc::Dbtc(const class Configuration & conf): 


  ndb_mgm_get_int_parameter(p, CFG_DB_TRANS_BUFFER_MEM,  

			    &transactionBufferMemory);

  ndb_mgm_get_int_parameter(p, CFG_DB_NO_UNIQUE_HASH_INDEXES, 

  ndb_mgm_get_int_parameter(p, CFG_DICT_TABLE,

			    &maxNoOfIndexes);

  ndb_mgm_get_int_parameter(p, CFG_DB_NO_INDEX_OPS, 

			    &maxNoOfConcurrentIndexOperations);

sql/item_timefunc.cc

+2 −2
Original line number Diff line number Diff line
@@ -906,9 +906,9 @@ String* Item_func_monthname::val_str(String* str) 
{

  DBUG_ASSERT(fixed == 1);

  const char *month_name;

  uint   month=(uint) Item_func_month::val_int();

  uint   month= (uint) val_int();



  if (!month)					// This is also true for NULL

  if (null_value || !month)

  {

    null_value=1;

    return (String*) 0;

support-files/mysql.spec.sh

+8 −1
Original line number Diff line number Diff line
@@ -239,7 +239,6 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \ 
            --with-mysqld-user=%{mysqld_user} \

            --with-unix-socket-path=/var/lib/mysql/mysql.sock \

            --prefix=/ \

	    --with-extra-charsets=complex \

            --exec-prefix=%{_exec_prefix} \

            --libexecdir=%{_sbindir} \

            --libdir=%{_libdir} \
@@ -297,6 +296,7 @@ then 
fi



BuildMySQL "--enable-shared \

		--with-extra-charsets=all \

		--with-berkeley-db \

		--with-innodb \

		--with-ndbcluster \
@@ -361,6 +361,7 @@ BuildMySQL "--disable-shared \ 
%else

		--with-zlib-dir=bundled \

%endif

		--with-extra-charsets=complex \

		--with-comment=\"MySQL Community Edition - Standard (GPL)\" \

		--with-server-suffix='%{server_suffix}' \

		--without-embedded-server \
@@ -708,6 +709,12 @@ fi 
# itself - note that they must be ordered by date (important when

# merging BK trees)

%changelog 

* Wed May 10 2006 Kent Boortz <kent@mysql.com>



- Use character set "all" for the "max", to make Cluster nodes

  independent on the character set directory, and the problem that

  two RPM sub packages both wants to install this directory.



* Mon May 01 2006 Kent Boortz <kent@mysql.com>



- Use "./libtool --mode=execute" instead of searching for the