mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bk-internal:/home/bk/mysql-maria

Browse source 
into  mysql.com:/data0/mysqldev/my/build-200802121236-5.1.23a-maria-alpha/mysql-5.1-release
This commit is contained in:
unknown 2008-02-19 23:27:00 +01:00
commit 0000ef5ed8
8 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/get_password.c
View file

@ -107,7 +107,7 @@ char *get_tty_password(const char *opt_message)
* to will not include the eol characters.
*/
static void get_password(char *to,uint length,int fd,bool echo)
static void get_password(char *to,uint length,int fd, my_bool echo)
{
char *pos=to,*end=to+length;

8
dbug/dbug.c
View file

@ -1979,13 +1979,7 @@ static void DBUGOpenFile(CODE_STATE *cs,
else
{
newfile= !EXISTS(name);
if (!(fp= fopen(name,
#if defined(MSDOS) || defined(__WIN__)
append ? "a+c" : "wc"
#else
append ? "a+" : "w"
#endif
)))
if (!(fp= fopen(name, append ? "a+" : "w")))
{
(void) fprintf(stderr, ERR_OPEN, cs->process, name);
perror("");

1
include/config-win.h
View file

@ -168,6 +168,7 @@ typedef uint rf_SetTimer;
#define Socket_defined
#define my_socket SOCKET
#define bool BOOL
#define SIGPIPE SIGINT
#define RETQSORTTYPE void
#define QSORT_TYPE_IS_VOID

2
include/thr_alarm.h
View file

@ -98,7 +98,7 @@ void thr_end_alarm(thr_alarm_t *alarmed);
void end_thr_alarm(my_bool free_structures);
sig_handler process_alarm(int);
#ifndef thr_got_alarm
bool thr_got_alarm(thr_alarm_t *alrm);
my_bool thr_got_alarm(thr_alarm_t *alrm);
#endif

2
libmysql/dll.c
View file

@ -25,7 +25,7 @@
#include <my_sys.h>
#include <my_pthread.h>
static bool libmysql_inited=0;
static my_bool libmysql_inited=0;
void libmysql_init(void)
{

2
libmysql/get_password.c
View file

@ -118,7 +118,7 @@ char *get_tty_password(const char *opt_message)
to will not include the eol characters.
*/
static void get_password(char *to,uint length,int fd,bool echo)
static void get_password(char *to,uint length,int fd, my_bool echo)
{
char *pos=to,*end=to+length;

2
mysys/thr_alarm.c
View file

@ -632,7 +632,7 @@ my_bool thr_alarm(thr_alarm_t *alrm, uint sec, ALARM *alarm)
}
bool thr_got_alarm(thr_alarm_t *alrm_ptr)
my_bool thr_got_alarm(thr_alarm_t *alrm_ptr)
{
thr_alarm_t alrm= *alrm_ptr;
MSG msg;

5
storage/maria/unittest/ma_test_loghandler-t.c
View file

@ -151,6 +151,11 @@ int main(int argc __attribute__((unused)), char *argv[])
MY_INIT(argv[0]);
if (my_set_max_open_files(100) < 100)
{
fprintf(stderr, "can't allocate 100 file descriptors\n");
exit(1);
}
bzero(&pagecache, sizeof(pagecache));
maria_data_root= (char *)".";
if (maria_log_remove())