database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Portability fixes

Browse Source 
Fixes while reviewing new pushed code
NULL as argument to encrypt/decrypt should return NULL without a warning
This commit is contained in:
monty@mishka.local
2005-06-27 20:31:00 +03:00
parent 6db013ef86
commit 7398252d02
9 changed files with 65 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/handler.cc
View File

@@ -1357,14 +1357,12 @@ int ha_create_table_from_engine(THD* thd,
HA_CREATE_INFO create_info;
TABLE table;
DBUG_ENTER("ha_create_table_from_engine");
DBUG_PRINT("enter", ("name '%s'.'%s'",
db, name));
DBUG_PRINT("enter", ("name '%s'.'%s'", db, name));
bzero((char*) &create_info,sizeof(create_info));
if(error= ha_discover(thd, db, name, &frmblob, &frmlen))
if ((error= ha_discover(thd, db, name, &frmblob, &frmlen)))
{
// Table could not be discovered and thus not created
/* Table could not be discovered and thus not created */
DBUG_RETURN(error);
}
@@ -1375,11 +1373,10 @@ int ha_create_table_from_engine(THD* thd,
(void)strxnmov(path,FN_REFLEN,mysql_data_home,"/",db,"/",name,NullS);
// Save the frm file
if (writefrm(path, frmblob, frmlen))
{
my_free((char*) frmblob, MYF(MY_ALLOW_ZERO_PTR));
error= writefrm(path, frmblob, frmlen);
my_free((char*) frmblob, MYF(0));
if (error)
DBUG_RETURN(2);
}
if (openfrm(path,"",0,(uint) READ_ALL, 0, &table))
DBUG_RETURN(3);
@@ -1395,7 +1392,6 @@ int ha_create_table_from_engine(THD* thd,
}
error=table.file->create(path,&table,&create_info);
VOID(closefrm(&table));
my_free((char*) frmblob, MYF(MY_ALLOW_ZERO_PTR));
DBUG_RETURN(error != 0);
}