diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-09-11 14:49:38 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-09-11 14:49:38 +0300 |
| commit | 26bf87c9391edb1df27d1a1e42a98ccf9215f6b1 (patch) | |
| tree | 780174860f876a082066a96b632c69be18d7282f /innobase/os | |
| parent | d221f3ff172305e4576505180408e4ac2ba2a6c2 (diff) | |
| parent | 6a06c4c534ac68f9d0469f31c869fe1d20b1e463 (diff) | |
| download | mariadb-git-26bf87c9391edb1df27d1a1e42a98ccf9215f6b1.tar.gz | |
Merge with 3.23.53
Build-tools/Do-compile:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
innobase/trx/trx0undo.c:
Auto merged
sql/ha_innodb.h:
Auto merged
Docs/manual.texi:
merge
sql/ha_innodb.cc:
merge
sql/mysqld.cc:
merge
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); |