Below is the list of changes that have just been committed into a local
5.1 repository of alik. When alik does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2362 06/05/19 04:51:23 anozdrin@stripped +11 -0
Fix compilation problems on Windows and SUN Solaris.
server-tools/instance-manager/user_map.cc
1.17 06/05/19 04:51:19 anozdrin@stripped +1 -0
Fixed headers.
server-tools/instance-manager/user_management_commands.cc
1.2 06/05/19 04:51:19 anozdrin@stripped +0 -2
Removed unused variables.
server-tools/instance-manager/mysqlmanager.cc
1.18 06/05/19 04:51:19 anozdrin@stripped +2 -1
Fixed headers.
server-tools/instance-manager/instance_options.h
1.20 06/05/19 04:51:19 anozdrin@stripped +1 -0
Fixed headers.
server-tools/instance-manager/instance_map.h
1.20 06/05/19 04:51:19 anozdrin@stripped +1 -2
Replaced forward declaration of LEX_STRING because
it is not understood by all compilers.
server-tools/instance-manager/instance_map.cc
1.28 06/05/19 04:51:19 anozdrin@stripped +1 -2
1. Moved m_string.h to the header.
2. Use (const char *) to point to const C-string.
server-tools/instance-manager/commands.h
1.11 06/05/19 04:51:19 anozdrin@stripped +1 -1
Replaced forward declaration of LEX_STRING because
it is not understood by all compilers.
server-tools/instance-manager/commands.cc
1.35 06/05/19 04:51:19 anozdrin@stripped +0 -1
Moved m_string.h to the header.
server-tools/instance-manager/Makefile.am
1.36 06/05/19 04:51:19 anozdrin@stripped +0 -3
Removed gcc-specific flags.
server-tools/instance-manager/IMService.cpp
1.9 06/05/19 04:51:19 anozdrin@stripped +3 -4
Fixed.
include/m_string.h
1.43 06/05/19 04:51:19 anozdrin@stripped +9 -3
Fix declaration of C-structure for Visual Studio and Sun C-compiler.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: anozdrin
# Host: station.home
# Root: /mnt/raid/MySQL/devel/5.1-rt-wl3158
--- 1.42/include/m_string.h 2006-05-18 18:57:43 +04:00
+++ 1.43/include/m_string.h 2006-05-19 04:51:19 +04:00
@@ -247,13 +247,19 @@
}
#endif
-/* LEX_STRING */
+/*
+ LEX_STRING -- a pair of a C-string and its length.
-typedef struct LEX_STRING
+ NOTE: this exactly form of declaration is required for some C-compilers
+ (for one, Sun C 5.7 2005/01/07). Unfortunatelt with such declaration
+ LEX_STRING can not be forward declared.
+*/
+
+typedef struct
{
char *str;
uint length;
-};
+} LEX_STRING;
#define STRING_WITH_LEN(X) (X), ((uint) (sizeof(X) - 1))
#define C_STRING_WITH_SIZE(X) ((char *) (X)), ((uint) (sizeof(X) - 1))
--- 1.1/server-tools/instance-manager/user_management_commands.cc 2006-05-18 18:57:46 +04:00
+++ 1.2/server-tools/instance-manager/user_management_commands.cc 2006-05-19 04:51:19 +04:00
@@ -216,7 +216,6 @@
{
LEX_STRING user_name;
const char *password;
- char scrambled_password_buf[SCRAMBLED_PASSWORD_CHAR_LENGTH + 1];
User_map user_map;
User *new_user;
@@ -310,7 +309,6 @@
{
LEX_STRING user_name;
const char *password;
- char scrambled_password_buf[SCRAMBLED_PASSWORD_CHAR_LENGTH + 1];
User_map user_map;
User *user;
--- 1.35/server-tools/instance-manager/Makefile.am 2006-05-18 18:57:43 +04:00
+++ 1.36/server-tools/instance-manager/Makefile.am 2006-05-19 04:51:19 +04:00
@@ -93,9 +93,6 @@
EXTRA_DIST = WindowsService.cpp WindowsService.h IMService.cpp \
IMService.h cmakelists.txt
-AM_CFLAGS = -Werror
-AM_CXXFLAGS = -Werror
-
tags:
ctags -R *.h *.cc
--- 1.17/server-tools/instance-manager/mysqlmanager.cc 2006-05-18 18:57:44 +04:00
+++ 1.18/server-tools/instance-manager/mysqlmanager.cc 2006-05-19 04:51:19 +04:00
@@ -34,7 +34,8 @@
#include "user_management_commands.h"
#ifdef __WIN__
-#include "windowsservice.h"
+#include "IMService.h"
+#include "WindowsService.h"
#endif
--- 1.34/server-tools/instance-manager/commands.cc 2006-05-18 18:57:43 +04:00
+++ 1.35/server-tools/instance-manager/commands.cc 2006-05-19 04:51:19 +04:00
@@ -21,7 +21,6 @@
#include "commands.h"
#include <my_global.h>
-#include <m_string.h>
#include <m_ctype.h>
#include <mysql.h>
#include <my_dir.h>
--- 1.10/server-tools/instance-manager/commands.h 2006-05-18 18:57:43 +04:00
+++ 1.11/server-tools/instance-manager/commands.h 2006-05-19 04:51:19 +04:00
@@ -18,6 +18,7 @@
#include <my_global.h>
#include <my_sys.h>
+#include <m_string.h>
#include <hash.h>
#include "command.h"
@@ -28,7 +29,6 @@
#pragma interface
#endif
-struct LEX_STRING;
/*
Print all instances of this instance manager.
--- 1.27/server-tools/instance-manager/instance_map.cc 2006-05-18 18:57:43 +04:00
+++ 1.28/server-tools/instance-manager/instance_map.cc 2006-05-19 04:51:19 +04:00
@@ -23,7 +23,6 @@
#include <my_global.h>
#include <m_ctype.h>
#include <mysql_com.h>
-#include <m_string.h>
#include "buffer.h"
#include "guardian.h"
@@ -117,7 +116,7 @@
char *option_name_buf,
char *option_value_buf)
{
- char *eq_pos;
+ const char *eq_pos;
const char *ptr= option_str;
while (*ptr == '-')
--- 1.19/server-tools/instance-manager/instance_map.h 2006-05-18 18:57:43 +04:00
+++ 1.20/server-tools/instance-manager/instance_map.h 2006-05-19 04:51:19 +04:00
@@ -18,13 +18,12 @@
#include <my_global.h>
#include <my_sys.h>
+#include <m_string.h>
#include <hash.h>
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
#pragma interface
#endif
-
-struct LEX_STRING;
class Guardian_thread;
class Instance;
--- 1.19/server-tools/instance-manager/instance_options.h 2006-05-18 18:57:43 +04:00
+++ 1.20/server-tools/instance-manager/instance_options.h 2006-05-19 04:51:19 +04:00
@@ -20,6 +20,7 @@
#include <my_sys.h>
#include "parse.h"
+#include "portability.h" /* for pid_t on Win32 */
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
#pragma interface
--- 1.16/server-tools/instance-manager/user_map.cc 2006-05-18 18:57:44 +04:00
+++ 1.17/server-tools/instance-manager/user_map.cc 2006-05-19 04:51:19 +04:00
@@ -21,6 +21,7 @@
#include "user_map.h"
#include "exit_codes.h"
#include "log.h"
+#include "portability.h"
User::User(const LEX_STRING *user_name_arg, const char *password)
{
--- 1.8/server-tools/instance-manager/IMService.cpp 2006-05-18 18:57:43 +04:00
+++ 1.9/server-tools/instance-manager/IMService.cpp 2006-05-19 04:51:19 +04:00
@@ -30,15 +30,14 @@
// report to the SCM that we're about to start
ReportStatus((DWORD)SERVICE_START_PENDING);
- Options o;
- o.load(argc, argv);
+ Options::load(argc, argv);
// init goes here
ReportStatus((DWORD)SERVICE_RUNNING);
// wait for main loop to terminate
- manager(o);
- o.cleanup();
+ manager();
+ Options::cleanup();
}
void IMService::Log(const char *msg)
| Thread |
|---|
| • bk commit into 5.1 tree (anozdrin:1.2362) | Alexander Nozdrin | 19 May |
