diff options
| author | unknown <reggie@fedora.(none)> | 2005-08-04 09:33:44 -0500 |
|---|---|---|
| committer | unknown <reggie@fedora.(none)> | 2005-08-04 09:33:44 -0500 |
| commit | 9a2ea3700bffdd11dcc5a9dea817075594bb850e (patch) | |
| tree | 7d2b6ce9972b0698b18b7bb697e5c7f1fea4fb75 /server-tools/instance-manager/commands.cc | |
| parent | be22eacb3b32ae6d6766ae83056c90043dbe6846 (diff) | |
| parent | 55b4cb009e029a9ee626d229c5d8520b02773843 (diff) | |
| download | mariadb-git-9a2ea3700bffdd11dcc5a9dea817075594bb850e.tar.gz | |
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into fedora.(none):/home/reggie/bk/im_patch
server-tools/instance-manager/manager.cc:
Auto merged
server-tools/instance-manager/mysqlmanager.cc:
Auto merged
server-tools/instance-manager/options.h:
Auto merged
server-tools/instance-manager/commands.cc:
final merge of IM port code for Windows
server-tools/instance-manager/instance_map.cc:
final merge of IM port code for Windows
server-tools/instance-manager/options.cc:
final merge of IM port code for Windows
Diffstat (limited to 'server-tools/instance-manager/commands.cc')
| -rw-r--r-- | server-tools/instance-manager/commands.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/server-tools/instance-manager/commands.cc b/server-tools/instance-manager/commands.cc index ad9d46be1ed..7589da859cf 100644 --- a/server-tools/instance-manager/commands.cc +++ b/server-tools/instance-manager/commands.cc @@ -470,7 +470,7 @@ int Show_instance_log::execute(struct st_net *net, ulong connection_id) size_t buff_size; int read_len; /* calculate buffer size */ - struct stat file_stat; + MY_STAT file_stat; /* my_fstat doesn't use the flag parameter */ if (my_fstat(fd, &file_stat, MYF(0))) @@ -482,7 +482,7 @@ int Show_instance_log::execute(struct st_net *net, ulong connection_id) read_len= my_seek(fd, file_stat.st_size - size, MY_SEEK_SET, MYF(0)); char *bf= (char*) malloc(sizeof(char)*buff_size); - if ((read_len= my_read(fd, bf, buff_size, MYF(0))) < 0) + if ((read_len= my_read(fd, (byte*)bf, buff_size, MYF(0))) < 0) return ER_READ_FILE; store_to_protocol_packet(&send_buff, (char*) bf, &position, read_len); close(fd); @@ -605,7 +605,7 @@ int Show_instance_log_files::execute(struct st_net *net, ulong connection_id) store_to_protocol_packet(&send_buff, "", &position); store_to_protocol_packet(&send_buff, (char*) "0", &position); } - else if (S_ISREG(file_stat.st_mode)) + else if (MY_S_ISREG(file_stat.st_mode)) { store_to_protocol_packet(&send_buff, (char*) log_files->value, @@ -693,7 +693,6 @@ int Set_option::correct_file(int skip) error= modify_defaults_file(Options::config_file, option, option_value, instance_name, skip); - switch (error) { case 0: |