diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index e4648f7d849..b48e861f6df 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -95,6 +95,7 @@ miguel@hegel.(none) miguel@hegel.br miguel@hegel.local miguel@hegel.txg +miguel@hegel.txg.br miguel@light. miguel@light.local miguel@sartre.local diff --git a/sql/examples/ha_tina.cc b/sql/examples/ha_tina.cc index 728af469bb0..06a19e478ae 100644 --- a/sql/examples/ha_tina.cc +++ b/sql/examples/ha_tina.cc @@ -43,6 +43,9 @@ TODO: #endif #include "mysql_priv.h" + +#ifdef HAVE_CSV_DB + #include "ha_tina.h" #include <sys/mman.h> @@ -844,3 +847,5 @@ int ha_tina::create(const char *name, TABLE *table_arg, HA_CREATE_INFO *create_i DBUG_RETURN(0); } + +#endif /* enable CSV */ diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 73aec7e8bdd..5d9a6dd9490 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -113,10 +113,15 @@ static bool make_datetime(date_time_format_types format, TIME *ltime, } -/* Date formats corresponding to compound %r and %T conversion specifiers */ -static DATE_TIME_FORMAT time_ampm_format= {{}, '\0', 0, +/* + Date formats corresponding to compound %r and %T conversion specifiers + + Note: We should init at least first element of "positions" array + (first member) or hpux11 compiler will die horribly. +*/ +static DATE_TIME_FORMAT time_ampm_format= {{0}, '\0', 0, {(char *)"%I:%i:%S %p", 11}}; -static DATE_TIME_FORMAT time_24hrs_format= {{}, '\0', 0, +static DATE_TIME_FORMAT time_24hrs_format= {{0}, '\0', 0, {(char *)"%H:%i:%S", 8}}; /* diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 82fef3f7c7b..3b12cbe3422 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -560,7 +560,6 @@ int mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent) char path[FN_REFLEN+16], tmp_db[NAME_LEN+1]; MY_DIR *dirp; uint length; - my_dbopt_t *dbopt; DBUG_ENTER("mysql_rm_db"); VOID(pthread_mutex_lock(&LOCK_mysql_create_db));