1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

After merge fixes

Browse Source
This commit is contained in:
unknown 2004-07-12 07:43:38 +03:00
parent 11b8987313
commit c4645f8404
12 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
myisam/myisamchk.c
View File

@ -1693,11 +1693,11 @@ err:
sorting
*/
static my_bool not_killed= 0;
static int not_killed= 0;
volatile int *killed_ptr(MI_CHECK *param)
{
return (int *)thd; /* always NULL */
return &not_killed; /* always NULL */
}
/* print warnings and errors */

2
myisam/myisamdef.h
View File

@ -711,7 +711,7 @@ int mi_open_keyfile(MYISAM_SHARE *share);
void mi_setup_functions(register MYISAM_SHARE *share);
/* Functions needed by mi_check */
int *killed_ptr(void *thd);
volatile int *killed_ptr(MI_CHECK *param);
void mi_check_print_error _VARARGS((MI_CHECK *param, const char *fmt,...));
void mi_check_print_warning _VARARGS((MI_CHECK *param, const char *fmt,...));
void mi_check_print_info _VARARGS((MI_CHECK *param, const char *fmt,...));

5
sql/ha_myisam.cc
View File

@ -87,9 +87,10 @@ static void mi_check_print_msg(MI_CHECK *param, const char* msg_type,
extern "C" {
int *killed_ptr(void *thd)
volatile int *killed_ptr(MI_CHECK *param)
{
return (int*)&((THD *)thd)->killed;
/* In theory Unsafe conversion, but should be ok for now */
return (int*) &(((THD *)(param->thd))->killed);
}
void mi_check_print_error(MI_CHECK *param, const char *fmt,...)

2
sql/mysql_priv.h
View File

@ -930,7 +930,7 @@ extern char *shared_memory_base_name, *mysqld_unix_port;
extern bool opt_enable_shared_memory;
extern char *default_tz_name;
extern MYSQL_LOG mysql_log,mysql_update_log,mysql_slow_log,mysql_bin_log;
extern MYSQL_LOG mysql_log,mysql_slow_log,mysql_bin_log;
extern FILE *bootstrap_file;
extern pthread_key(MEM_ROOT*,THR_MALLOC);
extern pthread_mutex_t LOCK_mysql_create_db,LOCK_Acl,LOCK_open,

4
sql/opt_range.cc
View File

@ -954,7 +954,7 @@ int QUICK_ROR_INTERSECT_SELECT::init_ror_merged_scan(bool reuse_handler)
quick->record= head->record[0];
}
if (need_to_fetch_row && head->file->rnd_init())
if (need_to_fetch_row && head->file->ha_rnd_init(1))
{
DBUG_PRINT("error", ("ROR index_merge rnd_init call failed"));
DBUG_RETURN(1);
@ -1105,7 +1105,7 @@ int QUICK_ROR_UNION_SELECT::reset()
queue_insert(&queue, (byte*)quick);
}
if (head->file->rnd_init())
if (head->file->ha_rnd_init(1))
{
DBUG_PRINT("error", ("ROR index_merge rnd_init call failed"));
DBUG_RETURN(1);

6
sql/parse_file.h
View File

@ -32,9 +32,9 @@ typedef enum {
struct File_option
{
const LEX_STRING name; /* Name of the option */
int offset; /* offset to base address of value */
enum file_opt_type type; /* Option type */
LEX_STRING name; /* Name of the option */
int offset; /* offset to base address of value */
enum file_opt_type type; /* Option type */
};
class File_parser;

2
sql/set_var.cc
View File

@ -2736,6 +2736,7 @@ int sql_set_variables(THD *thd, List<set_var_base> *var_list)
bool not_all_support_one_shot(List<set_var_base> *var_list)
{
#if MYSQL_VERSION_ID < 50000
List_iterator_fast<set_var_base> it(*var_list);
set_var_base *var;
while ((var= it++))
@ -2743,6 +2744,7 @@ bool not_all_support_one_shot(List<set_var_base> *var_list)
if (var->no_support_one_shot())
return 1;
}
#endif
return 0;
}

4
sql/sp.cc
View File

@ -587,7 +587,7 @@ db_show_routine_status(THD *thd, int type, const char *wild)
}
}
table->file->index_init(0);
table->file->ha_index_init(0);
if ((res= table->file->index_first(table->record[0])))
{
res= (res == HA_ERR_END_OF_FILE) ? 0 : SP_INTERNAL_ERROR;
@ -647,7 +647,7 @@ sp_drop_db_routines(THD *thd, char *db)
}
ret= SP_OK;
table->file->index_init(0);
table->file->ha_index_init(0);
if (! table->file->index_read(table->record[0],
key, keylen, HA_READ_KEY_EXACT))
{

1
sql/sp_head.cc
View File

@ -917,7 +917,6 @@ sp_head::show_create_function(THD *thd)
sys_var *sql_mode_var;
byte *sql_mode_str;
ulong sql_mode_len;
DBUG_ENTER("sp_head::show_create_function");
DBUG_PRINT("info", ("procedure %s", m_name.str));

1
sql/sql_db.cc
View File

@ -400,7 +400,6 @@ int mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
query =thd->query;
query_length= thd->query_length;
}
mysql_update_log.write(thd, query, query_length);
if (mysql_bin_log.is_open())
{
Query_log_event qinfo(thd, query, query_length, 0);

2
sql/sql_prepare.cc
View File

@ -1868,7 +1868,7 @@ static void execute_stmt(THD *thd, Prepared_statement *stmt,
thd->stmt_backup.set_statement(thd);
thd->set_statement(stmt);
}
reset_stmt_for_execute(stmt);
reset_stmt_for_execute(thd, stmt->lex);
if (expanded_query->length() &&
alloc_query(thd, (char *)expanded_query->ptr(),

2
sql/sql_select.cc
View File

@ -8839,7 +8839,7 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit,
}
else
{
select->quick->file->ha_index_end();
select->quick->head->file->ha_index_end();
/*
We have verified above that select->quick is not
index_merge quick select.