Skip to content

M
MariaDB
Commit 9308764b authored by unknown's avatar unknown
Browse files
Options

Merge 


sql/sql_base.cc:
  merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parents 3049cfbf 89325ed7
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 45 deletions
BitKeeper/etc/logging_ok
View file @ 9308764b
jani@prima.mysql.com jani@prima.mysql.com
serg@serg.mysql.com
myisammrg/mymrgdef.h
View file @ 9308764b
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB /* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
...@@ -30,5 +30,3 @@ extern pthread_mutex_t THR_LOCK_open; ...@@ -30,5 +30,3 @@ extern pthread_mutex_t THR_LOCK_open;
int _myrg_init_queue(MYRG_INFO *info,int inx,enum ha_rkey_function search_flag); int _myrg_init_queue(MYRG_INFO *info,int inx,enum ha_rkey_function search_flag);
int _myrg_finish_scan(MYRG_INFO *info, int inx, enum ha_rkey_function type); int _myrg_finish_scan(MYRG_INFO *info, int inx, enum ha_rkey_function type);
MYRG_TABLE *_myrg_find_table(MYRG_INFO *info, ulonglong pos);
myisammrg/myrg_extra.c
View file @ 9308764b
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB /* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
...@@ -26,6 +26,8 @@ int myrg_extra(MYRG_INFO *info,enum ha_extra_function function) ...@@ -26,6 +26,8 @@ int myrg_extra(MYRG_INFO *info,enum ha_extra_function function)
{ {
int error,save_error=0; int error,save_error=0;
MYRG_TABLE *file; MYRG_TABLE *file;
DBUG_ENTER("myrg_extra");
DBUG_PRINT("info",("function: %d",(ulong) function));
if (function == HA_EXTRA_CACHE) if (function == HA_EXTRA_CACHE)
info->cache_in_use=1; info->cache_in_use=1;
...@@ -38,9 +40,19 @@ int myrg_extra(MYRG_INFO *info,enum ha_extra_function function) ...@@ -38,9 +40,19 @@ int myrg_extra(MYRG_INFO *info,enum ha_extra_function function)
info->current_table=0; info->current_table=0;
info->last_used_table=info->open_tables; info->last_used_table=info->open_tables;
} }
info->records=info->del=info->data_file_length=0;
for (file=info->open_tables ; file != info->end_table ; file++) for (file=info->open_tables ; file != info->end_table ; file++)
{
if ((error=mi_extra(file->table,function))) if ((error=mi_extra(file->table,function)))
save_error=error; save_error=error;
file->file_offset=info->data_file_length;
info->data_file_length+=file->table->s->state.state.data_file_length;
info->records+=file->table->s->state.state.records;
info->del+=file->table->s->state.state.del;
DBUG_PRINT("info2",("table: %s, offset: 0x%08lx",
file->table->filename,(ulong)file->file_offset));
}
} }
return save_error; DBUG_RETURN(save_error);
} }
myisammrg/myrg_info.c
View file @ 9308764b
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB /* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
...@@ -35,8 +35,6 @@ int myrg_status(MYRG_INFO *info,register MYMERGE_INFO *x,int flag) ...@@ -35,8 +35,6 @@ int myrg_status(MYRG_INFO *info,register MYMERGE_INFO *x,int flag)
MYRG_TABLE *current_table; MYRG_TABLE *current_table;
DBUG_ENTER("myrg_status"); DBUG_ENTER("myrg_status");
_myrg_find_table(info, HA_OFFSET_ERROR);
if (!(current_table = info->current_table) && if (!(current_table = info->current_table) &&
info->open_tables != info->end_table) info->open_tables != info->end_table)
current_table = info->open_tables; current_table = info->open_tables;
......
myisammrg/myrg_rrnd.c
View file @ 9308764b
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
#include "mymrgdef.h" #include "mymrgdef.h"
static MYRG_TABLE *find_table(MYRG_TABLE *start,MYRG_TABLE *end,ulonglong pos);
/* /*
If filepos == HA_OFFSET_ERROR, read next If filepos == HA_OFFSET_ERROR, read next
Returns same as mi_rrnd: Returns same as mi_rrnd:
...@@ -33,6 +35,8 @@ int myrg_rrnd(MYRG_INFO *info,byte *buf,ulonglong filepos) ...@@ -33,6 +35,8 @@ int myrg_rrnd(MYRG_INFO *info,byte *buf,ulonglong filepos)
{ {
int error; int error;
MI_INFO *isam_info; MI_INFO *isam_info;
DBUG_ENTER("myrg_rrnd");
DBUG_PRINT("info",("offset: 0x%016qx", (ulonglong)filepos));
if (filepos == HA_OFFSET_ERROR) if (filepos == HA_OFFSET_ERROR)
{ {
...@@ -40,7 +44,7 @@ int myrg_rrnd(MYRG_INFO *info,byte *buf,ulonglong filepos) ...@@ -40,7 +44,7 @@ int myrg_rrnd(MYRG_INFO *info,byte *buf,ulonglong filepos)
{ {
if (info->open_tables == info->end_table) if (info->open_tables == info->end_table)
{ /* No tables */ { /* No tables */
return (my_errno=HA_ERR_END_OF_FILE); DBUG_RETURN(my_errno=HA_ERR_END_OF_FILE);
} }
isam_info=(info->current_table=info->open_tables)->table; isam_info=(info->current_table=info->open_tables)->table;
if (info->cache_in_use) if (info->cache_in_use)
...@@ -60,11 +64,11 @@ int myrg_rrnd(MYRG_INFO *info,byte *buf,ulonglong filepos) ...@@ -60,11 +64,11 @@ int myrg_rrnd(MYRG_INFO *info,byte *buf,ulonglong filepos)
if ((error=(*isam_info->s->read_rnd)(isam_info,(byte*) buf, if ((error=(*isam_info->s->read_rnd)(isam_info,(byte*) buf,
(my_off_t) filepos,1)) != (my_off_t) filepos,1)) !=
HA_ERR_END_OF_FILE) HA_ERR_END_OF_FILE)
return (error); DBUG_RETURN(error);
if (info->cache_in_use) if (info->cache_in_use)
mi_extra(info->current_table->table,HA_EXTRA_NO_CACHE); mi_extra(info->current_table->table,HA_EXTRA_NO_CACHE);
if (info->current_table+1 == info->end_table) if (info->current_table+1 == info->end_table)
return(HA_ERR_END_OF_FILE); DBUG_RETURN(HA_ERR_END_OF_FILE);
info->current_table++; info->current_table++;
info->last_used_table=info->current_table; info->last_used_table=info->current_table;
if (info->cache_in_use) if (info->cache_in_use)
...@@ -78,31 +82,34 @@ int myrg_rrnd(MYRG_INFO *info,byte *buf,ulonglong filepos) ...@@ -78,31 +82,34 @@ int myrg_rrnd(MYRG_INFO *info,byte *buf,ulonglong filepos)
isam_info->lastinx= (uint) -1; isam_info->lastinx= (uint) -1;
} }
} }
info->current_table=_myrg_find_table(info,filepos); info->current_table=find_table(info->open_tables,
info->end_table-1,filepos);
isam_info=info->current_table->table; isam_info=info->current_table->table;
isam_info->update&= HA_STATE_CHANGED; isam_info->update&= HA_STATE_CHANGED;
return ((*isam_info->s->read_rnd) DBUG_RETURN((*isam_info->s->read_rnd)
(isam_info, (byte*) buf, (isam_info, (byte*) buf,
(ha_rows) (filepos - info->current_table->file_offset), (ha_rows) (filepos - info->current_table->file_offset),
0)); 0));
} }
/* Find which table to use according to file-pos */ /* Find which table to use according to file-pos */
MYRG_TABLE *_myrg_find_table(MYRG_INFO *info, ulonglong pos) static MYRG_TABLE *find_table(MYRG_TABLE *start, MYRG_TABLE *end,
ulonglong pos)
{ {
MYRG_TABLE *t; MYRG_TABLE *mid;
DBUG_ENTER("find_table");
info->records=info->del=info->data_file_length=0;
for (t=info->open_tables ; t < info->end_table ; t++) while (start != end)
{ {
t->file_offset=info->data_file_length; mid=start+((uint) (end-start)+1)/2;
if (pos < t->file_offset) return t-1; if (mid->file_offset > pos)
info->data_file_length+=t->table->state->data_file_length; end=mid-1;
info->records+=t->table->state->records; else
info->del+=t->table->state->del; start=mid;
} }
return t-1; DBUG_PRINT("info",("offset: 0x%016qx, table: %s",
(ulonglong)pos, start->table->filename));
DBUG_RETURN(start);
} }
sql/sql_base.cc
View file @ 9308764b
...@@ -426,22 +426,22 @@ void close_temporary_tables(THD *thd) ...@@ -426,22 +426,22 @@ void close_temporary_tables(THD *thd)
char* query, *p; char* query, *p;
LINT_INIT(p); LINT_INIT(p);
query_buf_size = init_query_buf_size; query_buf_size = init_query_buf_size;
for (table=thd->temporary_tables ; table ; table=table->next) for (table=thd->temporary_tables ; table ; table=table->next)
{ {
query_buf_size += table->key_length; query_buf_size += table->key_length;
} }
if(query_buf_size == init_query_buf_size) if(query_buf_size == init_query_buf_size)
return; // no tables to close return; // no tables to close
if((query = alloc_root(&thd->mem_root, query_buf_size))) if((query = alloc_root(&thd->mem_root, query_buf_size)))
{ {
memcpy(query, "drop table ", init_query_buf_size); memcpy(query, "drop table ", init_query_buf_size);
p = query + init_query_buf_size; p = query + init_query_buf_size;
} }
for (table=thd->temporary_tables ; table ; table=next) for (table=thd->temporary_tables ; table ; table=next)
{ {
if(query) // we might be out of memory, but this is not fatal if(query) // we might be out of memory, but this is not fatal
...@@ -475,7 +475,7 @@ TABLE **find_temporary_table(THD *thd, const char *db, const char *table_name) ...@@ -475,7 +475,7 @@ TABLE **find_temporary_table(THD *thd, const char *db, const char *table_name)
int4store(key+key_length,thd->slave_proxy_id); int4store(key+key_length,thd->slave_proxy_id);
key_length += 4; key_length += 4;
prev= &thd->temporary_tables; prev= &thd->temporary_tables;
for (table=thd->temporary_tables ; table ; table=table->next) for (table=thd->temporary_tables ; table ; table=table->next)
{ {
...@@ -623,7 +623,7 @@ TABLE *reopen_name_locked_table(THD* thd, TABLE_LIST* table_list) ...@@ -623,7 +623,7 @@ TABLE *reopen_name_locked_table(THD* thd, TABLE_LIST* table_list)
pthread_mutex_unlock(&LOCK_open); pthread_mutex_unlock(&LOCK_open);
DBUG_RETURN(0); DBUG_RETURN(0);
} }
table->key_length=key_length; table->key_length=key_length;
table->version=0; table->version=0;
table->flush_version=0; table->flush_version=0;
...@@ -640,7 +640,7 @@ TABLE *reopen_name_locked_table(THD* thd, TABLE_LIST* table_list) ...@@ -640,7 +640,7 @@ TABLE *reopen_name_locked_table(THD* thd, TABLE_LIST* table_list)
table->outer_join=table->null_row=table->maybe_null=0; table->outer_join=table->null_row=table->maybe_null=0;
table->status=STATUS_NO_RECORD; table->status=STATUS_NO_RECORD;
table->keys_in_use_for_query=table->used_keys= table->keys_in_use; table->keys_in_use_for_query=table->used_keys= table->keys_in_use;
DBUG_RETURN(table); DBUG_RETURN(table);
} }
...@@ -669,7 +669,7 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name, ...@@ -669,7 +669,7 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name,
DBUG_RETURN(0); DBUG_RETURN(0);
key_length= (uint) (strmov(strmov(key,db)+1,table_name)-key)+1; key_length= (uint) (strmov(strmov(key,db)+1,table_name)-key)+1;
int4store(key + key_length, thd->slave_proxy_id); int4store(key + key_length, thd->slave_proxy_id);
for (table=thd->temporary_tables; table ; table=table->next) for (table=thd->temporary_tables; table ; table=table->next)
{ {
if (table->key_length == key_length+4 && if (table->key_length == key_length+4 &&
...@@ -740,6 +740,7 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name, ...@@ -740,6 +740,7 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name,
} }
table->prev->next=table->next; /* Remove from unused list */ table->prev->next=table->next; /* Remove from unused list */
table->next->prev=table->prev; table->next->prev=table->prev;
table->file->reset();
} }
else else
{ {
...@@ -1086,7 +1087,7 @@ bool wait_for_tables(THD *thd) ...@@ -1086,7 +1087,7 @@ bool wait_for_tables(THD *thd)
close_old_data_files(thd,thd->open_tables,0,dropping_tables != 0); close_old_data_files(thd,thd->open_tables,0,dropping_tables != 0);
if (!table_is_used(thd->open_tables,1)) if (!table_is_used(thd->open_tables,1))
break; break;
(void) pthread_cond_wait(&COND_refresh,&LOCK_open); (void) pthread_cond_wait(&COND_refresh,&LOCK_open);
} }
if (thd->killed) if (thd->killed)
result= 1; // aborted result= 1; // aborted
...@@ -1206,7 +1207,7 @@ static int open_unireg_entry(THD *thd, TABLE *entry, const char *db, ...@@ -1206,7 +1207,7 @@ static int open_unireg_entry(THD *thd, TABLE *entry, const char *db,
HA_TRY_READ_ONLY), HA_TRY_READ_ONLY),
READ_KEYINFO | COMPUTE_TYPES | EXTRA_RECORD, READ_KEYINFO | COMPUTE_TYPES | EXTRA_RECORD,
ha_open_options | HA_OPEN_FOR_REPAIR, ha_open_options | HA_OPEN_FOR_REPAIR,
entry) || ! entry->file || entry) || ! entry->file ||
(entry->file->is_crashed() && entry->file->check_and_repair(thd))) (entry->file->is_crashed() && entry->file->check_and_repair(thd)))
{ {
/* Give right error message */ /* Give right error message */
...@@ -1383,7 +1384,7 @@ TABLE *open_temporary_table(THD *thd, const char *path, const char *db, ...@@ -1383,7 +1384,7 @@ TABLE *open_temporary_table(THD *thd, const char *path, const char *db,
{ {
TABLE *tmp_table; TABLE *tmp_table;
DBUG_ENTER("open_temporary_table"); DBUG_ENTER("open_temporary_table");
// the extra size in my_malloc() is for table_cache_key // the extra size in my_malloc() is for table_cache_key
// 4 bytes for master thread id if we are in the slave // 4 bytes for master thread id if we are in the slave
// 1 byte to terminate db // 1 byte to terminate db
...@@ -1414,7 +1415,7 @@ TABLE *open_temporary_table(THD *thd, const char *path, const char *db, ...@@ -1414,7 +1415,7 @@ TABLE *open_temporary_table(THD *thd, const char *path, const char *db,
int4store(tmp_table->table_cache_key + tmp_table->key_length, int4store(tmp_table->table_cache_key + tmp_table->key_length,
thd->slave_proxy_id); thd->slave_proxy_id);
tmp_table->key_length += 4; tmp_table->key_length += 4;
if (link_in_list) if (link_in_list)
{ {
tmp_table->next=thd->temporary_tables; tmp_table->next=thd->temporary_tables;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7