diff options
| author | monty@narttu.mysql.fi <> | 2003-05-27 16:44:06 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-05-27 16:44:06 +0300 |
| commit | 030df25b9a5e0aacb7a8550082552f3b5a440cb4 (patch) | |
| tree | be316285425a1cdbf48893139a62ff587cff9495 /sql | |
| parent | 5da35e04881505004e140aceaedfc296b1c65e48 (diff) | |
| parent | 738b0753664d1220253e30fbfeb84e59f24e38ff (diff) | |
| download | mariadb-git-030df25b9a5e0aacb7a8550082552f3b5a440cb4.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 6 | ||||
| -rw-r--r-- | sql/share/charsets/Index.xml | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 0f4e689d55b..86ec00e1e92 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2281,7 +2281,9 @@ static void handle_connections_methods() #endif /* __NT__ */ if (have_tcpip && !opt_disable_networking) { +#ifdef __NT__ handler_count++; +#endif if (pthread_create(&hThread,&connection_attrib, handle_connections_sockets, 0)) { @@ -2292,7 +2294,9 @@ static void handle_connections_methods() #ifdef HAVE_SMEM if (opt_enable_shared_memory) { +#ifdef __NT__ handler_count++; +#endif if (pthread_create(&hThread,&connection_attrib, handle_connections_shared_memory, 0)) { @@ -3318,10 +3322,12 @@ error: if (!handle_connect_file_map) CloseHandle(handle_connect_file_map); if (!event_connect_answer) CloseHandle(event_connect_answer); if (!event_connect_request) CloseHandle(event_connect_request); +#ifdef __NT__ pthread_mutex_lock(&LOCK_thread_count); handler_count--; pthread_mutex_unlock(&LOCK_thread_count); pthread_cond_signal(&COND_handler_count); +#endif DBUG_RETURN(0); } #endif /* HAVE_SMEM */ diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml index 28cddb90fc5..6e091066654 100644 --- a/sql/share/charsets/Index.xml +++ b/sql/share/charsets/Index.xml @@ -408,8 +408,14 @@ To make maintaining easier please: <family>Unicode</family> <description>UTF-8 Unicode</description> <alias>utf-8</alias> - <collation name="utf8_general_ci" id="33" flag="primary"/> - <collation name="utf8_bin" id="83" flag="binary"/> + <collation name="utf8_general_ci" id="33"> + <flag>primary</flag> + <flag>compiled</flag> + </collation> + <collation name="utf8_bin" id="83"> + <flag>binary</flag> + <flag>compiled</flag> + </collation> </charset> <charset name="ucs2"> |