diff options
Diffstat (limited to 'libmysqld/libmysqld.c')
-rw-r--r-- | libmysqld/libmysqld.c | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index 49f467da601..82928434cc6 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -1,19 +1,18 @@ -/* 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, +/* Copyright (C) 2000 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 - 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 */ + 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 */ #include "embedded_priv.h" #include <my_sys.h> @@ -971,9 +970,9 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, } if (my_net_write(net,buff,(ulong) (end-buff)) || net_flush(net)) goto error; - + lib_connection_phase(net,2); - + if( net_safe_read(mysql) == packet_error) goto error; if (db && mysql_select_db(mysql,db)) @@ -2090,7 +2089,3 @@ myodbc_remove_escape(MYSQL *mysql,char *name) } *to=0; } - - - - |