diff options
| author | unknown <brian@zim.(none)> | 2006-04-15 18:17:32 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-04-15 18:17:32 -0700 |
| commit | cc62983ca2be9fe0559d3f5a326bb7284c08c4cb (patch) | |
| tree | 4deb7a54227f30d8a5d4b647405eb100c0f8ab28 /storage | |
| parent | f42b90fcb8d4625336fabc13e899b7510bebec80 (diff) | |
| download | mariadb-git-cc62983ca2be9fe0559d3f5a326bb7284c08c4cb.tar.gz | |
Final patch to remove the last of the OS2 support.
client/client_priv.h:
OS2 removal
client/mysql.cc:
OS2 removal
dbug/dbug.c:
OS2 removal
include/m_string.h:
OS2 removal
include/my_global.h:
Cleanup for have_mit
libmysql/dll.c:
OS2 removal
libmysql/get_password.c:
OS2 removal
libmysql/libmysql.c:
OS2 removal
libmysql/manager.c:
OS2 removal
sql-common/client.c:
OS2 removal
sql/event_executor.cc:
OS2 removal
sql/hostname.cc:
OS2 removal
sql/log.cc:
OS2 removal
sql/log_event.h:
OS2 removal
sql/my_lock.c:
OS2 removal
sql/mysql_priv.h:
OS2 removal
sql/mysqld.cc:
OS2 removal
sql/net_serv.cc:
OS2 removal
sql/repl_failsafe.cc:
OS2 removal
sql/slave.cc:
OS2 removal
sql/sql_base.cc:
OS2 removal
sql/sql_insert.cc:
OS2 removal
sql/sql_load.cc:
OS2 removal
sql/sql_parse.cc:
OS2 removal
sql/sql_table.cc:
OS2 removal
storage/myisam/myisamchk.c:
OS2 removal
storage/ndb/src/mgmclient/main.cpp:
OS2 removal
storage/ndb/src/mgmsrv/main.cpp:
OS2 removal
vio/vio.c:
OS2 removal
vio/viosocket.c:
OS2 removal
vio/viossl.c:
OS2 removal
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/myisam/myisamchk.c | 4 | ||||
| -rw-r--r-- | storage/ndb/src/mgmclient/main.cpp | 2 | ||||
| -rw-r--r-- | storage/ndb/src/mgmsrv/main.cpp | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/storage/myisam/myisamchk.c b/storage/myisam/myisamchk.c index 46f7558bc6a..7fcfb8fc65a 100644 --- a/storage/myisam/myisamchk.c +++ b/storage/myisam/myisamchk.c @@ -88,10 +88,6 @@ int main(int argc, char **argv) MY_INIT(argv[0]); my_progname_short= my_progname+dirname_length(my_progname); -#ifdef __EMX__ - _wildcard (&argc, &argv); -#endif - myisamchk_init(&check_param); check_param.opt_lock_memory=1; /* Lock memory if possible */ check_param.using_global_keycache = 0; diff --git a/storage/ndb/src/mgmclient/main.cpp b/storage/ndb/src/mgmclient/main.cpp index ba5d0308f1f..73a18f98c9d 100644 --- a/storage/ndb/src/mgmclient/main.cpp +++ b/storage/ndb/src/mgmclient/main.cpp @@ -19,7 +19,7 @@ // copied from mysql.cc to get readline extern "C" { -#if defined( __WIN__) || defined(OS2) +#if defined( __WIN__) #include <conio.h> #elif !defined(__NETWARE__) #include <readline/readline.h> diff --git a/storage/ndb/src/mgmsrv/main.cpp b/storage/ndb/src/mgmsrv/main.cpp index 5960a3517b5..26cb0951d3a 100644 --- a/storage/ndb/src/mgmsrv/main.cpp +++ b/storage/ndb/src/mgmsrv/main.cpp @@ -50,7 +50,7 @@ const char progname[] = "mgmtsrvr"; // copied from mysql.cc to get readline extern "C" { -#if defined( __WIN__) || defined(OS2) +#if defined( __WIN__) #include <conio.h> #elif !defined(__NETWARE__) #include <readline/readline.h> |