database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-4.1-ndb

Browse Source 
into  willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2
This commit is contained in:
stewart@willster.(none)
2006-10-25 17:24:20 +10:00
parent 0f74244d86 5926602aa7
commit a4faddc64f
30 changed files with 128 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/examples/ha_archive.cc
View File

@ -972,7 +972,7 @@ int ha_archive::index_last(byte * buf)
}
void ha_archive::info(uint flag)
int ha_archive::info(uint flag)
{
DBUG_ENTER("ha_archive::info");
@ -980,7 +980,7 @@ void ha_archive::info(uint flag)
records= share->rows_recorded;
deleted= 0;
DBUG_VOID_RETURN;
DBUG_RETURN(0);
}
int ha_archive::extra(enum ha_extra_function operation)

2
sql/examples/ha_archive.h
View File

@ -116,7 +116,7 @@ public:
int read_data_header(gzFile file_to_read);
int write_data_header(gzFile file_to_write);
void position(const byte *record);
void info(uint);
int info(uint);
int extra(enum ha_extra_function operation);
int reset(void);
int external_lock(THD *thd, int lock_type);

4
sql/examples/ha_example.cc
View File

@ -486,10 +486,10 @@ int ha_example::rnd_pos(byte * buf, byte *pos)
sql_update.cc
*/
void ha_example::info(uint flag)
int ha_example::info(uint flag)
{
DBUG_ENTER("ha_example::info");
DBUG_VOID_RETURN;
DBUG_RETURN(0);
}

2
sql/examples/ha_example.h
View File

@ -138,7 +138,7 @@ public:
int rnd_next(byte *buf); //required
int rnd_pos(byte * buf, byte *pos); //required
void position(const byte *record); //required
void info(uint); //required
int info(uint); //required
int extra(enum ha_extra_function operation);
int reset(void);

4
sql/examples/ha_tina.cc
View File

@ -683,13 +683,13 @@ int ha_tina::rnd_pos(byte * buf, byte *pos)
Currently this table handler doesn't implement most of the fields
really needed. SHOW also makes use of this data
*/
void ha_tina::info(uint flag)
int ha_tina::info(uint flag)
{
DBUG_ENTER("ha_tina::info");
/* This is a lie, but you don't want the optimizer to see zero or 1 */
if (records < 2)
records= 2;
DBUG_VOID_RETURN;
DBUG_RETURN(0);
}
/*

2
sql/examples/ha_tina.h
View File

@ -115,7 +115,7 @@ class ha_tina: public handler
int rnd_pos(byte * buf, byte *pos);
int rnd_end();
void position(const byte *record);
void info(uint);
int info(uint);
int extra(enum ha_extra_function operation);
int reset(void);
int external_lock(THD *thd, int lock_type);

4
sql/ha_berkeley.cc
View File

@ -1715,7 +1715,7 @@ void ha_berkeley::position(const byte *record)
}
void ha_berkeley::info(uint flag)
int ha_berkeley::info(uint flag)
{
DBUG_ENTER("ha_berkeley::info");
if (flag & HA_STATUS_VARIABLE)
@ -1735,7 +1735,7 @@ void ha_berkeley::info(uint flag)
/* Don't return key if we got an error for the internal primary key */
if (flag & HA_STATUS_ERRKEY && last_dup_key < table->keys)
errkey= last_dup_key;
DBUG_VOID_RETURN;
DBUG_RETURN(0);
}

2
sql/ha_berkeley.h
View File

@ -127,7 +127,7 @@ class ha_berkeley: public handler
int rnd_next(byte *buf);
int rnd_pos(byte * buf, byte *pos);
void position(const byte *record);
void info(uint);
int info(uint);
int extra(enum ha_extra_function operation);
int reset(void);
int external_lock(THD *thd, int lock_type);

4
sql/ha_blackhole.cc
View File

@ -100,7 +100,7 @@ void ha_blackhole::position(const byte *record)
}
void ha_blackhole::info(uint flag)
int ha_blackhole::info(uint flag)
{
DBUG_ENTER("ha_blackhole::info");
@ -114,7 +114,7 @@ void ha_blackhole::info(uint flag)
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)

2
sql/ha_blackhole.h
View File

@ -78,7 +78,7 @@ public:
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,

3
sql/ha_heap.cc
View File

@ -282,7 +282,7 @@ void ha_heap::position(const byte *record)
*(HEAP_PTR*) ref= heap_position(file); // Ref is aligned
}
void ha_heap::info(uint flag)
int ha_heap::info(uint flag)
{
HEAPINFO info;
(void) heap_info(file,&info,flag);
@ -304,6 +304,7 @@ void ha_heap::info(uint flag)
*/
if (key_stat_version != file->s->key_stat_version)
update_key_stats();
return 0;
}
int ha_heap::extra(enum ha_extra_function operation)

