Below is the list of changes that have just been committed into a local
5.0 repository of mydev. When mydev 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
1.2213 06/07/06 15:59:03 ingo@stripped +31 -0
Merge chilla.local:/home/mydev/mysql-5.0
into chilla.local:/home/mydev/mysql-5.0-ateam
mysql-test/t/ctype_utf8.test
1.85 06/07/06 15:58:58 ingo@stripped +0 -0
Manual merge
mysql-test/r/key.result
1.33 06/07/06 15:58:58 ingo@stripped +1 -1
Manual merge
mysql-test/r/ctype_utf8.result
1.92 06/07/06 15:58:58 ingo@stripped +0 -0
Manual merge
support-files/mysql.spec.sh
1.146 06/07/06 15:55:04 ingo@stripped +0 -0
Auto merged
sql/table.cc
1.226 06/07/06 15:55:04 ingo@stripped +0 -0
Auto merged
sql-common/client.c
1.92 06/07/06 15:55:04 ingo@stripped +0 -0
Auto merged
sql/sql_parse.cc
1.559 06/07/06 15:55:03 ingo@stripped +0 -0
Auto merged
sql/sql_class.cc
1.237 06/07/06 15:55:03 ingo@stripped +0 -0
Auto merged
sql/opt_sum.cc
1.57 06/07/06 15:55:03 ingo@stripped +0 -0
Auto merged
sql/item_timefunc.cc
1.117 06/07/06 15:55:03 ingo@stripped +0 -0
Auto merged
sql/item_geofunc.h
1.12 06/07/06 15:55:02 ingo@stripped +0 -0
Auto merged
sql/field.cc
1.313 06/07/06 15:55:02 ingo@stripped +0 -0
Auto merged
scripts/make_binary_distribution.sh
1.111 06/07/06 15:55:02 ingo@stripped +0 -0
Auto merged
mysql-test/t/myisam.test
1.58 06/07/06 15:55:02 ingo@stripped +0 -0
Auto merged
mysql-test/t/key.test
1.27 06/07/06 15:55:02 ingo@stripped +0 -0
Auto merged
mysql-test/t/gis.test
1.28 06/07/06 15:55:02 ingo@stripped +0 -7
Auto merged
mysql-test/t/gis-rtree.test
1.17 06/07/06 15:55:02 ingo@stripped +0 -0
Auto merged
mysql-test/t/func_time.test
1.49 06/07/06 15:55:02 ingo@stripped +0 -0
Auto merged
mysql-test/t/func_sapdb.test
1.13 06/07/06 15:55:02 ingo@stripped +0 -0
Auto merged
mysql-test/r/symlink.result
1.26 06/07/06 15:55:01 ingo@stripped +0 -0
Auto merged
mysql-test/r/myisam.result
1.77 06/07/06 15:55:01 ingo@stripped +0 -0
Auto merged
mysql-test/r/gis.result
1.33 06/07/06 15:55:01 ingo@stripped +0 -10
Auto merged
mysql-test/r/gis-rtree.result
1.17 06/07/06 15:55:01 ingo@stripped +0 -0
Auto merged
mysql-test/r/func_time.result
1.61 06/07/06 15:55:01 ingo@stripped +0 -0
Auto merged
mysql-test/r/func_sapdb.result
1.18 06/07/06 15:55:01 ingo@stripped +0 -0
Auto merged
myisam/mi_key.c
1.52 06/07/06 15:54:59 ingo@stripped +0 -0
Auto merged
myisam/mi_dynrec.c
1.41 06/07/06 15:54:59 ingo@stripped +0 -0
Auto merged
myisam/mi_create.c
1.54 06/07/06 15:54:59 ingo@stripped +0 -0
Auto merged
myisam/mi_check.c
1.145 06/07/06 15:54:58 ingo@stripped +0 -0
Auto merged
libmysqld/libmysqld.c
1.69 06/07/06 15:54:58 ingo@stripped +0 -0
Auto merged
libmysqld/lib_sql.cc
1.111 06/07/06 15:54:58 ingo@stripped +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: ingo
# Host: chilla.local
# Root: /home/mydev/mysql-5.0-ateam/RESYNC
--- 1.236/sql/sql_class.cc 2006-06-21 00:21:07 +02:00
+++ 1.237/sql/sql_class.cc 2006-07-06 15:55:03 +02:00
@@ -930,7 +930,7 @@ bool select_send::send_data(List<Item> &
Protocol *protocol= thd->protocol;
char buff[MAX_FIELD_WIDTH];
String buffer(buff, sizeof(buff), &my_charset_bin);
- DBUG_ENTER("send_data");
+ DBUG_ENTER("select_send::send_data");
protocol->prepare_for_resend();
Item *item;
@@ -1140,7 +1140,7 @@ select_export::prepare(List<Item> &list,
bool select_export::send_data(List<Item> &items)
{
- DBUG_ENTER("send_data");
+ DBUG_ENTER("select_export::send_data");
char buff[MAX_FIELD_WIDTH],null_buff[2],space[MAX_FIELD_WIDTH];
bool space_inited=0;
String tmp(buff,sizeof(buff),&my_charset_bin),*res;
@@ -1297,7 +1297,7 @@ bool select_dump::send_data(List<Item> &
String tmp(buff,sizeof(buff),&my_charset_bin),*res;
tmp.length(0);
Item *item;
- DBUG_ENTER("send_data");
+ DBUG_ENTER("select_dump::send_data");
if (unit->offset_limit_cnt)
{ // using limit offset,count
| Thread |
|---|
| • bk commit into 5.0 tree (ingo:1.2213) | ingo | 6 Jul |
