diff options
| author | monty@mashka.mysql.fi <> | 2002-09-11 14:49:38 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-09-11 14:49:38 +0300 |
| commit | 8b7521eb7f8bf0ebcceacf308b8c6c36f31735c5 (patch) | |
| tree | 780174860f876a082066a96b632c69be18d7282f /innobase/os | |
| parent | fa4e07bf978d62fe72b295dac42b31374a2e012e (diff) | |
| parent | 75a39efa416cc9db479a1902ecb03a9772e85ebb (diff) | |
| download | mariadb-git-8b7521eb7f8bf0ebcceacf308b8c6c36f31735c5.tar.gz | |
Merge with 3.23.53
Diffstat (limited to 'innobase/os')
| -rw-r--r-- | innobase/os/os0file.c | 2 | ||||
| -rw-r--r-- | innobase/os/os0sync.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c index 0297388c413..6f122f38107 100644 --- a/innobase/os/os0file.c +++ b/innobase/os/os0file.c @@ -2278,7 +2278,7 @@ consecutive_loop: ut_print_timestamp(stderr); fprintf(stderr, " InnoDB: ERROR: The page to be written seems corrupt!\n"); - page_print(combined_buf + len2); + buf_page_print(combined_buf + len2); fprintf(stderr, "InnoDB: ERROR: The page to be written seems corrupt!\n"); } diff --git a/innobase/os/os0sync.c b/innobase/os/os0sync.c index c1345de0d55..14677ede20f 100644 --- a/innobase/os/os0sync.c +++ b/innobase/os/os0sync.c @@ -49,6 +49,12 @@ os_event_create( TRUE, /* Manual reset */ FALSE, /* Initial state nonsignaled */ name); + if (!event) { + fprintf(stderr, +"InnoDB: Could not create a Windows event semaphore; Windows error %lu\n", + (ulint)GetLastError()); + } + ut_a(event); return(event); |