Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw 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/in...urce-tree.html

ChangeSet
1.2162 05/04/04 18:26:39 jimw (AT) mysql (DOT) com +2 -0
Merge mysql.com:/home/jimw/my/mysql-4.1-8866
into mysql.com:/home/jimw/my/mysql-4.1-clean

sql-common/client.c
1.84 05/04/04 18:26:38 jimw (AT) mysql (DOT) com +0 -0
Auto merged

client/mysqltest.c
1.159 05/04/04 18:26:38 jimw (AT) mysql (DOT) com +0 -0
Auto merged

# 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: jimw
# Host: rama.(none)
# Root: /home/jimw/my/mysql-4.1-clean/RESYNC

--- 1.83/sql-common/client.c 2005-03-25 14:21:47 -08:00
+++ 1.84/sql-common/client.c 2005-04-04 18:26:38 -07:00
@@ -2190,6 +2190,29 @@
DBUG_RETURN(1);
}
tmp_mysql.free_me= mysql->free_me;
+
+ /*
+ For each stmt in mysql->stmts, move it to tmp_mysql if it is
+ in state MYSQL_STMT_INIT_DONE, otherwise close it.
+ */
+ {
+ LIST *element= mysql->stmts;
+ for (; element; element= element->next)
+ {
+ MYSQL_STMT *stmt= (MYSQL_STMT *) element->data;
+ if (stmt->state != MYSQL_STMT_INIT_DONE)
+ {
+ stmt->mysql= 0;
+ }
+ else
+ {
+ tmp_mysql.stmts= list_add(tmp_mysql.stmts, &stmt->list);
+ }
+ /* No need to call list_delete for statement here */
+ }
+ mysql->stmts= NULL;
+ }
+
/* Don't free options as these are now used in tmp_mysql */
bzero((char*) &mysql->options,sizeof(mysql->options));
mysql->free_me=0;
@@ -2278,6 +2301,10 @@
SYNOPSYS
mysql_detach_stmt_list()
stmt_list pointer to mysql->stmts
+
+ NOTE
+ There is similar code in mysql_reconnect(), so changes here
+ should also be reflected there.
*/

void mysql_detach_stmt_list(LIST **stmt_list __attribute__((unused)))

--- 1.158/client/mysqltest.c 2005-03-23 11:38:35 -08:00
+++ 1.159/client/mysqltest.c 2005-04-04 18:26:38 -07:00
@@ -280,6 +280,7 @@
Q_QUERY_VERTICAL, Q_QUERY_HORIZONTAL,
Q_START_TIMER, Q_END_TIMER,
Q_CHARACTER_SET, Q_DISABLE_PS_PROTOCOL, Q_ENABLE_PS_PROTOCOL,
+Q_DISABLE_RECONNECT, Q_ENABLE_RECONNECT,

Q_UNKNOWN, /* Unknown command. */
Q_COMMENT, /* Comments, ignored. */
@@ -365,6 +366,8 @@
"character_set",
"disable_ps_protocol",
"enable_ps_protocol",
+ "disable_reconnect",
+ "enable_reconnect",
0
};

@@ -3623,6 +3626,12 @@
break;
case Q_ENABLE_PS_PROTOCOL:
ps_protocol_enabled= ps_protocol;
+ break;
+ case Q_DISABLE_RECONNECT:
+ cur_con->mysql.reconnect= 0;
+ break;
+ case Q_ENABLE_RECONNECT:
+ cur_con->mysql.reconnect= 1;
break;

default: processed = 0; break;

--
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe: http://lists.mysql.com/internals?uns...ie.nctu.edu.tw