Below is the list of changes that have just been committed into a local
4.1 repository of ram. When ram 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://www.mysql.com/doc/I/n/Install...urce_tree.html

ChangeSet
1.2194 05/02/25 15:47:36 ramil (AT) mysql (DOT) com +2 -0
Merge rkalimullin (AT) bk-internal (DOT) mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b4802

client/mysql.cc
1.198 05/02/25 15:47:32 ramil (AT) mysql (DOT) com +0 -0
Auto merged

BitKeeper/etc/logging_ok
1.364 05/02/25 15:47:08 ramil (AT) mysql (DOT) com +0 -1
auto-union

# 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: ramil
# Host: gw.mysql.r18.ru
# Root: /usr/home/ram/work/4.1.b4802/RESYNC

--- 1.197/client/mysql.cc 2005-02-02 15:52:15 +04:00
+++ 1.198/client/mysql.cc 2005-02-25 15:47:32 +04:00
@@ -2917,9 +2917,9 @@
MYSQL_ROW cur=mysql_fetch_row(result);
if (cur)
{
- tee_fprintf(stdout, "Server characterset:\t%s\n", cur[0] ? cur[0] : "");
+ tee_fprintf(stdout, "Server characterset:\t%s\n", cur[2] ? cur[2] : "");
tee_fprintf(stdout, "Db characterset:\t%s\n", cur[3] ? cur[3] : "");
- tee_fprintf(stdout, "Client characterset:\t%s\n", cur[2] ? cur[2] : "");
+ tee_fprintf(stdout, "Client characterset:\t%s\n", cur[0] ? cur[0] : "");
tee_fprintf(stdout, "Conn. characterset:\t%s\n", cur[1] ? cur[1] : "");
}
mysql_free_result(result);

--- 1.363/BitKeeper/etc/logging_ok 2005-02-02 15:06:35 +04:00
+++ 1.364/BitKeeper/etc/logging_ok 2005-02-25 15:47:08 +04:00
@@ -26,6 +26,7 @@
bar (AT) gw (DOT) udmsearch.izhnet.ru
bar (AT) mysql (DOT) com
bar (AT) noter (DOT) intranet.mysql.r18.ru
+bell (AT) 51 (DOT) 0.168.192.in-addr.arpa
bell (AT) laptop (DOT) sanja.is.com.ua
bell (AT) sanja (DOT) is.com.ua
bk (AT) admin (DOT) bk
@@ -36,6 +37,7 @@
brian (AT) zim (DOT) (none)
carsten (AT) tsort (DOT) bitbybit.dk
davida (AT) isil (DOT) mysql.com
+dean (AT) mysql (DOT) com
dellis (AT) goetia (DOT) (none)
dlenev (AT) brandersnatch (DOT) localdomain
dlenev (AT) build (DOT) mysql.com
@@ -119,6 +121,7 @@
miguel (AT) light (DOT) local
miguel (AT) sartre (DOT) local
mikael (AT) mc04 (DOT) (none)
+mikael (AT) orca (DOT) ndb.mysql.com
mikron (AT) c-fb0ae253 (DOT) 1238-1-...andsbolaget.se
mikron (AT) mikael-ronstr-ms-dator (DOT) local
mleich (AT) mysql (DOT) com
@@ -202,6 +205,7 @@
sergefp (AT) mysql (DOT) com
sinisa (AT) rhols221 (DOT) adsl.netsonic.fi
stewart (AT) mysql (DOT) com
+svoj (AT) mysql (DOT) com
tfr (AT) beta (DOT) frontier86.ee
tfr (AT) indrek (DOT) tfr.cafe.ee
tfr (AT) sarvik (DOT) tfr.cafe.ee

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