summaryrefslogtreecommitdiff
path: root/myisam/mi_log.c
diff options
context:
space:
mode:
authorsasha@mysql.sashanet.com <>2000-09-15 11:00:35 -0600
committersasha@mysql.sashanet.com <>2000-09-15 11:00:35 -0600
commit44bc3f9b0e85ad10b47bfe5186e195a14dac8fe2 (patch)
tree993dd4ef4b73bf6fb7507f208aa766bc528400e9 /myisam/mi_log.c
parent0a087649ec06ff578f7b48e754e094c9cf26f664 (diff)
parent5d1388487646c5f607069b10c95539e5b1674df8 (diff)
downloadmariadb-git-44bc3f9b0e85ad10b47bfe5186e195a14dac8fe2.tar.gz
merge of conflicts
Diffstat (limited to 'myisam/mi_log.c')
-rw-r--r--myisam/mi_log.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/myisam/mi_log.c b/myisam/mi_log.c
index 9f08b835d14..d223cc69bcc 100644
--- a/myisam/mi_log.c
+++ b/myisam/mi_log.c
@@ -69,7 +69,8 @@ int mi_log(int activate_log)
/* Logging of records and commands on logfile */
/* All logs starts with command(1) dfile(2) process(4) result(2) */
-void _myisam_log(enum myisam_log_commands command, MI_INFO *info, const byte *buffert, uint length)
+void _myisam_log(enum myisam_log_commands command, MI_INFO *info,
+ const byte *buffert, uint length)
{
char buff[11];
int error,old_errno;