database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Fixes during review of new pushed code

Browse Source
This commit is contained in:
monty@mysql.com
2005-10-13 19:40:46 +03:00
parent 5513ab69b7
commit 49a30ef513
4 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/handler.cc
View File

@@ -205,7 +205,8 @@ retest:
{
if (!my_strnncoll(&my_charset_latin1,
(const uchar *)name, namelen,
(const uchar *)table_alias->alias, strlen(table_alias->alias)))
(const uchar *)table_alias->alias,
strlen(table_alias->alias)))
{
name= table_alias->type;
namelen= strlen(name);

4
sql/item.cc
View File

@@ -4628,7 +4628,7 @@ void Item_ref::cleanup()
void Item_ref::print(String *str)
{
if (ref && *ref)
if (ref)
(*ref)->print(str);
else
Item_ident::print(str);
@@ -4814,7 +4814,7 @@ void Item_ref::make_field(Send_field *field)
void Item_ref_null_helper::print(String *str)
{
str->append("<ref_null_helper>(", 18);
if (ref && *ref)
if (ref)
(*ref)->print(str);
else
str->append('?');

8
sql/table.cc
View File

@@ -310,6 +310,7 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
char *buff, *next_chunk, *buff_end;
if (!(next_chunk= buff= my_malloc(n_length, MYF(MY_WME))))
goto err;
buff_end= buff + n_length;
if (my_pread(file, (byte*)buff, n_length, record_offset + share->reclength,
MYF(MY_NABP)))
{
@@ -324,13 +325,14 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
goto err;
}
next_chunk+= share->connect_string.length + 2;
buff_end= buff + n_length;
if (next_chunk + 2 < buff_end)
{
uint str_db_type_length= uint2korr(next_chunk);
share->db_type= ha_resolve_by_name(next_chunk + 2, str_db_type_length);
DBUG_PRINT("enter", ("Setting dbtype to: %d - %d - '%.*s'\n", share->db_type,
str_db_type_length, str_db_type_length, next_chunk + 2));
DBUG_PRINT("enter", ("Setting dbtype to: %d - %d - '%.*s'\n",
share->db_type,
str_db_type_length, str_db_type_length,
next_chunk + 2));
next_chunk+= str_db_type_length + 2;
}
my_free(buff, MYF(0));

4
sql/unireg.cc
View File

@@ -121,8 +121,8 @@ bool mysql_create_frm(THD *thd, my_string file_name,
/* Calculate extra data segment length */
str_db_type.str= (char *) ha_get_storage_engine(create_info->db_type);
str_db_type.length= strlen(str_db_type.str);
create_info->extra_size= 2 + str_db_type.length;
create_info->extra_size+= create_info->connect_string.length + 2;
create_info->extra_size= (2 + str_db_type.length +
2 + create_info->connect_string.length);
if ((file=create_frm(thd, file_name, db, table, reclength, fileinfo,
create_info, keys)) < 0)