diff options
| author | Andi Gutmans <andi@php.net> | 2000-08-22 17:59:35 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2000-08-22 17:59:35 +0000 |
| commit | 0222b7ab416d845abcd3925b3da47fa2d7ed238d (patch) | |
| tree | 38cbb73fda38196612fddffda4d803003a86b568 /ext/mysql/libmysql/my_fopen.c | |
| parent | 60676f19a5f5425c4375d8ba60e8bd07016ba562 (diff) | |
| download | php-git-0222b7ab416d845abcd3925b3da47fa2d7ed238d.tar.gz | |
- Try and revert libmysql for 4.0.2
Diffstat (limited to 'ext/mysql/libmysql/my_fopen.c')
| -rw-r--r-- | ext/mysql/libmysql/my_fopen.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/ext/mysql/libmysql/my_fopen.c b/ext/mysql/libmysql/my_fopen.c index b2e9951879..f22f492b4f 100644 --- a/ext/mysql/libmysql/my_fopen.c +++ b/ext/mysql/libmysql/my_fopen.c @@ -1,19 +1,5 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ +/* Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB + This file is public domain and comes with NO WARRANTY of any kind */ #include "mysys_priv.h" #include "my_static.h" @@ -63,8 +49,7 @@ FILE *my_fopen(const char *FileName, int Flags, myf MyFlags) my_errno=errno; DBUG_PRINT("error",("Got error %d on open",my_errno)); if (MyFlags & (MY_FFNF | MY_FAE | MY_WME)) - my_error((Flags & O_RDONLY) || (Flags == O_RDONLY ) ? EE_FILENOTFOUND : - EE_CANTCREATEFILE, + my_error(Flags & O_RDONLY ? EE_FILENOTFOUND : EE_CANTCREATEFILE, MYF(ME_BELL+ME_WAITTANG), FileName,my_errno); DBUG_RETURN((FILE*) 0); } /* my_fopen */ |