Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf 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@stripped, 2007-06-09 15:50:22+05:00, holyfoot@hfmain.(none) +1 -0
Merge mysql.com:/home/hf/work/28333/my50-28333
into mysql.com:/home/hf/work/28333/my51-28333
MERGE: 1.1810.2943.37
client/mysqltest.c@stripped, 2007-06-09 15:50:19+05:00, holyfoot@hfmain.(none) +0 -0
Auto merged
MERGE: 1.155.9.102
# 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: holyfoot
# Host: hfmain.(none)
# Root: /home/hf/work/28333/my51-28333/RESYNC
--- 1.302/client/mysqltest.c 2007-06-09 15:50:28 +05:00
+++ 1.303/client/mysqltest.c 2007-06-09 15:50:28 +05:00
@@ -480,6 +480,10 @@ void handle_error(struct st_command*,
void handle_no_error(struct st_command*);
#ifdef EMBEDDED_LIBRARY
+
+/* attributes of the query thread */
+pthread_attr_t cn_thd_attrib;
+
/*
send_one_query executes query in separate thread what is
necessary in embedded library to run 'send' in proper way.
@@ -518,7 +522,7 @@ static int do_send_query(struct st_conne
cn->cur_query= q;
cn->cur_query_len= q_len;
cn->query_done= 0;
- if (pthread_create(&tid, NULL, send_one_query, (void*)cn))
+ if (pthread_create(&tid, &cn_thd_attrib, send_one_query, (void*)cn))
die("Cannot start new thread for query");
return 0;
@@ -5984,6 +5988,12 @@ int main(int argc, char **argv)
(sizeof(connections)/sizeof(struct st_connection)) - 1;
next_con= connections + 1;
cur_con= connections;
+
+#ifdef EMBEDDED_LIBRARY
+ /* set appropriate stack for the 'query' threads */
+ (void) pthread_attr_init(&cn_thd_attrib);
+ pthread_attr_setstacksize(&cn_thd_attrib, DEFAULT_THREAD_STACK);
+#endif /*EMBEDDED_LIBRARY*/
/* Init file stack */
memset(file_stack, 0, sizeof(file_stack));
| Thread |
|---|
| • bk commit into 5.1 tree (holyfoot:1.2552) | holyfoot | 9 Jun |