summaryrefslogtreecommitdiff
path: root/netware
diff options
context:
space:
mode:
authorunknown <jani@a193-229-222-105.elisa-laajakaista.fi>2005-08-25 12:08:26 +0300
committerunknown <jani@a193-229-222-105.elisa-laajakaista.fi>2005-08-25 12:08:26 +0300
commitea09b970365c8d2e938b2d07c8b0ca76ae454d91 (patch)
tree782ea3e351ef7c2e3b100d3ca1ee0809f8ddc9ec /netware
parent2be4560e71dadf910cfe8cc69450c11a470f1fd1 (diff)
parent97dbe8dbe31d8bc8625c19a0a141a7fc910c37db (diff)
downloadmariadb-git-ea09b970365c8d2e938b2d07c8b0ca76ae454d91.tar.gz
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 client/mysqlcheck.c: Auto merged client/mysqlimport.c: Auto merged client/mysqltest.c: Auto merged extra/my_print_defaults.c: Auto merged extra/perror.c: Auto merged extra/resolve_stack_dump.c: Auto merged include/help_end.h: Auto merged include/help_start.h: Auto merged isam/isamchk.c: Auto merged isam/pack_isam.c: Auto merged myisam/myisamlog.c: Auto merged netware/myisamchk.def: Auto merged netware/mysql.def: Auto merged netware/mysqladmin.def: Auto merged netware/mysqlbinlog.def: Auto merged netware/mysqlcheck.def: Auto merged netware/mysqldump.def: Auto merged netware/mysqlimport.def: Auto merged netware/mysqlshow.def: Auto merged client/client_priv.h: Merged from 4.0. client/mysql.cc: Merged from 4.0. client/mysqladmin.cc: Merged from 4.0. client/mysqlbinlog.cc: Merged from 4.0. client/mysqldump.c: Merged from 4.0. client/mysqlshow.c: Merged from 4.0. myisam/myisamchk.c: Merged from 4.0. myisam/myisampack.c: Merged from 4.0. netware/mysql_test_run.c: Merged from 4.0. netware/mysqld_safe.c: Merged from 4.0. sql/mysqld.cc: Merged from 4.0.
Diffstat (limited to 'netware')
-rw-r--r--netware/myisamchk.def2
-rw-r--r--netware/mysql.def2
-rw-r--r--netware/mysql_test_run.c4
-rw-r--r--netware/mysqladmin.def2
-rw-r--r--netware/mysqlbinlog.def2
-rw-r--r--netware/mysqlcheck.def2
-rw-r--r--netware/mysqldump.def2
-rw-r--r--netware/mysqlimport.def2
-rw-r--r--netware/mysqlshow.def2
9 files changed, 12 insertions, 8 deletions
diff --git a/netware/myisamchk.def b/netware/myisamchk.def
index eaa01730872..b7ec5ac9474 100644
--- a/netware/myisamchk.def
+++ b/netware/myisamchk.def
@@ -2,7 +2,7 @@
# MyISAM Check
#------------------------------------------------------------------------------
MODULE libc.nlm
-SCREENNAME "MySQL MyISAM Table Check Tool"
+SCREENNAME "MySQL MyISAM Table Check Tool[scrollable]"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL MyISAM Table Check Tool"
VERSION 4, 0
diff --git a/netware/mysql.def b/netware/mysql.def
index 5ae8dc102a0..b79c94b1bb1 100644
--- a/netware/mysql.def
+++ b/netware/mysql.def
@@ -2,7 +2,7 @@
# MySQL Client
#------------------------------------------------------------------------------
MODULE libc.nlm
-SCREENNAME "MySQL Monitor"
+SCREENNAME "MySQL Monitor[scrollable]"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Monitor"
VERSION 4, 0
diff --git a/netware/mysql_test_run.c b/netware/mysql_test_run.c
index d8cfb79c1cb..849828210f2 100644
--- a/netware/mysql_test_run.c
+++ b/netware/mysql_test_run.c
@@ -25,6 +25,10 @@
#include <sys/stat.h>
#include <sys/mode.h>
#include "my_manage.h"
+#ifdef __NETWARE__
+#define strindex(a,b) ((char*)strindex(a,b))
+#endif
+
/******************************************************************************
macros
diff --git a/netware/mysqladmin.def b/netware/mysqladmin.def
index 46f90d531fa..cfab4f4c23d 100644
--- a/netware/mysqladmin.def
+++ b/netware/mysqladmin.def
@@ -2,7 +2,7 @@
# MySQL Admin
#------------------------------------------------------------------------------
MODULE libc.nlm
-SCREENNAME "MySQL Admin"
+SCREENNAME "MySQL Admin[scrollable]"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Admin Tool"
VERSION 4, 0
diff --git a/netware/mysqlbinlog.def b/netware/mysqlbinlog.def
index 25a470e7353..3e75cf07a57 100644
--- a/netware/mysqlbinlog.def
+++ b/netware/mysqlbinlog.def
@@ -2,7 +2,7 @@
# MySQL Binary Log
#------------------------------------------------------------------------------
MODULE libc.nlm
-SCREENNAME "MySQL Binary Log Dump Tool"
+SCREENNAME "MySQL Binary Log Dump Tool[scrollable]"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Binary Log Dump Tool"
VERSION 4, 0
diff --git a/netware/mysqlcheck.def b/netware/mysqlcheck.def
index 7067b1d1729..cb70c1b394d 100644
--- a/netware/mysqlcheck.def
+++ b/netware/mysqlcheck.def
@@ -2,7 +2,7 @@
# MySQL Client
#------------------------------------------------------------------------------
MODULE libc.nlm
-SCREENNAME "MySQL Check Tool"
+SCREENNAME "MySQL Check Tool[scrollable]"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Check Tool"
VERSION 4, 0
diff --git a/netware/mysqldump.def b/netware/mysqldump.def
index ddacf7bc0d5..811c53ce5f6 100644
--- a/netware/mysqldump.def
+++ b/netware/mysqldump.def
@@ -2,7 +2,7 @@
# MySQL Admin
#------------------------------------------------------------------------------
MODULE libc.nlm
-SCREENNAME "MySQL Dump Tool"
+SCREENNAME "MySQL Dump Tool[scrollable]"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Dump Tool"
VERSION 4, 0
diff --git a/netware/mysqlimport.def b/netware/mysqlimport.def
index 5253da42567..dc9af18aa09 100644
--- a/netware/mysqlimport.def
+++ b/netware/mysqlimport.def
@@ -2,7 +2,7 @@
# MySQL Client
#------------------------------------------------------------------------------
MODULE libc.nlm
-SCREENNAME "MySQL Import"
+SCREENNAME "MySQL Import[scrollable]"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Import Tool"
VERSION 4, 0
diff --git a/netware/mysqlshow.def b/netware/mysqlshow.def
index 0b61b81dcf9..b7b84a94067 100644
--- a/netware/mysqlshow.def
+++ b/netware/mysqlshow.def
@@ -2,7 +2,7 @@
# MySQL Show
#------------------------------------------------------------------------------
MODULE libc.nlm
-SCREENNAME "MySQL Show"
+SCREENNAME "MySQL Show[scrollable]"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Show Tool"
VERSION 4, 0