Commit 1fb23ad7 authored by unknown's avatar unknown
Browse files

Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug
parents 8a373fc3 83401c52

BUILD/SETUP.sh

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ SSL_LIBRARY=--with-openssl 
global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings"

#debug_extra_warnings="-Wuninitialized"

c_warnings="$global_warnings -Wunused"

cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder"

cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"

base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-partition $SSL_LIBRARY"

base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-partition $SSL_LIBRARY"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine --with-embedded-server --with-big-tables --with-partition $SSL_LIBRARY"

include/my_time.h

+15 −0
Original line number Diff line number Diff line
@@ -89,6 +89,21 @@ int my_date_to_str(const MYSQL_TIME *l_time, char *to); 
int my_datetime_to_str(const MYSQL_TIME *l_time, char *to);

int my_TIME_to_str(const MYSQL_TIME *l_time, char *to);



/*

  The following must be sorted so that simple intervals comes first.

  (get_interval_value() depends on this)

*/



enum interval_type

{

  INTERVAL_YEAR, INTERVAL_QUARTER, INTERVAL_MONTH, INTERVAL_DAY, INTERVAL_HOUR,

  INTERVAL_MINUTE, INTERVAL_WEEK, INTERVAL_SECOND, INTERVAL_MICROSECOND ,

  INTERVAL_YEAR_MONTH, INTERVAL_DAY_HOUR, INTERVAL_DAY_MINUTE,

  INTERVAL_DAY_SECOND, INTERVAL_HOUR_MINUTE, INTERVAL_HOUR_SECOND,

  INTERVAL_MINUTE_SECOND, INTERVAL_DAY_MICROSECOND, INTERVAL_HOUR_MICROSECOND,

  INTERVAL_MINUTE_MICROSECOND, INTERVAL_SECOND_MICROSECOND

};



C_MODE_END



#endif /* _my_time_h_ */

mysql-test/r/binlog_row_ctype_cp932.result

+1 −0
Original line number Diff line number Diff line
@@ -11366,3 +11366,4 @@ col1 
a

a

a

drop table t1;

mysql-test/t/disabled.def

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ partition_03ndb : Bug#16385 
ndb_binlog_basic   : Results are not deterministic, Tomas will fix

rpl_ndb_basic   : Bug#16228

rpl_sp          : Bug #16456

#ndb_dd_disk2memory : Bug #16466

ndb_dd_disk2memory : Bug #16466

ndb_autodiscover : Needs to be fixed w.r.t binlog

ndb_autodiscover2 : Needs to be fixed w.r.t binlog

system_mysql_db : Needs fixing

scripts/mysql_create_system_tables.sh

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ c_tzn="" c_tz="" c_tzt="" c_tztt="" c_tzls="" c_pl="" 
i_tzn="" i_tz="" i_tzt="" i_tztt="" i_tzls="" i_pl=""

c_p="" c_pp=""

c_gl="" c_sl=""

c_ev= ""



# Check for old tables

if test ! -f $mdata/db.frm