Commit 567d754e authored by unknown's avatar unknown
Browse files

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

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
parents 80251335 21a264cc

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -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

sql/examples/ha_tina.cc

+5 −0
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ 
#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 */

sql/item_timefunc.cc

+8 −3
Original line number Diff line number Diff line
@@ -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}};



/*

sql/sql_db.cc

+0 −1
Original line number Diff line number Diff line
@@ -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));