diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-30 18:57:21 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-30 18:57:21 +0300 |
| commit | a86390f01ae108baf07707d401e35c3c4e1e9041 (patch) | |
| tree | c1bcaea9558c224371254c107ba497d9242758b7 /innobase | |
| parent | a88c8630ec426c88cd7eae7acf2985a254d3faba (diff) | |
| download | mariadb-git-a86390f01ae108baf07707d401e35c3c4e1e9041.tar.gz | |
Update for running gcc 3.x (mainly on HPUX)
Portability fixes for HPUX
Rename of CHECK_LOCK to IS_FREE_LOCK
Apply lower_case_table_names also to databases
Cleanup of describe code
Don't allow \ in database names
Build-tools/Do-compile:
Added option --make-options
Docs/manual.texi:
Changelog
Added XOR, ^ and IS_FREE_LOCK() descriptions
acinclude.m4:
Update for running gcc 3.x on HPUX
client/mysql.cc:
Portability fix
client/mysqlbinlog.cc:
Fix for using gcc 3.1
configure.in:
Fix for using gcc 3.1
include/my_global.h:
Fix for using gcc 3.1
include/my_pthread.h:
Removed warning on HPUX
innobase/configure.in:
Portability fix (for gcc 3.1 on HPUX)
innobase/ut/ut0ut.c:
Portability fix (for gcc 3.1 on HPUX)
mysql-test/r/func_test.result:
Test of new functions
mysql-test/r/rpl_get_lock.result:
Test of new functions
mysql-test/t/func_test.test:
Test of new functions
mysql-test/t/rpl_get_lock.test:
Test of new functions
mysys/my_tempnam.c:
Portability fix
sql/item_cmpfunc.cc:
Added comments to Item_cond_xor.
Fixed NULL handling for XOR
sql/item_create.cc:
rename of CHECK_LOCK to IS_FREE_LOCK
sql/item_create.h:
rename of CHECK_LOCK to IS_FREE_LOCK
sql/item_func.cc:
Cleanup XOR handling
sql/item_func.h:
rename of CHECK_LOCK to IS_FREE_LOCK
sql/lex.h:
rename of CHECK_LOCK to IS_FREE_LOCK
sql/mysqld.cc:
Moved chroot() to be exectued earlier.
sql/sql_db.cc:
Apply lower_case_table_names also to databases
sql/sql_parse.cc:
Apply lower_case_table_names also to databases
sql/sql_select.cc:
Cleanup describe code (after Sinisa's patch for EXPLAIN + UNION)
sql/table.cc:
Don't allow \ in database names
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/configure.in | 1 | ||||
| -rw-r--r-- | innobase/ut/ut0ut.c | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/innobase/configure.in b/innobase/configure.in index b606ecfffc0..c234e1e192d 100644 --- a/innobase/configure.in +++ b/innobase/configure.in @@ -36,6 +36,7 @@ AC_PROG_RANLIB AC_PROG_INSTALL AC_CHECK_HEADERS(aio.h sched.h) AC_CHECK_SIZEOF(int, 4) +AC_CHECK_SIZEOF(long, 4) AC_CHECK_FUNCS(sched_yield) AC_CHECK_FUNCS(fdatasync) #AC_CHECK_FUNCS(localtime_r) # Already checked by MySQL diff --git a/innobase/ut/ut0ut.c b/innobase/ut/ut0ut.c index 7ee32b9a8e2..cd21491dcf1 100644 --- a/innobase/ut/ut0ut.c +++ b/innobase/ut/ut0ut.c @@ -27,11 +27,11 @@ ut_get_high32( /* out: a >> 32 */ ulint a) /* in: ulint */ { - if (sizeof(ulint) == 4) { - return(0); - } - +#if SIZEOF_LONG == 4 + return 0; +#else return(a >> 32); +#endif } /************************************************************ |