mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

branches/zip: Remove spaces and fix an uninitialized variable compiler warning.

Browse source
This commit is contained in:
sunny 2008-04-11 09:58:17 +00:00
parent 08986d3538
commit a0c86c47e4
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
handler/ha_innodb.cc
View file

@ -245,12 +245,12 @@ bool
innodb_file_format_update(
/*======================*/
/* out: should never
fail since it is
fail since it is
already validated */
THD* thd, /* in: thread handle */
struct st_mysql_sys_var* var, /* in: pointer to
struct st_mysql_sys_var* var, /* in: pointer to
system variable */
void* var_ptr, /* out: where the
void* var_ptr, /* out: where the
formal string goes */
void* save); /* in: immediate result
from check function */
@ -1820,6 +1820,10 @@ innobase_init(
MYF(MY_ALLOW_ZERO_PTR));
goto error;
}
} else {
/* Set it to the default file format id. Though this
should never happen. */
format_id = 0;
}
srv_file_format = format_id;
@ -8818,12 +8822,12 @@ bool
innodb_file_format_update(
/*======================*/
/* out: should never
fail since it is
fail since it is
already validated */
THD* thd, /* in: thread handle */
struct st_mysql_sys_var* var, /* in: pointer to
struct st_mysql_sys_var* var, /* in: pointer to
system variable */
void* var_ptr, /* out: where the
void* var_ptr, /* out: where the
formal string goes */
void* save) /* in: immediate result
from check function */
@ -8893,7 +8897,7 @@ static MYSQL_SYSVAR_BOOL(file_per_table, srv_file_per_table,
static MYSQL_SYSVAR_STR(file_format, innobase_file_format_name,
PLUGIN_VAR_RQCMDARG,
"File format to use for new tables in .ibd files.",
(mysql_var_check_func) &innodb_file_format_check,
(mysql_var_check_func) &innodb_file_format_check,
(mysql_var_update_func) &innodb_file_format_update, "Antelope");
static MYSQL_SYSVAR_ULONG(flush_log_at_trx_commit, srv_flush_log_at_trx_commit,