Below is the list of changes that have just been committed into a local
5.0 repository of stewart. When stewart 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-28 23:51:21+10:00, stewart@willster.(none) +10 -0
Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2
into willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2
MERGE: 1.1616.2144.184
BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e@stripped, 2006-09-28 23:50:17+10:00, stewart@willster.(none) +0 -0
Auto merged
MERGE: 1.29.5.2
BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e@stripped, 2006-09-28 23:50:17+10:00, stewart@willster.(none) +0 -0
Merge rename: sql/ha_isam.cc -> BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e
BitKeeper/deleted/.del-ha_isam.h~bf53d533be3d3927@stripped, 2006-09-28 23:50:17+10:00, stewart@willster.(none) +0 -0
Auto merged
MERGE: 1.28.2.2
BitKeeper/deleted/.del-ha_isam.h~bf53d533be3d3927@stripped, 2006-09-28 23:50:17+10:00, stewart@willster.(none) +0 -0
Merge rename: sql/ha_isam.h -> BitKeeper/deleted/.del-ha_isam.h~bf53d533be3d3927
BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e@stripped, 2006-09-28 23:50:17+10:00, stewart@willster.(none) +0 -0
Auto merged
MERGE: 1.15.5.2
BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e@stripped, 2006-09-28 23:50:17+10:00, stewart@willster.(none) +0 -0
Merge rename: sql/ha_isammrg.cc -> BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e
BitKeeper/deleted/.del-ha_isammrg.h~66fd2e5bfe7207dc@stripped, 2006-09-28 23:50:17+10:00, stewart@willster.(none) +0 -0
Auto merged
MERGE: 1.22.2.2
BitKeeper/deleted/.del-ha_isammrg.h~66fd2e5bfe7207dc@stripped, 2006-09-28 23:50:17+10:00, stewart@willster.(none) +0 -0
Merge rename: sql/ha_isammrg.h -> BitKeeper/deleted/.del-ha_isammrg.h~66fd2e5bfe7207dc
sql/ha_blackhole.cc@stripped, 2006-09-28 23:50:17+10:00, stewart@willster.(none) +0 -0
Auto merged
MERGE: 1.2.1.11
sql/ha_blackhole.h@stripped, 2006-09-28 23:50:17+10:00, stewart@willster.(none) +0 -0
Auto merged
MERGE: 1.3.1.2
sql/item_sum.cc@stripped, 2006-09-28 23:50:18+10:00, stewart@willster.(none) +0 -0
Auto merged
MERGE: 1.89.1.60
sql/sql_delete.cc@stripped, 2006-09-28 23:50:18+10:00, stewart@willster.(none) +0 -0
Auto merged
MERGE: 1.99.2.41
sql/sql_select.cc@stripped, 2006-09-28 23:51:19+10:00, stewart@willster.(none) +0 -0
SCCS merged
MERGE: 1.216.125.12
sql/sql_union.cc@stripped, 2006-09-28 23:50:18+10:00, stewart@willster.(none) +0 -0
Auto merged
MERGE: 1.74.1.72
# 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: stewart
# Host: willster.(none)
# Root: /home/stewart/Documents/MySQL/5.0/bug19914-mk2/RESYNC
--- 1.29.5.1/sql/ha_isam.cc 2006-09-28 23:51:26 +10:00
+++ 1.41/BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e 2006-09-28 23:51:26 +10:00
@@ -68,7 +68,7 @@
int ha_isam::write_row(byte * buf)
{
- statistic_increment(ha_write_count,&LOCK_status);
+ statistic_increment(table->in_use->status_var.ha_write_count, &LOCK_status);
if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_INSERT)
table->timestamp_field->set_time();
if (table->next_number_field && buf == table->record[0])
@@ -78,7 +78,7 @@
int ha_isam::update_row(const byte * old_data, byte * new_data)
{
- statistic_increment(ha_update_count,&LOCK_status);
+ statistic_increment(table->in_use->status_var.ha_update_count, &LOCK_status);
if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE)
table->timestamp_field->set_time();
return !nisam_update(file,old_data,new_data) ? 0 : my_errno ? my_errno : -1;
@@ -86,14 +86,15 @@
int ha_isam::delete_row(const byte * buf)
{
- statistic_increment(ha_delete_count,&LOCK_status);
+ statistic_increment(table->in_use->status_var.ha_delete_count, &LOCK_status);
return !nisam_delete(file,buf) ? 0 : my_errno ? my_errno : -1;
}
int ha_isam::index_read(byte * buf, const byte * key,
uint key_len, enum ha_rkey_function find_flag)
{
- statistic_increment(ha_read_key_count,&LOCK_status);
+ statistic_increment(table->in_use->status_var.ha_read_key_count,
+ &LOCK_status);
int error=nisam_rkey(file, buf, active_index, key, key_len, find_flag);
table->status=error ? STATUS_NOT_FOUND: 0;
return !error ? 0 : my_errno ? my_errno : -1;
@@ -102,7 +103,8 @@
int ha_isam::index_read_idx(byte * buf, uint index, const byte * key,
uint key_len, enum ha_rkey_function find_flag)
{
- statistic_increment(ha_read_key_count,&LOCK_status);
+ statistic_increment(table->in_use->status_var.ha_read_key_count,
+ &LOCK_status);
int error=nisam_rkey(file, buf, index, key, key_len, find_flag);
table->status=error ? STATUS_NOT_FOUND: 0;
return !error ? 0 : my_errno ? my_errno : -1;
@@ -110,7 +112,8 @@
int ha_isam::index_read_last(byte * buf, const byte * key, uint key_len)
{
- statistic_increment(ha_read_key_count,&LOCK_status);
+ statistic_increment(table->in_use->status_var.ha_read_key_count,
+ &LOCK_status);
int error=nisam_rkey(file, buf, active_index, key, key_len,
HA_READ_PREFIX_LAST);
table->status=error ? STATUS_NOT_FOUND: 0;
@@ -119,7 +122,8 @@
int ha_isam::index_next(byte * buf)
{
- statistic_increment(ha_read_next_count,&LOCK_status);
+ statistic_increment(table->in_use->status_var.ha_read_next_count,
+ &LOCK_status);
int error=nisam_rnext(file,buf,active_index);
table->status=error ? STATUS_NOT_FOUND: 0;
return !error ? 0 : my_errno ? my_errno : HA_ERR_END_OF_FILE;
@@ -127,7 +131,8 @@
int ha_isam::index_prev(byte * buf)
{
- statistic_increment(ha_read_prev_count,&LOCK_status);
+ statistic_increment(table->in_use->status_var.ha_read_prev_count,
+ &LOCK_status);
int error=nisam_rprev(file,buf, active_index);
table->status=error ? STATUS_NOT_FOUND: 0;
return !error ? 0 : my_errno ? my_errno : HA_ERR_END_OF_FILE;
@@ -135,7 +140,8 @@
int ha_isam::index_first(byte * buf)
{
- statistic_increment(ha_read_first_count,&LOCK_status);
+ statistic_increment(table->in_use->status_var.ha_read_first_count,
+ &LOCK_status);
int error=nisam_rfirst(file, buf, active_index);
table->status=error ? STATUS_NOT_FOUND: 0;
return !error ? 0 : my_errno ? my_errno : HA_ERR_END_OF_FILE;
@@ -143,7 +149,8 @@
int ha_isam::index_last(byte * buf)
{
- statistic_increment(ha_read_last_count,&LOCK_status);
+ statistic_increment(table->in_use->status_var.ha_read_last_count,
+ &LOCK_status);
int error=nisam_rlast(file, buf, active_index);
table->status=error ? STATUS_NOT_FOUND: 0;
return !error ? 0 : my_errno ? my_errno : HA_ERR_END_OF_FILE;
@@ -156,7 +163,8 @@
int ha_isam::rnd_next(byte *buf)
{
- statistic_increment(ha_read_rnd_next_count,&LOCK_status);
+ statistic_increment(table->in_use->status_var.ha_read_rnd_next_count,
+ &LOCK_status);
int error=nisam_rrnd(file, buf, NI_POS_ERROR);
table->status=error ? STATUS_NOT_FOUND: 0;
return !error ? 0 : my_errno ? my_errno : -1;
@@ -164,8 +172,9 @@
int ha_isam::rnd_pos(byte * buf, byte *pos)
{
- statistic_increment(ha_read_rnd_count,&LOCK_status);
- int error=nisam_rrnd(file, buf, (ulong) ha_get_ptr(pos,ref_length));
+ statistic_increment(table->in_use->status_var.ha_read_rnd_count,
+ &LOCK_status);
+ int error=nisam_rrnd(file, buf, (ulong) my_get_ptr(pos,ref_length));
table->status=error ? STATUS_NOT_FOUND: 0;
return !error ? 0 : my_errno ? my_errno : -1;
}
@@ -175,7 +184,7 @@
my_off_t position=nisam_position(file);
if (position == (my_off_t) ~ (ulong) 0)
position=HA_OFFSET_ERROR;
- ha_store_ptr(ref, ref_length, position);
+ my_store_ptr(ref, ref_length, position);
}
int ha_isam::info(uint flag)
@@ -220,7 +229,7 @@
if (flag & HA_STATUS_ERRKEY)
{
errkey = info.errkey;
- ha_store_ptr(dupp_ref, ref_length, info.dupp_key_pos);
+ my_store_ptr(dupp_ref, ref_length, info.dupp_key_pos);
}
if (flag & HA_STATUS_TIME)
update_time = info.update_time;
@@ -330,7 +339,7 @@
}
}
}
- DBUG_PRINT("loop",("found: %lx recpos: %d minpos: %d length: %d",
+ DBUG_PRINT("loop",("found: 0x%lx recpos: %d minpos: %d length: %d",
found,recpos,minpos,length));
if (recpos != minpos)
{ // Reserved space (Null bits?)
--- 1.15.5.1/sql/ha_isammrg.cc 2006-09-28 23:51:26 +10:00
+++ 1.26/BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e 2006-09-28 23:51:26 +10:00
@@ -77,7 +77,7 @@
int ha_isammrg::update_row(const byte * old_data, byte * new_data)
{
- statistic_increment(ha_update_count,&LOCK_status);
+ statistic_increment(table->in_use->status_var.ha_update_count, &LOCK_status);
if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE)
table->timestamp_field->set_time();
return !mrg_update(file,old_data,new_data) ? 0 : my_errno ? my_errno : -1;
@@ -85,7 +85,7 @@
int ha_isammrg::delete_row(const byte * buf)
{
- statistic_increment(ha_delete_count,&LOCK_status);
+ statistic_increment(table->in_use->status_var.ha_delete_count, &LOCK_status);
return !mrg_delete(file,buf) ? 0 : my_errno ? my_errno : -1;
}
@@ -128,7 +128,8 @@
int ha_isammrg::rnd_next(byte *buf)
{
- statistic_increment(ha_read_rnd_next_count,&LOCK_status);
+ statistic_increment(table->in_use->status_var.ha_read_rnd_next_count,
+ &LOCK_status);
int error=mrg_rrnd(file, buf, ~(mrg_off_t) 0);
table->status=error ? STATUS_NOT_FOUND: 0;
return !error ? 0 : my_errno ? my_errno : -1;
@@ -136,8 +137,9 @@
int ha_isammrg::rnd_pos(byte * buf, byte *pos)
{
- statistic_increment(ha_read_rnd_count,&LOCK_status);
- int error=mrg_rrnd(file, buf, (ulong) ha_get_ptr(pos,ref_length));
+ statistic_increment(table->in_use->status_var.ha_read_rnd_count,
+ &LOCK_status);
+ int error=mrg_rrnd(file, buf, (ulong) my_get_ptr(pos,ref_length));
table->status=error ? STATUS_NOT_FOUND: 0;
return !error ? 0 : my_errno ? my_errno : -1;
}
@@ -145,7 +147,7 @@
void ha_isammrg::position(const byte *record)
{
ulong position= mrg_position(file);
- ha_store_ptr(ref, ref_length, (my_off_t) position);
+ my_store_ptr(ref, ref_length, (my_off_t) position);
}
--- 1.180/sql/item_sum.cc 2006-09-28 23:51:26 +10:00
+++ 1.181/sql/item_sum.cc 2006-09-28 23:51:26 +10:00
@@ -2655,6 +2655,7 @@
longlong Item_sum_count_distinct::val_int()
{
+ int error;
DBUG_ASSERT(fixed == 1);
if (!table) // Empty query
return LL(0);
@@ -2668,7 +2669,14 @@
tree->walk(count_distinct_walk, (void*) &count);
return (longlong) count;
}
- table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
+
+ error= table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
+
+ if(error)
+ {
+ table->file->print_error(error, MYF(0));
+ }
+
return table->file->records;
}
--- 1.179/sql/sql_delete.cc 2006-09-28 23:51:26 +10:00
+++ 1.180/sql/sql_delete.cc 2006-09-28 23:51:26 +10:00
@@ -49,7 +49,12 @@
table_list->view_db.str, table_list->view_name.str);
DBUG_RETURN(TRUE);
}
- table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
+ error= table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
+ if (error)
+ {
+ table->file->print_error(error, MYF(0));
+ DBUG_RETURN(error);
+ }
thd->proc_info="init";
table->map=1;
--- 1.457/sql/sql_select.cc 2006-09-28 23:51:26 +10:00
+++ 1.458/sql/sql_select.cc 2006-09-28 23:51:26 +10:00
@@ -2093,7 +2093,12 @@
s->needed_reg.init();
table_vector[i]=s->table=table=tables->table;
table->pos_in_table_list= tables;
- table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);// record count
+ error= table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
+ if(error)
+ {
+ table->file->print_error(error, MYF(0));
+ DBUG_RETURN(1);
+ }
table->quick_keys.clear_all();
table->reginfo.join_tab=s;
table->reginfo.not_exists_optimize=0;
--- 1.132/sql/sql_union.cc 2006-09-28 23:51:26 +10:00
+++ 1.133/sql/sql_union.cc 2006-09-28 23:51:26 +10:00
@@ -496,7 +496,12 @@
DBUG_RETURN(res);
}
/* Needed for the following test and for records_at_start in next loop */
- table->file->info(HA_STATUS_VARIABLE);
+ int error= table->file->info(HA_STATUS_VARIABLE);
+ if(error)
+ {
+ table->file->print_error(error, MYF(0));
+ DBUG_RETURN(1);
+ }
if (found_rows_for_union && !sl->braces &&
select_limit_cnt != HA_POS_ERROR)
{
--- 1.23/sql/ha_blackhole.cc 2006-09-28 23:51:26 +10:00
+++ 1.24/sql/ha_blackhole.cc 2006-09-28 23:51:26 +10:00
@@ -138,7 +138,7 @@
}
-void ha_blackhole::info(uint flag)
+int ha_blackhole::info(uint flag)
{
DBUG_ENTER("ha_blackhole::info");
@@ -152,7 +152,7 @@
delete_length= 0;
if (flag & HA_STATUS_AUTO)
auto_increment_value= 1;
- DBUG_VOID_RETURN;
+ DBUG_RETURN(0);
}
int ha_blackhole::external_lock(THD *thd, int lock_type)
--- 1.5/sql/ha_blackhole.h 2006-09-28 23:51:26 +10:00
+++ 1.6/sql/ha_blackhole.h 2006-09-28 23:51:26 +10:00
@@ -76,7 +76,7 @@
int index_first(byte * buf);
int index_last(byte * buf);
void position(const byte *record);
- void info(uint flag);
+ int info(uint flag);
int external_lock(THD *thd, int lock_type);
uint lock_count(void) const;
int create(const char *name, TABLE *table_arg,
| Thread |
|---|
| • bk commit into 5.0 tree (stewart:1.2290) | Stewart Smith | 28 Sep |
