diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-09-11 20:43:48 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-09-11 20:43:48 +0200 |
| commit | a3d80d952d7b99680ca4a3a89e128ecc0d490c10 (patch) | |
| tree | 0d72ee69e037cdd09618ddb53652dd1b220890dc /server-tools | |
| parent | ec06ba24553d2d83b3a6a6bc4d8150910b01ee7c (diff) | |
| parent | 966661c8cc75dd7d540a5fe40b4d893c40e91d26 (diff) | |
| download | mariadb-git-a3d80d952d7b99680ca4a3a89e128ecc0d490c10.tar.gz | |
merge with 5.1
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/Makefile.am | 3 | ||||
| -rw-r--r-- | server-tools/instance-manager/instance_options.cc | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/server-tools/Makefile.am b/server-tools/Makefile.am index 96e9d5a946e..80103d195f5 100644 --- a/server-tools/Makefile.am +++ b/server-tools/Makefile.am @@ -15,6 +15,3 @@ SUBDIRS = . instance-manager DIST_SUBDIRS = . instance-manager - -# Don't update the files from bitkeeper -%::SCCS/s.% diff --git a/server-tools/instance-manager/instance_options.cc b/server-tools/instance-manager/instance_options.cc index 8b96d6f0f96..725089e2f42 100644 --- a/server-tools/instance-manager/instance_options.cc +++ b/server-tools/instance-manager/instance_options.cc @@ -303,7 +303,6 @@ bool Instance_options::fill_log_options() enum { MAX_LOG_OPTION_LENGTH= 256 }; char datadir[MAX_LOG_OPTION_LENGTH]; char hostname[MAX_LOG_OPTION_LENGTH]; - uint hostname_length; struct log_files_st { const char *name; @@ -335,8 +334,6 @@ bool Instance_options::fill_log_options() strmov(hostname, "mysql"); hostname[MAX_LOG_OPTION_LENGTH - 1]= 0; /* Safety */ - hostname_length= strlen(hostname); - for (log_files= logs_st; log_files->name; log_files++) { |