Below is the list of changes that have just been committed into a local
5.0 repository of istruewing. When istruewing 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, 2006-09-19 11:27:00+02:00, istruewing@stripped +7 -0
Merge chilla.local:/home/mydev/mysql-4.1-bug14400-monty
into chilla.local:/home/mydev/mysql-5.0-bug14400-monty
MERGE: 1.1616.2144.195
BitKeeper/etc/ignore@stripped, 2006-09-19 11:22:13+02:00, istruewing@stripped +0 -4
auto-union
MERGE: 1.153.16.1
include/my_global.h@stripped, 2006-09-19 11:22:15+02:00, istruewing@stripped +0 -0
Auto merged
MERGE: 1.47.1.58
myisam/mi_rkey.c@stripped, 2006-09-19 11:22:15+02:00, istruewing@stripped +0 -0
Auto merged
MERGE: 1.16.1.6
myisam/mi_test_all.res@stripped, 2006-09-19 11:26:57+02:00, istruewing@stripped +0 -42
Manual merge from 4.1.
MERGE: 1.3.1.1
mysql-test/r/myisam.result@stripped, 2006-09-19 11:22:15+02:00, istruewing@stripped +0 -0
Auto merged
MERGE: 1.45.4.2
mysql-test/t/myisam.test@stripped, 2006-09-19 11:22:16+02:00, istruewing@stripped +0 -0
Auto merged
MERGE: 1.33.6.2
sql/sql_select.cc@stripped, 2006-09-19 11:26:57+02:00, istruewing@stripped +3 -5
Manual merge from 4.1.
MERGE: 1.216.134.1
# 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: istruewing
# Host: chilla.local
# Root: /home/mydev/mysql-5.0-bug14400-monty/RESYNC
--- 1.24/myisam/mi_rkey.c 2006-09-19 11:27:05 +02:00
+++ 1.25/myisam/mi_rkey.c 2006-09-19 11:27:05 +02:00
@@ -133,7 +133,6 @@ int mi_rkey(MI_INFO *info, byte *buf, in
}
}
}
-
if (share->concurrent_insert)
rw_unlock(&share->key_root_lock[inx]);
--- 1.4/myisam/mi_test_all.res 2006-09-19 11:27:05 +02:00
+++ 1.5/myisam/mi_test_all.res 2006-09-19 11:27:05 +02:00
@@ -8,46 +8,46 @@ myisamchk: MyISAM file test2
myisamchk: warning: Datafile is almost full, 65532 of 65534 used
MyISAM-table 'test2' is usable but should be fixed
Commands Used count Errors Recover errors
-open 1 0 0
-write 50 0 0
-update 5 0 0
-delete 50 0 0
-close 1 0 0
-extra 6 0 0
-Total 113 0 0
+open 7 0 0
+write 350 0 0
+update 35 0 0
+delete 350 0 0
+close 7 0 0
+extra 42 0 0
+Total 791 0 0
Commands Used count Errors Recover errors
-open 2 0 0
-write 100 0 0
-update 10 0 0
-delete 100 0 0
-close 2 0 0
-extra 12 0 0
-Total 226 0 0
-
-real 0m0.791s
-user 0m0.137s
-sys 0m0.117s
-
-real 0m0.659s
-user 0m0.252s
-sys 0m0.102s
-
-real 0m0.571s
-user 0m0.188s
-sys 0m0.098s
-
-real 0m1.111s
-user 0m0.236s
-sys 0m0.037s
-
-real 0m0.621s
-user 0m0.242s
-sys 0m0.022s
-
-real 0m0.698s
-user 0m0.248s
-sys 0m0.021s
-
-real 0m0.683s
-user 0m0.265s
-sys 0m0.079s
+open 8 0 0
+write 400 0 0
+update 40 0 0
+delete 400 0 0
+close 8 0 0
+extra 48 0 0
+Total 904 0 0
+
+real 0m0.221s
+user 0m0.120s
+sys 0m0.100s
+
+real 0m0.222s
+user 0m0.140s
+sys 0m0.084s
+
+real 0m0.232s
+user 0m0.112s
+sys 0m0.120s
+
+real 0m0.163s
+user 0m0.116s
+sys 0m0.036s
+
+real 0m0.159s
+user 0m0.136s
+sys 0m0.020s
+
+real 0m0.147s
+user 0m0.132s
+sys 0m0.016s
+
+real 0m0.211s
+user 0m0.124s
+sys 0m0.088s
--- 1.451/sql/sql_select.cc 2006-09-19 11:27:05 +02:00
+++ 1.452/sql/sql_select.cc 2006-09-19 11:27:05 +02:00
@@ -13189,6 +13189,8 @@ setup_copy_fields(THD *thd, TMP_TABLE_PA
param->copy_funcs.empty();
for (i= 0; (pos= li++); i++)
{
+ Field *field;
+ char *tmp;
Item *real_pos= pos->real_item();
if (real_pos->type() == Item::FIELD_ITEM)
{
@@ -13219,17 +13221,24 @@ setup_copy_fields(THD *thd, TMP_TABLE_PA
set up save buffer and change result_field to point at
saved value
*/
- Field *field= item->field;
+ field= item->field;
item->result_field=field->new_field(thd->mem_root,field->table, 1);
- char *tmp=(char*) sql_alloc(field->pack_length()+1);
+ /*
+ We need to allocate one extra byte for null handling and
+ another extra byte to not get warnings from purify in
+ Field_string::val_int
+ */
+ tmp= (char*) sql_alloc(field->pack_length()+2);
if (!tmp)
goto err;
if (copy)
{
copy->set(tmp, item->result_field);
item->result_field->move_field(copy->to_ptr,copy->to_null_ptr,1);
+#ifdef HAVE_purify
+ copy->to_ptr[copy->from_length]= 0;
+#endif
copy++;
- }
}
}
else if ((real_pos->type() == Item::FUNC_ITEM ||
--- 1.231/BitKeeper/etc/ignore 2006-09-19 11:27:05 +02:00
+++ 1.232/BitKeeper/etc/ignore 2006-09-19 11:27:06 +02:00
@@ -31,6 +31,8 @@
*.vcproj
*/*.dir/*
*/*_pure_*warnings
+*/.deps
+*/.libs/*
*/.pure
*/debug/*
*/release/*
| Thread |
|---|
| • bk commit into 5.0 tree (istruewing:1.2275) | ingo | 19 Sep |
