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.2161 06/05/18 15:49:44 anozdrin@stripped +11 -0
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/mnt/raid/MySQL/devel/5.1-wl3158
server-tools/instance-manager/Makefile.am
1.36 06/05/18 15:49:41 anozdrin@stripped +1 -1
Merged.
mysql-test/r/im_utils.result
1.6 06/05/18 15:48:38 anozdrin@stripped +0 -0
Auto merged
sql/structs.h
1.60 06/05/18 15:48:38 anozdrin@stripped +0 -0
Auto merged
sql/sp_head.cc
1.221 06/05/18 15:48:38 anozdrin@stripped +0 -0
Auto merged
sql/sp.cc
1.110 06/05/18 15:48:38 anozdrin@stripped +0 -0
Auto merged
mysql-test/r/im_utils.result
1.3.1.2 06/05/18 15:48:38 anozdrin@stripped +0 -0
Change mode to -rw-rw-r--
mysql-test/r/im_life_cycle.result
1.8 06/05/18 15:48:36 anozdrin@stripped +0 -0
Auto merged
mysql-test/r/im_life_cycle.result
1.5.1.2 06/05/18 15:48:36 anozdrin@stripped +0 -0
Change mode to -rw-rw-r--
mysql-test/r/im_daemon_life_cycle.result
1.3 06/05/18 15:48:33 anozdrin@stripped +0 -0
Auto merged
mysql-test/r/im_daemon_life_cycle.result
1.1.1.2 06/05/18 15:48:33 anozdrin@stripped +0 -0
Change mode to -rw-rw-r--
BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f
1.4 06/05/18 15:48:31 anozdrin@stripped +0 -0
Auto merged
mysql-test/mysql-test-run.pl
1.115 06/05/18 15:48:31 anozdrin@stripped +0 -0
Auto merged
include/my_sys.h
1.195 06/05/18 15:48:31 anozdrin@stripped +0 -0
Auto merged
BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f
1.3 06/05/18 15:48:31 anozdrin@stripped +0 -0
Change mode to -rw-rw-r--
BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921
1.4 06/05/18 15:48:29 anozdrin@stripped +0 -0
Auto merged
BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921
1.3 06/05/18 15:48:29 anozdrin@stripped +0 -0
Change mode to -rw-rw-r--
BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f
1.1.1.2 06/05/18 15:43:47 anozdrin@stripped +0 -0
Merge rename: mysql-test/r/im_options_unset.result -> BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f
BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921
1.1.1.2 06/05/18 15:43:47 anozdrin@stripped +0 -0
Merge rename: mysql-test/r/im_options_set.result -> BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921
# 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-wl3158/RESYNC
--- 1.194/include/my_sys.h 2006-05-16 16:16:18 +04:00
+++ 1.195/include/my_sys.h 2006-05-18 15:48:31 +04:00
@@ -77,6 +77,10 @@
#define MY_GIVE_INFO 2 /* Give time info about process*/
#define MY_DONT_FREE_DBUG 4 /* Do not call DBUG_END() in my_end() */
+#define MY_REMOVE_NONE 0 /* Params for modify_defaults_file */
+#define MY_REMOVE_OPTION 1
+#define MY_REMOVE_SECTION 2
+
#define ME_HIGHBYTE 8 /* Shift for colours */
#define ME_NOCUR 1 /* Don't use curses message */
#define ME_OLDWIN 2 /* Use old window */
--- 1.59/sql/structs.h 2006-05-03 16:59:12 +04:00
+++ 1.60/sql/structs.h 2006-05-18 15:48:38 +04:00
@@ -20,22 +20,6 @@
struct st_table;
class Field;
-typedef struct st_lex_string
-{
- char *str;
- uint length;
-} LEX_STRING;
-
-typedef struct st_lex_string_with_init :public st_lex_string
-{
- st_lex_string_with_init(const char *str_arg, uint length_arg)
- {
- str= (char*) str_arg;
- length= length_arg;
- }
-} LEX_STRING_WITH_INIT;
-
-
typedef struct st_date_time_format {
uchar positions[8];
char time_separator; /* Separator between hour and minute */
--- 1.114/mysql-test/mysql-test-run.pl 2006-05-12 14:31:59 +04:00
+++ 1.115/mysql-test/mysql-test-run.pl 2006-05-18 15:48:31 +04:00
@@ -1219,8 +1219,11 @@
$ENV{'NDBCLUSTER_PORT_SLAVE'}=$opt_ndbcluster_port_slave;
$ENV{'NDB_STATUS_OK'}= "YES";
+ $ENV{'IM_EXE'}= $exe_im;
$ENV{'IM_PATH_PID'}= $instance_manager->{path_pid};
$ENV{'IM_PORT'}= $instance_manager->{port};
+ $ENV{'IM_DEFAULTS_PATH'}= $instance_manager->{defaults_file};
+ $ENV{'IM_PASSWORD_PATH'}= $instance_manager->{password_file};
$ENV{'IM_MYSQLD1_SOCK'}= $instance_manager->{instances}->[0]->{path_sock};
$ENV{'IM_MYSQLD1_PORT'}= $instance_manager->{instances}->[0]->{port};
--- 1.35/server-tools/instance-manager/Makefile.am 2006-05-12 12:51:01 +04:00
+++ 1.36/server-tools/instance-manager/Makefile.am 2006-05-18 15:49:41 +04:00
@@ -76,7 +76,10 @@
guardian.cc guardian.h \
parse_output.cc parse_output.h \
mysql_manager_error.h \
- portability.h
+ portability.h \
+ exit_codes.h \
+ user_management_commands.h \
+ user_management_commands.cc
mysqlmanager_LDADD= @CLIENT_EXTRA_LDFLAGS@ \
liboptions.la \
@@ -89,6 +92,9 @@
EXTRA_DIST = WindowsService.cpp WindowsService.h IMService.cpp \
IMService.h CMakeLists.txt
+
+AM_CFLAGS = -Werror
+AM_CXXFLAGS = -Werror
tags:
ctags -R *.h *.cc
--- 1.109/sql/sp.cc 2006-05-04 16:34:26 +04:00
+++ 1.110/sql/sp.cc 2006-05-18 15:48:38 +04:00
@@ -408,15 +408,13 @@
ulong old_sql_mode= thd->variables.sql_mode;
ha_rows old_select_limit= thd->variables.select_limit;
sp_rcontext *old_spcont= thd->spcont;
-
+
char definer_user_name_holder[USERNAME_LENGTH + 1];
- LEX_STRING_WITH_INIT definer_user_name(definer_user_name_holder,
- USERNAME_LENGTH);
+ LEX_STRING definer_user_name= { definer_user_name_holder, USERNAME_LENGTH };
char definer_host_name_holder[HOSTNAME_LENGTH + 1];
- LEX_STRING_WITH_INIT definer_host_name(definer_host_name_holder,
- HOSTNAME_LENGTH);
-
+ LEX_STRING definer_host_name= { definer_host_name_holder, HOSTNAME_LENGTH };
+
int ret;
thd->variables.sql_mode= sql_mode;
--- 1.220/sql/sp_head.cc 2006-05-15 19:26:52 +04:00
+++ 1.221/sql/sp_head.cc 2006-05-18 15:48:38 +04:00
@@ -1823,10 +1823,10 @@
sp_head::set_definer(const char *definer, uint definerlen)
{
char user_name_holder[USERNAME_LENGTH + 1];
- LEX_STRING_WITH_INIT user_name(user_name_holder, USERNAME_LENGTH);
+ LEX_STRING user_name= { user_name_holder, USERNAME_LENGTH };
char host_name_holder[HOSTNAME_LENGTH + 1];
- LEX_STRING_WITH_INIT host_name(host_name_holder, HOSTNAME_LENGTH);
+ LEX_STRING host_name= { host_name_holder, HOSTNAME_LENGTH };
parse_user(definer, definerlen, user_name.str, &user_name.length,
host_name.str, &host_name.length);
| Thread |
|---|
| • bk commit into 5.1 tree (anozdrin:1.2161) | Alexander Nozdrin | 18 May |
