diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysql_install_db.cc | 18 | ||||
| -rw-r--r-- | sql/mysqld.cc | 12 | ||||
| -rw-r--r-- | sql/sql_error.h | 8 | ||||
| -rw-r--r-- | sql/threadpool_win.cc | 4 |
4 files changed, 22 insertions, 20 deletions
diff --git a/sql/mysql_install_db.cc b/sql/mysql_install_db.cc index bde81d915b2..4dc63d8a28d 100644 --- a/sql/mysql_install_db.cc +++ b/sql/mysql_install_db.cc @@ -37,7 +37,7 @@ "Usage: mysql_install_db.exe [OPTIONS]\n" \ "OPTIONS:" -extern "C" const char mysql_bootstrap_sql[]; +extern "C" const char* mysql_bootstrap_sql[]; char default_os_user[]= "NT AUTHORITY\\NetworkService"; static int create_db_instance(); @@ -247,7 +247,7 @@ static char *init_bootstrap_command_line(char *cmdline, size_t size) "\"\"%s\" --no-defaults --bootstrap" " \"--language=%s\\share\\english\"" " --basedir=. --datadir=. --default-storage-engine=myisam" - " --max_allowed_packet=9M --loose-skip-innodb --loose-skip-pbxt" + " --max_allowed_packet=9M " " --net-buffer-length=16k\"", mysqld_path, basedir); return cmdline; } @@ -565,12 +565,16 @@ static int create_db_instance() goto end; } - /* Write the bootstrap script to stdin. */ - if (fwrite(mysql_bootstrap_sql, strlen(mysql_bootstrap_sql), 1, in) != 1) + int i; + for (i=0; mysql_bootstrap_sql[i]; i++) { - verbose("ERROR: Cannot write to mysqld's stdin"); - ret= 1; - goto end; + /* Write the bootstrap script to stdin. */ + if (fwrite(mysql_bootstrap_sql, strlen(mysql_bootstrap_sql[i]), 1, in) != 1) + { + verbose("ERROR: Cannot write to mysqld's stdin"); + ret= 1; + goto end; + } } /* Remove default user, if requested. */ diff --git a/sql/mysqld.cc b/sql/mysqld.cc index f88b4047c17..aa31966256d 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5582,11 +5582,8 @@ void handle_connections_sockets() fds[socket_count].events= POLLIN; \ socket_count++ #else - fd_set readFDs,clientFDs; - uint max_used_connection= (uint) - max(max(mysql_socket_getfd(base_ip_sock), mysql_socket_getfd(unix_sock)), - mysqld_socket_getfd(extra_ip_sock)) + 1; #define setup_fds(X) FD_SET(mysql_socket_getfd(X),&clientFDs) + fd_set readFDs,clientFDs; FD_ZERO(&clientFDs); #endif @@ -5615,8 +5612,7 @@ void handle_connections_sockets() retval= poll(fds, socket_count, -1); #else readFDs=clientFDs; - - retval= select((int) max_used_connection,&readFDs,0,0,0); + retval= select((int) 0,&readFDs,0,0,0); #endif if (retval < 0) @@ -5648,13 +5644,13 @@ void handle_connections_sockets() } } #else // HAVE_POLL - if (FD_ISSET(base_ip_sock,&readFDs)) + if (FD_ISSET(mysql_socket_getfd(base_ip_sock),&readFDs)) { sock= base_ip_sock; flags= ip_flags; } else - if (FD_ISSET(extra_ip_sock,&readFDs)) + if (FD_ISSET(mysql_socket_getfd(extra_ip_sock),&readFDs)) { sock= extra_ip_sock; flags= extra_ip_flags; diff --git a/sql/sql_error.h b/sql/sql_error.h index 79633ae5df8..f11ce6dcf0d 100644 --- a/sql/sql_error.h +++ b/sql/sql_error.h @@ -193,6 +193,10 @@ public: MYSQL_ERROR::enum_warning_level get_level() const { return m_level; } + /** Destructor. */ + ~MYSQL_ERROR() + {} + private: /* The interface of MYSQL_ERROR is mostly private, by design, @@ -234,9 +238,7 @@ private: */ MYSQL_ERROR(MEM_ROOT *mem_root); - /** Destructor. */ - ~MYSQL_ERROR() - {} + /** Copy optional condition items attributes. diff --git a/sql/threadpool_win.cc b/sql/threadpool_win.cc index 6359f81cd2b..7bf4d98d16d 100644 --- a/sql/threadpool_win.cc +++ b/sql/threadpool_win.cc @@ -255,7 +255,7 @@ int init_io(connection_t *connection, THD *thd) { case VIO_TYPE_SSL: case VIO_TYPE_TCPIP: - connection->handle= (HANDLE)vio->sd; + connection->handle= (HANDLE)mysql_socket_getfd(connection->thd->net.vio->mysql_socket); break; case VIO_TYPE_NAMEDPIPE: connection->handle= (HANDLE)vio->hPipe; @@ -342,7 +342,7 @@ int start_io(connection_t *connection, PTP_CALLBACK_INSTANCE instance) if (vio->type == VIO_TYPE_TCPIP || vio->type == VIO_TYPE_SSL) { /* Start async io (sockets). */ - if (WSARecv(vio->sd , &buf, 1, &num_bytes, &flags, + if (WSARecv(mysql_socket_getfd(vio->mysql_socket) , &buf, 1, &num_bytes, &flags, overlapped, NULL) == 0) { retval= last_error= 0; |