diff options
| author | unknown <monty@donna.mysql.fi> | 2001-05-09 23:02:36 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-05-09 23:02:36 +0300 |
| commit | 0fece375f2ae4bb173357609b46924a997113593 (patch) | |
| tree | 288f7cc7d0ca91ae340b7a568971bb02d8eb798d /innobase | |
| parent | 2321260ff07b0a90e3f84c756370a328ac17f990 (diff) | |
| download | mariadb-git-0fece375f2ae4bb173357609b46924a997113593.tar.gz | |
Applied patches for BDB tables
Fixes to InnoDB to compile on Windows
Fix for temporary InnoDB tables
Fixed bug in REPLACE()
Fixed sub char keys for InnoDB
Docs/manual.texi:
Changelog + update of table types
bdb/include/log.h:
Patch from Sleepycat
bdb/log/log.c:
Patch from Sleepycat
bdb/log/log_rec.c:
Patch from Sleepycat
client/mysqladmin.c:
Cleanup
innobase/include/univ.i:
Fix for compilation on Windows
innobase/os/os0file.c:
cleanup
innobase/pars/pars0grm.y:
Fix for compilation on Windows
mysql-test/r/innodb.result:
New test case
mysql-test/t/innodb.test:
New test case
sql/ha_innobase.cc:
cleanup
sql/ha_innobase.h:
Fix for prefix keys
sql/handler.h:
Fix for temporary Innodb tables
sql/item_strfunc.cc:
Fixed bug in REPLACE()
sql/lock.cc:
Fix for temporary Innodb tables
sql/mysqld.cc:
Added --skip-stack-trace
sql/share/english/errmsg.txt:
Better error messages
sql/sql_base.cc:
Fix for temporary Innodb tables
sql/sql_select.cc:
Fix for temporary Innodb tables
sql/sql_table.cc:
Fixed sub char keys for InnoDB
sql/table.h:
Fix for temporary Innodb tables
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/include/univ.i | 6 | ||||
| -rw-r--r-- | innobase/os/os0file.c | 1 | ||||
| -rw-r--r-- | innobase/pars/pars0grm.y | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/innobase/include/univ.i b/innobase/include/univ.i index 253ef08c9f8..fa5a8aef389 100644 --- a/innobase/include/univ.i +++ b/innobase/include/univ.i @@ -9,7 +9,7 @@ Created 1/20/1994 Heikki Tuuri #ifndef univ_i #define univ_i -#if (defined(_WIN32) || defined(_WIN64)) +#if (defined(_WIN32) || defined(_WIN64)) && !defined(MYSQL_SERVER) #define __WIN__ #include <windows.h> @@ -28,7 +28,7 @@ be defined: /* The Unix version */ /* Most C compilers other than gcc do not know 'extern inline' */ -#ifndef __GNUC__ +#if !defined(__GNUC__) && !defined(__WIN__) #define UNIV_MUST_NOT_INLINE #endif @@ -38,8 +38,10 @@ subdirectory of 'mysql'. */ #include <global.h> #include <my_pthread.h> +#ifndef __WIN__ /* Include <sys/stat.h> to get S_I... macros defined for os0file.c */ #include <sys/stat.h> +#endif #undef PACKAGE #undef VERSION diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c index 01fdf13b7d1..b3cb86a1178 100644 --- a/innobase/os/os0file.c +++ b/innobase/os/os0file.c @@ -167,7 +167,6 @@ os_file_handle_error( err = os_file_get_last_error(); if (err == OS_FILE_DISK_FULL) { -ask_again: fprintf(stderr, "\n"); if (name) { fprintf(stderr, diff --git a/innobase/pars/pars0grm.y b/innobase/pars/pars0grm.y index 681454f1d72..ae8c5ab91ec 100644 --- a/innobase/pars/pars0grm.y +++ b/innobase/pars/pars0grm.y @@ -10,9 +10,10 @@ Created 12/14/1997 Heikki Tuuri /* The value of the semantic attribute is a pointer to a query tree node que_node_t */ #define YYSTYPE que_node_t* -#define alloca mem_alloc #include "univ.i" +#undef alloca +#define alloca mem_alloc #include <math.h> #include "pars0pars.h" #include "mem0mem.h" |