Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/cps/mysql/trees/mysql-5.0

Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
f3fe3b8d · unknown · 429abab6 · 1b05eec8 · f3fe3b8d · f3fe3b8d
Commit f3fe3b8d authored Oct 07, 2005 by unknown
Showing with 2 additions and 2 deletions

server-tools/instance-manager/mysql_connection.cc server-tools/instance-manager/mysql_connection.cc +1 -1

server-tools/instance-manager/user_map.cc server-tools/instance-manager/user_map.cc +1 -1

No files found.
--- a/server-tools/instance-manager/mysql_connection.cc
+++ b/server-tools/instance-manager/mysql_connection.cc
@@ -15,7 +15,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

 #if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
-#pragma interface
+#pragma implementation
 #endif

 #include "mysql_connection.h"

--- a/server-tools/instance-manager/user_map.cc
+++ b/server-tools/instance-manager/user_map.cc
@@ -15,7 +15,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

 #if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
-#pragma interface
+#pragma implementation
 #endif

 #include "user_map.h"