Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
This commit is contained in:
commit
dad1e2048d
@ -15,7 +15,7 @@
|
|||||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
||||||
|
|
||||||
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
|
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
|
||||||
#pragma interface
|
#pragma implementation
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "mysql_connection.h"
|
#include "mysql_connection.h"
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
||||||
|
|
||||||
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
|
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
|
||||||
#pragma interface
|
#pragma implementation
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "user_map.h"
|
#include "user_map.h"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user