Below is the list of changes that have just been committed into a local
5.1 repository of igor. When igor 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.2270 06/03/30 13:34:14 igor@stripped +10 -0
Merge rurik.mysql.com:/home/igor/mysql-5.1
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
storage/ndb/tools/Makefile.am
1.27 06/03/30 13:34:05 igor@stripped +0 -0
Auto merged
sql/sql_select.cc
1.394 06/03/30 13:34:05 igor@stripped +0 -0
Auto merged
sql/sql_load.cc
1.96 06/03/30 13:34:03 igor@stripped +0 -0
Auto merged
sql/ha_ndbcluster.cc
1.299 06/03/30 13:34:03 igor@stripped +0 -0
Auto merged
sql/field.cc
1.306 06/03/30 13:34:02 igor@stripped +0 -0
Auto merged
mysql-test/t/ndb_read_multi_range.test
1.9 06/03/30 13:34:02 igor@stripped +0 -0
Auto merged
mysql-test/t/loaddata.test
1.20 06/03/30 13:34:02 igor@stripped +0 -0
Auto merged
mysql-test/t/innodb.test
1.134 06/03/30 13:34:02 igor@stripped +0 -0
Auto merged
mysql-test/r/ndb_read_multi_range.result
1.7 06/03/30 13:34:02 igor@stripped +0 -0
Auto merged
mysql-test/r/loaddata.result
1.25 06/03/30 13:34:02 igor@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: igor
# Host: rurik.mysql.com
# Root: /home/igor/dev/mysql-5.1-0/RESYNC
--- 1.95/sql/sql_load.cc 2006-03-29 17:53:52 -08:00
+++ 1.96/sql/sql_load.cc 2006-03-30 13:34:03 -08:00
@@ -367,7 +367,8 @@
if (ignore ||
handle_duplicates == DUP_REPLACE)
table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);
- table->file->start_bulk_insert((ha_rows) 0);
+ if (!thd->prelocked_mode)
+ table->file->start_bulk_insert((ha_rows) 0);
table->copy_blobs=1;
thd->no_trans_update= 0;
@@ -384,7 +385,7 @@
error= read_sep_field(thd, info, table_list, fields_vars,
set_fields, set_values, read_info,
*enclosed, skip_lines, ignore);
- if (table->file->end_bulk_insert() && !error)
+ if (!thd->prelocked_mode && table->file->end_bulk_insert() && !error)
{
table->file->print_error(my_errno, MYF(0));
error= 1;
--- 1.393/sql/sql_select.cc 2006-03-29 17:53:52 -08:00
+++ 1.394/sql/sql_select.cc 2006-03-30 13:34:05 -08:00
@@ -12412,7 +12412,11 @@
Item **select_item; /* The corresponding item from the SELECT clause. */
Field *from_field; /* The corresponding field from the FROM clause. */
- if (order_item->type() == Item::INT_ITEM)
+ /*
+ Local SP variables may be int but are expressions, not positions.
+ (And they can't be used before fix_fields is called for them).
+ */
+ if (order_item->type() == Item::INT_ITEM && order_item->basic_const_item())
{ /* Order by position */
uint count= (uint) order_item->val_int();
if (!count || count > fields.elements)
--- 1.26/storage/ndb/tools/Makefile.am 2006-03-29 17:53:53 -08:00
+++ 1.27/storage/ndb/tools/Makefile.am 2006-03-30 13:34:05 -08:00
@@ -1,5 +1,5 @@
-bin_SCRIPTS = ndb_size.pl ndb_error_reporter
+dist_bin_SCRIPTS = ndb_size.pl ndb_error_reporter
dist_pkgdata_DATA = ndb_size.tmpl
ndbtools_PROGRAMS = \
| Thread |
|---|
| • bk commit into 5.1 tree (igor:1.2270) | igor | 30 Mar |
