summaryrefslogtreecommitdiff
path: root/innobase
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2003-01-05 20:18:49 +0200
committerunknown <monty@mashka.mysql.fi>2003-01-05 20:18:49 +0200
commite3c7f4d85ec4caf59fc408cf5643e5dc64e9a3d4 (patch)
treece42417ba1ab6dac8c367a9ae180ea377956e95a /innobase
parent79fba6da8f099566bbf711b592aab60909b1f66d (diff)
downloadmariadb-git-e3c7f4d85ec4caf59fc408cf5643e5dc64e9a3d4.tar.gz
A lot of portability fixes.
Added rename table for BDB. This fixes a bug in ALTER TABLE with BDB tables. BUILD/SETUP.sh: Enabled uninitalized warnings for debug builds. Build-tools/Do-compile: Added options --no-mysqltest and --no-benchmarks Log time before each stage Removed warnings on some OS (at least hpux11) acinclude.m4: Fixed call to wrong function configure.in: Don't use -O3 as compiler option with aCC innobase/include/univ.i: Removed compiler warning (on Hpux11) innobase/os/os0file.c: Removed compiler warning (on Hpux11) innobase/trx/trx0sys.c: Removed compiler warning (on Hpux11) innobase/trx/trx0trx.c: Removed compiler warning (on Hpux11) innobase/ut/ut0ut.c: Removed compiler warning (with gcc) myisam/mi_check.c: Added missing 'static' myisam/mi_test1.c: Added missing 'static' mysys/my_getopt.c: Added missing 'static' sql/ha_berkeley.cc: Added rename table. This fixes a bug in ALTER TABLE with BDB tables. Fixed compilation problem on OSF1 sql/ha_berkeley.h: Added rename table. This fixes a bug in ALTER TABLE with BDB tables. sql/mini_client.cc: Added reinterpret cast to avoid some warnings. sql/sql_parse.cc: Added reinterpret cast to avoid some warnings. Removed usage of strnlen() as this gave portability problems. sql/sql_union.cc: Added reinterpret cast to avoid some warnings. sql/table.cc: Added reinterpret cast to avoid some warnings. tools/mysqlmanager.c: Added missing 'static'
Diffstat (limited to 'innobase')
-rw-r--r--innobase/include/univ.i1
-rw-r--r--innobase/os/os0file.c2
-rw-r--r--innobase/trx/trx0sys.c6
-rw-r--r--innobase/trx/trx0trx.c2
-rw-r--r--innobase/ut/ut0ut.c1
5 files changed, 6 insertions, 6 deletions
diff --git a/innobase/include/univ.i b/innobase/include/univ.i
index 43130549eae..bf606efcf64 100644
--- a/innobase/include/univ.i
+++ b/innobase/include/univ.i
@@ -57,6 +57,7 @@ of the 32-bit x86 assembler in mutex operations. */
Microsoft Visual C++ */
#if !defined(__GNUC__) && !defined(__WIN__)
+#undef UNIV_MUST_NOT_INLINE /* Remove compiler warning */
#define UNIV_MUST_NOT_INLINE
#endif
diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c
index 9eae358c7fb..fa5482a8cd1 100644
--- a/innobase/os/os0file.c
+++ b/innobase/os/os0file.c
@@ -2127,7 +2127,7 @@ os_aio_simulated_handle(
ulint offs;
ulint lowest_offset;
byte* combined_buf;
- byte* combined_buf2;
+ byte* combined_buf2= 0; /* Remove warning */
ibool ret;
ulint n;
ulint i;
diff --git a/innobase/trx/trx0sys.c b/innobase/trx/trx0sys.c
index 33c962772e8..0c10040847e 100644
--- a/innobase/trx/trx0sys.c
+++ b/innobase/trx/trx0sys.c
@@ -472,9 +472,9 @@ trx_sys_update_mysql_binlog_offset(
if (0 != ut_memcmp(sys_header + field + TRX_SYS_MYSQL_LOG_NAME,
file_name, 1 + ut_strlen(file_name))) {
- mlog_write_string(sys_header + field
- + TRX_SYS_MYSQL_LOG_NAME,
- file_name, 1 + ut_strlen(file_name), mtr);
+ mlog_write_string((byte*) (sys_header + field
+ + TRX_SYS_MYSQL_LOG_NAME),
+ (byte*) file_name, 1 + ut_strlen(file_name), mtr);
}
if (mach_read_from_4(sys_header + field
diff --git a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c
index f0077f941de..d2219ed019f 100644
--- a/innobase/trx/trx0trx.c
+++ b/innobase/trx/trx0trx.c
@@ -99,7 +99,7 @@ trx_create(
trx->mysql_log_file_name = NULL;
trx->mysql_log_offset = 0;
- trx->mysql_master_log_file_name = "";
+ trx->mysql_master_log_file_name = (char*) "";
trx->mysql_master_log_pos = 0;
trx->ignore_duplicates_in_insert = FALSE;
diff --git a/innobase/ut/ut0ut.c b/innobase/ut/ut0ut.c
index ff5d11d84ed..bb5eb662cd7 100644
--- a/innobase/ut/ut0ut.c
+++ b/innobase/ut/ut0ut.c
@@ -197,7 +197,6 @@ ut_get_year_month_day(
*month = (ulint)cal_tm.wMonth;
*day = (ulint)cal_tm.wDay;
#else
- struct tm cal_tm;
struct tm* cal_tm_ptr;
time_t tm;