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

Changed accidently added tabs back into spaces.

Browse Source 
Fixed a bug that came in merge.
This commit is contained in:
jani@a88-113-38-195.elisa-laajakaista.fi
2007-05-28 14:37:39 +03:00
parent fa21379abb
commit b035219762
5 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysqltest.c
View File

@ -1014,7 +1014,7 @@ int dyn_string_cmp(DYNAMIC_STRING* ds, const char *fname)
if (!eval_result && (uint) stat_info.st_size != ds->length) if (!eval_result && (uint) stat_info.st_size != ds->length)
{ {
DBUG_PRINT("info",("Size differs: result size: %u file size: %lu", DBUG_PRINT("info",("Size differs: result size: %u file size: %lu",
(uint) ds->length, (ulong) stat_info.st_size)); (uint) ds->length, (ulong) stat_info.st_size));
DBUG_PRINT("info",("result: '%s'", ds->str)); DBUG_PRINT("info",("result: '%s'", ds->str));
DBUG_RETURN(RESULT_LENGTH_MISMATCH); DBUG_RETURN(RESULT_LENGTH_MISMATCH);
} }

44
mysys/array.c
View File

@ -41,8 +41,8 @@
*/ */
my_bool init_dynamic_array2(DYNAMIC_ARRAY *array, uint element_size, my_bool init_dynamic_array2(DYNAMIC_ARRAY *array, uint element_size,
void *init_buffer, uint init_alloc, void *init_buffer, uint init_alloc,
uint alloc_increment CALLER_INFO_PROTO) uint alloc_increment CALLER_INFO_PROTO)
{ {
DBUG_ENTER("init_dynamic_array"); DBUG_ENTER("init_dynamic_array");
if (!alloc_increment) if (!alloc_increment)
@ -72,8 +72,8 @@ my_bool init_dynamic_array2(DYNAMIC_ARRAY *array, uint element_size,
} }
my_bool init_dynamic_array(DYNAMIC_ARRAY *array, uint element_size, my_bool init_dynamic_array(DYNAMIC_ARRAY *array, uint element_size,
uint init_alloc, uint init_alloc,
uint alloc_increment CALLER_INFO_PROTO) uint alloc_increment CALLER_INFO_PROTO)
{ {
/* placeholder to preserve ABI */ /* placeholder to preserve ABI */
return my_init_dynamic_array_ci(array, element_size, init_alloc, return my_init_dynamic_array_ci(array, element_size, init_alloc,
@ -139,18 +139,18 @@ uchar *alloc_dynamic(DYNAMIC_ARRAY *array)
so we have to create an all-new malloc since we overflowed so we have to create an all-new malloc since we overflowed
*/ */
if (!(new_ptr= (char *) my_malloc((array->max_element+ if (!(new_ptr= (char *) my_malloc((array->max_element+
array->alloc_increment) * array->alloc_increment) *
array->size_of_element, array->size_of_element,
MYF(MY_WME)))) MYF(MY_WME))))
return 0; return 0;
memcpy(new_ptr, array->buffer, memcpy(new_ptr, array->buffer,
array->elements * array->size_of_element); array->elements * array->size_of_element);
} }
else else
if (!(new_ptr=(char*) my_realloc(array->buffer,(array->max_element+ if (!(new_ptr=(char*) my_realloc(array->buffer,(array->max_element+
array->alloc_increment)* array->alloc_increment)*
array->size_of_element, array->size_of_element,
MYF(MY_WME | MY_ALLOW_ZERO_PTR)))) MYF(MY_WME | MY_ALLOW_ZERO_PTR))))
return 0; return 0;
array->buffer=new_ptr; array->buffer=new_ptr;
array->max_element+=array->alloc_increment; array->max_element+=array->alloc_increment;
@ -213,26 +213,26 @@ my_bool set_dynamic(DYNAMIC_ARRAY *array, uchar* element, uint idx)
so we have to create an all-new malloc since we overflowed so we have to create an all-new malloc since we overflowed
*/ */
if (!(new_ptr= (char *) my_malloc(size * if (!(new_ptr= (char *) my_malloc(size *
array->size_of_element, array->size_of_element,
MYF(MY_WME)))) MYF(MY_WME))))
return 0; return 0;
memcpy(new_ptr, array->buffer, memcpy(new_ptr, array->buffer,
array->elements * array->size_of_element); array->elements * array->size_of_element);
} }
else else
if (!(new_ptr=(char*) my_realloc(array->buffer,size* if (!(new_ptr=(char*) my_realloc(array->buffer,size*
array->size_of_element, array->size_of_element,
MYF(MY_WME | MY_ALLOW_ZERO_PTR)))) MYF(MY_WME | MY_ALLOW_ZERO_PTR))))
return TRUE; return TRUE;
array->buffer=new_ptr; array->buffer=new_ptr;
array->max_element=size; array->max_element=size;
} }
bzero((uchar*) (array->buffer+array->elements*array->size_of_element), bzero((uchar*) (array->buffer+array->elements*array->size_of_element),
(idx - array->elements)*array->size_of_element); (idx - array->elements)*array->size_of_element);
array->elements=idx+1; array->elements=idx+1;
} }
memcpy(array->buffer+(idx * array->size_of_element),element, memcpy(array->buffer+(idx * array->size_of_element),element,
(size_t) array->size_of_element); (size_t) array->size_of_element);
return FALSE; return FALSE;
} }
@ -251,12 +251,12 @@ void get_dynamic(DYNAMIC_ARRAY *array, uchar* element, uint idx)
if (idx >= array->elements) if (idx >= array->elements)
{ {
DBUG_PRINT("warning",("To big array idx: %d, array size is %d", DBUG_PRINT("warning",("To big array idx: %d, array size is %d",
idx,array->elements)); idx,array->elements));
bzero(element,array->size_of_element); bzero(element,array->size_of_element);
return; return;
} }
memcpy(element,array->buffer+idx*array->size_of_element, memcpy(element,array->buffer+idx*array->size_of_element,
(size_t) array->size_of_element); (size_t) array->size_of_element);
} }
@ -290,7 +290,7 @@ void delete_dynamic(DYNAMIC_ARRAY *array)
SYNOPSIS SYNOPSIS
delete_dynamic_element() delete_dynamic_element()
array array
idx Index of element to be deleted idx Index of element to be deleted
*/ */
void delete_dynamic_element(DYNAMIC_ARRAY *array, uint idx) void delete_dynamic_element(DYNAMIC_ARRAY *array, uint idx)
@ -298,7 +298,7 @@ void delete_dynamic_element(DYNAMIC_ARRAY *array, uint idx)
char *ptr=array->buffer+array->size_of_element*idx; char *ptr=array->buffer+array->size_of_element*idx;
array->elements--; array->elements--;
memmove(ptr,ptr+array->size_of_element, memmove(ptr,ptr+array->size_of_element,
(array->elements-idx)*array->size_of_element); (array->elements-idx)*array->size_of_element);
} }
@ -324,8 +324,8 @@ void freeze_size(DYNAMIC_ARRAY *array)
if (array->buffer && array->max_element != elements) if (array->buffer && array->max_element != elements)
{ {
array->buffer=(char*) my_realloc(array->buffer, array->buffer=(char*) my_realloc(array->buffer,
elements*array->size_of_element, elements*array->size_of_element,
MYF(MY_WME)); MYF(MY_WME));
array->max_element=elements; array->max_element=elements;
} }
} }

