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 | dde1b416cbfff15119744dd78dbae9ae0292d694 (patch) | |
| tree | c1bcaea9558c224371254c107ba497d9242758b7 /client | |
| parent | ad3eb445d4c205266b142d46daba3cb300bf0afe (diff) | |
| download | mariadb-git-dde1b416cbfff15119744dd78dbae9ae0292d694.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 'client')
| -rw-r--r-- | client/mysql.cc | 10 | ||||
| -rw-r--r-- | client/mysqlbinlog.cc | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index d6eabc1a567..5b2379e91ec 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1269,12 +1269,10 @@ You can turn off this feature to get a quicker startup with -A\n\n"); /* for gnu readline */ #ifndef HAVE_INDEX -#ifdef __cplusplus extern "C" { -#endif -extern char *index(const char *,pchar c),*rindex(const char *,pchar); +extern char *index(const char *,int c),*rindex(const char *,int); -char *index(const char *s,pchar c) +char *index(const char *s,int c) { for (;;) { @@ -1283,7 +1281,7 @@ char *index(const char *s,pchar c) } } -char *rindex(const char *s,pchar c) +char *rindex(const char *s,int c) { reg3 char *t; @@ -1291,10 +1289,8 @@ char *rindex(const char *s,pchar c) do if (*s == (char) c) t = (char*) s; while (*s++); return (char*) t; } -#ifdef __cplusplus } #endif -#endif #endif /* HAVE_READLINE */ diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index f7b381d72fa..4109fbd76d4 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -552,3 +552,5 @@ int main(int argc, char** argv) #else #include "log_event.cc" #endif + +FIX_GCC_LINKING_PROBLEM |