2
sql/ha_heap.h
View File

@ -80,7 +80,7 @@ public:
int rnd_next(byte *buf);
int rnd_pos(byte * buf, byte *pos);
void position(const byte *record);
void info(uint);
int info(uint);
int extra(enum ha_extra_function operation);
int external_lock(THD *thd, int lock_type);
int delete_all_rows(void);

6
sql/ha_innodb.cc
View File

@ -4570,7 +4570,7 @@ ha_innobase::read_time(
Returns statistics information of the table to the MySQL interpreter,
in various fields of the handle object. */
void
int
ha_innobase::info(
/*==============*/
uint flag) /* in: what information MySQL requests */
@ -4593,7 +4593,7 @@ ha_innobase::info(
if (srv_force_recovery >= SRV_FORCE_NO_IBUF_MERGE) {
DBUG_VOID_RETURN;
DBUG_RETURN(HA_ERR_CRASHED);
}
/* We do not know if MySQL can call this function before calling
@ -4758,7 +4758,7 @@ ha_innobase::info(
prebuilt->trx->op_info = (char*)"";
DBUG_VOID_RETURN;
DBUG_RETURN(0);
}
/**************************************************************************

2
sql/ha_innodb.h
View File

@ -142,7 +142,7 @@ class ha_innobase: public handler
int rnd_pos(byte * buf, byte *pos);
void position(const byte *record);
void info(uint);
int info(uint);
int analyze(THD* thd,HA_CHECK_OPT* check_opt);
int optimize(THD* thd,HA_CHECK_OPT* check_opt);
int discard_or_import_tablespace(my_bool discard);

3
sql/ha_isam.cc
View File

@ -178,7 +178,7 @@ void ha_isam::position(const byte *record)
ha_store_ptr(ref, ref_length, position);
}
void ha_isam::info(uint flag)
int ha_isam::info(uint flag)
{
N_ISAMINFO info;
(void) nisam_info(file,&info,flag);
@ -224,6 +224,7 @@ void ha_isam::info(uint flag)
}
if (flag & HA_STATUS_TIME)
update_time = info.update_time;
return 0;
}

2
sql/ha_isam.h
View File

@ -67,7 +67,7 @@ class ha_isam: public handler
int rnd_next(byte *buf);
int rnd_pos(byte * buf, byte *pos);
void position(const byte *record);
void info(uint);
int info(uint);
int extra(enum ha_extra_function operation);
int external_lock(THD *thd, int lock_type);
ha_rows records_in_range(uint inx, key_range *min_key, key_range *max_key);

3
sql/ha_isammrg.cc
View File

@ -149,7 +149,7 @@ void ha_isammrg::position(const byte *record)
}
void ha_isammrg::info(uint flag)
int ha_isammrg::info(uint flag)
{
MERGE_INFO info;
(void) mrg_info(file,&info,flag);
@ -163,6 +163,7 @@ void ha_isammrg::info(uint flag)
block_size=0;
update_time=0;
ref_length=4; // Should be big enough
return 0;
}

2
sql/ha_isammrg.h
View File

@ -58,7 +58,7 @@ class ha_isammrg: public handler
int rnd_next(byte *buf);
int rnd_pos(byte * buf, byte *pos);
void position(const byte *record);
void info(uint);
int info(uint);
int extra(enum ha_extra_function operation);
int external_lock(THD *thd, int lock_type);
uint lock_count(void) const;

4
sql/ha_myisam.cc
View File

@ -1214,7 +1214,7 @@ void ha_myisam::position(const byte* record)
ha_store_ptr(ref, ref_length, position);
}
void ha_myisam::info(uint flag)
int ha_myisam::info(uint flag)
{
MI_ISAMINFO info;
char name_buff[FN_REFLEN];
@ -1273,6 +1273,8 @@ void ha_myisam::info(uint flag)
update_time = info.update_time;
if (flag & HA_STATUS_AUTO)
auto_increment_value= info.auto_increment;
return 0;
}

2
sql/ha_myisam.h
View File

@ -100,7 +100,7 @@ class ha_myisam: public handler
int rnd_pos(byte * buf, byte *pos);
int restart_rnd_next(byte *buf, byte *pos);
void position(const byte *record);
void info(uint);
int info(uint);
int extra(enum ha_extra_function operation);
int extra_opt(enum ha_extra_function operation, ulong cache_size);
int external_lock(THD *thd, int lock_type);

3
sql/ha_myisammrg.cc
View File

@ -218,7 +218,7 @@ ha_rows ha_myisammrg::records_in_range(uint inx, key_range *min_key,
}
void ha_myisammrg::info(uint flag)
int ha_myisammrg::info(uint flag)
{
MYMERGE_INFO info;
(void) myrg_status(file,&info,flag);
@ -266,6 +266,7 @@ void ha_myisammrg::info(uint flag)
min(file->keys, table->key_parts));
}
}
return 0;
}

2
sql/ha_myisammrg.h
View File

@ -71,7 +71,7 @@ class ha_myisammrg: public handler
int rnd_pos(byte * buf, byte *pos);
void position(const byte *record);
ha_rows records_in_range(uint inx, key_range *min_key, key_range *max_key);
void info(uint);
int info(uint);
int extra(enum ha_extra_function operation);
int extra_opt(enum ha_extra_function operation, ulong cache_size);
int external_lock(THD *thd, int lock_type);

62
sql/ha_ndbcluster.cc
View File

@ -85,7 +85,7 @@ static int packfrm(const void *data, uint len, const void **pack_data, uint *pac
static int unpackfrm(const void **data, uint *len,
const void* pack_data);
static int ndb_get_table_statistics(Ndb*, const char *,
static int ndb_get_table_statistics(ha_ndbcluster*, bool, Ndb*, const char *,
Uint64* rows, Uint64* commits);
@ -258,11 +258,13 @@ void ha_ndbcluster::set_rec_per_key()
DBUG_VOID_RETURN;
}
void ha_ndbcluster::records_update()
int ha_ndbcluster::records_update()
{
if (m_ha_not_exact_count)
return;
return 0;
DBUG_ENTER("ha_ndbcluster::records_update");
int result= 0;
struct Ndb_local_table_statistics *info=
(struct Ndb_local_table_statistics *)m_table_info;
DBUG_PRINT("info", ("id=%d, no_uncommitted_rows_count=%d",
@ -273,7 +275,9 @@ void ha_ndbcluster::records_update()
Ndb *ndb= get_ndb();
Uint64 rows;
ndb->setDatabaseName(m_dbname);
if(ndb_get_table_statistics(ndb, m_tabname, &rows, 0) == 0){
result= ndb_get_table_statistics(this, true, ndb, m_tabname, &rows, 0);
if(result == 0)
{
info->records= rows;
}
}
@ -282,8 +286,9 @@ void ha_ndbcluster::records_update()
if (((Thd_ndb*)(thd->transaction.thd_ndb))->error)
info->no_uncommitted_rows_count= 0;
}
if(result==0)
records= info->records+ info->no_uncommitted_rows_count;
DBUG_VOID_RETURN;
DBUG_RETURN(result);
}
void ha_ndbcluster::no_uncommitted_rows_execute_failure()
@ -2886,8 +2891,9 @@ void ha_ndbcluster::position(const byte *record)
}
void ha_ndbcluster::info(uint flag)
int ha_ndbcluster::info(uint flag)
{
int result= 0;
DBUG_ENTER("info");
DBUG_PRINT("enter", ("flag: %d", flag));
@ -2905,17 +2911,17 @@ void ha_ndbcluster::info(uint flag)
if (m_ha_not_exact_count)
records= 100;
else
records_update();
result= records_update();
}
else
{
if ((my_errno= check_ndb_connection()))
DBUG_VOID_RETURN;
DBUG_RETURN(my_errno);
Ndb *ndb= get_ndb();
Uint64 rows= 100;
ndb->setDatabaseName(m_dbname);
if (current_thd->variables.ndb_use_exact_count)
ndb_get_table_statistics(ndb, m_tabname, &rows, 0);
result= ndb_get_table_statistics(this, true, ndb, m_tabname, &rows, 0);
records= rows;
}
}
@ -2940,7 +2946,11 @@ void ha_ndbcluster::info(uint flag)
ndb->readAutoIncrementValue((const NDBTAB *) m_table);
}
}
DBUG_VOID_RETURN;
if(result == -1)
result= HA_ERR_NO_CONNECTION;
DBUG_RETURN(result);
}
@ -4394,7 +4404,15 @@ int ha_ndbcluster::open(const char *name, int mode, uint test_if_locked)
res= get_metadata(name);
if (!res)
info(HA_STATUS_VARIABLE | HA_STATUS_CONST);
{
Ndb *ndb= get_ndb();
ndb->setDatabaseName(m_dbname);
Uint64 rows= 0;
res= ndb_get_table_statistics(NULL, false, ndb, m_tabname, &rows, 0);
records= rows;
if(!res)
res= info(HA_STATUS_CONST);
}
DBUG_RETURN(res);
}
@ -5276,13 +5294,15 @@ static int unpackfrm(const void **unpack_data, uint *unpack_len,
static
int
ndb_get_table_statistics(Ndb* ndb, const char * table,
ndb_get_table_statistics(ha_ndbcluster* file, bool report_error, Ndb* ndb,
const char * table,
Uint64* row_count, Uint64* commit_count)
{
DBUG_ENTER("ndb_get_table_statistics");
DBUG_PRINT("enter", ("table: %s", table));
NdbConnection* pTrans;
NdbError error;
int reterr= 0;
int retries= 10;
int retry_sleep= 30 * 1000; /* 30 milliseconds */
@ -5351,6 +5371,19 @@ ndb_get_table_statistics(Ndb* ndb, const char * table,
DBUG_RETURN(0);
retry:
if(report_error)
{
if (file)
{
reterr= file->ndb_err(pTrans);
}
else
{
const NdbError& tmp= error;
ERR_PRINT(tmp);
reterr= ndb_to_mysql_error(&tmp);
}
}
if (pTrans)
{
ndb->closeTransaction(pTrans);
@ -5363,8 +5396,9 @@ retry:
}
break;
} while(1);
DBUG_PRINT("exit", ("failed, error %u(%s)", error.code, error.message));
ERR_RETURN(error);
DBUG_PRINT("exit", ("failed, reterr: %u, NdbError %u(%s)", reterr,
error.code, error.message));
DBUG_RETURN(reterr);
}
/*

10
sql/ha_ndbcluster.h
View File

@ -115,7 +115,7 @@ class ha_ndbcluster: public handler
int read_range_next();
bool get_error_message(int error, String *buf);
void info(uint);
int info(uint);
int extra(enum ha_extra_function operation);
int extra_opt(enum ha_extra_function operation, ulong cache_size);
int reset();
@ -154,6 +154,11 @@ class ha_ndbcluster: public handler
static void set_dbname(const char *pathname, char *dbname);
static void set_tabname(const char *pathname, char *tabname);
/*
* Internal to ha_ndbcluster, used by C functions
*/
int ndb_err(NdbConnection*);
private:
int alter_table_name(const char *to);
int drop_table();
@ -206,7 +211,6 @@ class ha_ndbcluster: public handler
longlong get_auto_increment();
void invalidate_dictionary_cache(bool global);
int ndb_err(NdbConnection*);
bool uses_blob_value(bool all_fields);
int write_ndb_file();
@ -256,7 +260,7 @@ class ha_ndbcluster: public handler
Ndb *get_ndb();
void set_rec_per_key();
void records_update();
int records_update();
void no_uncommitted_rows_execute_failure();
void no_uncommitted_rows_update(int);
void no_uncommitted_rows_init(THD *);

2
sql/handler.h
View File

@ -394,7 +394,7 @@ public:
key_range *max_key)
{ return (ha_rows) 10; }
virtual void position(const byte *record)=0;
virtual void info(uint)=0;
virtual int info(uint)=0;
virtual int extra(enum ha_extra_function operation)
{ return 0; }
virtual int extra_opt(enum ha_extra_function operation, ulong cache_size)

