Commit a366a0d1 authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 

into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3120
parents eed990d6 ca2f6cbd

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ bar@mysql.com 
bell@laptop.sanja.is.com.ua

bell@sanja.is.com.ua

bk@admin.bk

brian@brian-akers-computer.local

carsten@tsort.bitbybit.dk

davida@isil.mysql.com

dlenev@brandersnatch.localdomain

client/mysql.cc

+1 −0
Original line number Diff line number Diff line
@@ -689,6 +689,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
      while (*argument) *argument++= 'x';		// Destroy argument

      if (*start)

	start[1]=0 ;

      tty_password= 0;

    }

    else

      tty_password= 1;

sql/repl_failsafe.cc

+0 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



// Sasha Pachev <sasha@mysql.com> is currently in charge of this file



#include "mysql_priv.h"

#include "repl_failsafe.h"

#include "sql_repl.h"

sql/repl_failsafe.h

+16 −0
Original line number Diff line number Diff line 
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB & Sasha



   This program is free software; you can redistribute it and/or modify

   it under the terms of the GNU General Public License as published by

   the Free Software Foundation; either version 2 of the License, or

   (at your option) any later version.



   This program is distributed in the hope that it will be useful,

   but WITHOUT ANY WARRANTY; without even the implied warranty of

   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

   GNU General Public License for more details.



   You should have received a copy of the GNU General Public License

   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



#ifndef REPL_FAILSAFE_H

#define REPL_FAILSAFE_H

sql/slave.h

+16 −0
Original line number Diff line number Diff line 
/* Copyright (C) 2000-2003 MySQL AB

   

   This program is free software; you can redistribute it and/or modify

   it under the terms of the GNU General Public License as published by

   the Free Software Foundation; either version 2 of the License, or

   (at your option) any later version.

   

   This program is distributed in the hope that it will be useful,

   but WITHOUT ANY WARRANTY; without even the implied warranty of

   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

   GNU General Public License for more details.

   

   You should have received a copy of the GNU General Public License

   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



#ifndef SLAVE_H

#define SLAVE_H