2
sql/set_var.cc
View File

@ -1864,7 +1864,7 @@ void sys_var_collation_sv::set_default(THD *thd, enum_var_type type)
uchar *sys_var_collation_sv::value_ptr(THD *thd, enum_var_type type, uchar *sys_var_collation_sv::value_ptr(THD *thd, enum_var_type type,
LEX_STRING *base) LEX_STRING *base)
{ {
CHARSET_INFO *cs= ((type == OPT_GLOBAL) ? CHARSET_INFO *cs= ((type == OPT_GLOBAL) ?
global_system_variables.*offset : thd->variables.*offset); global_system_variables.*offset : thd->variables.*offset);

1
sql/sql_insert.cc
View File

@ -1866,7 +1866,6 @@ bool delayed_get_table(THD *thd, TABLE_LIST *table_list)
DBUG_RETURN((table_list->table == NULL)); DBUG_RETURN((table_list->table == NULL));
end_create: end_create:
thd->fatal_error();
pthread_mutex_unlock(&LOCK_delayed_create); pthread_mutex_unlock(&LOCK_delayed_create);
DBUG_RETURN(thd->net.report_error); DBUG_RETURN(thd->net.report_error);
} }

2
sql/sql_yacc.yy
View File

@ -10191,7 +10191,7 @@ option_type_value:
qbuff.length= lip->tok_end - sp->m_tmp_query; qbuff.length= lip->tok_end - sp->m_tmp_query;
if (!(qbuff.str= (char*) alloc_root(thd->mem_root, if (!(qbuff.str= (char*) alloc_root(thd->mem_root,
qbuff.length + 5))) qbuff.length + 5)))
MYSQL_YYABORT; MYSQL_YYABORT;
strmake(strmake(qbuff.str, "SET ", 4), sp->m_tmp_query, strmake(strmake(qbuff.str, "SET ", 4), sp->m_tmp_query,