diff options
| author | jani@a193-229-222-105.elisa-laajakaista.fi <> | 2005-08-26 15:56:52 +0300 |
|---|---|---|
| committer | jani@a193-229-222-105.elisa-laajakaista.fi <> | 2005-08-26 15:56:52 +0300 |
| commit | 7b7188cea65ace20e16b0defd278f17d37743c99 (patch) | |
| tree | bd37457a3ede5f89be347874aa575e32bca225d0 /netware | |
| parent | 78a0585cea4d6369e29c0ab306799f823dac6636 (diff) | |
| parent | 6b4baf48a503e86e065c8ced36a0e50103be919b (diff) | |
| download | mariadb-git-7b7188cea65ace20e16b0defd278f17d37743c99.tar.gz | |
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
Diffstat (limited to 'netware')
| -rw-r--r-- | netware/myisamchk.def | 2 | ||||
| -rw-r--r-- | netware/mysql.def | 2 | ||||
| -rw-r--r-- | netware/mysql_test_run.c | 4 | ||||
| -rw-r--r-- | netware/mysqladmin.def | 2 | ||||
| -rw-r--r-- | netware/mysqlbinlog.def | 2 | ||||
| -rw-r--r-- | netware/mysqlcheck.def | 2 | ||||
| -rw-r--r-- | netware/mysqldump.def | 2 | ||||
| -rw-r--r-- | netware/mysqlimport.def | 2 | ||||
| -rw-r--r-- | netware/mysqlshow.def | 2 |
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 e8293103974..2b9522ff57d 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 |