10
sql/item_sum.cc
View File

@ -1410,12 +1410,20 @@ bool Item_sum_count_distinct::add()
longlong Item_sum_count_distinct::val_int()
{
int error;
DBUG_ASSERT(fixed == 1);
if (!table) // Empty query
return LL(0);
if (use_tree)
return tree->elements_in_tree;
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;
}

7
sql/opt_sum.cc
View File

@ -125,7 +125,12 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
}
else
{
tl->table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
error= tl->table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
if(error)
{
tl->table->file->print_error(error, MYF(0));
return error;
}
count*= tl->table->file->records;
}
}

7
sql/sql_delete.cc
View File

@ -43,7 +43,12 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
if ((open_and_lock_tables(thd, table_list)))
DBUG_RETURN(-1);
table= table_list->table;
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;

9
sql/sql_select.cc
View File

@ -538,6 +538,8 @@ JOIN::optimize()
{
if (res > 1)
{
thd->fatal_error();
error= res;
DBUG_RETURN(1);
}
if (res < 0)
@ -1796,7 +1798,12 @@ make_join_statistics(JOIN *join,TABLE_LIST *tables,COND *conds,
s->checked_keys.init();
s->needed_reg.init();
table_vector[i]=s->table=table=tables->table;
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;

7
sql/sql_union.cc
View File

@ -492,7 +492,12 @@ int st_select_lex_unit::exec()
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)
{