Skip to content

M
mariadb
Commit 63e7824f authored by unknown's avatar unknown
Browse files
Options

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

into  mysql.com:/home/cps/mysql/trees/mysql-5.0
parents 7d3044fc 9cf3d4b4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
server-tools/instance-manager/mysql_connection.cc
View file @ 63e7824f
...@@ -15,7 +15,7 @@ ...@@ -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"
......
server-tools/instance-manager/user_map.cc
View file @ 63e7824f
...@@ -15,7 +15,7 @@ ...@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7