Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
f7489c32
Commit
f7489c32
authored
Dec 14, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
parents
3f39dd45
12046696
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
25 additions
and
2 deletions
+25
-2
netware/BUILD/compile-linux-tools
netware/BUILD/compile-linux-tools
+3
-2
netware/libmysql.def
netware/libmysql.def
+1
-0
netware/my_print_defaults.def
netware/my_print_defaults.def
+1
-0
netware/myisamlog.def
netware/myisamlog.def
+1
-0
netware/myisampack.def
netware/myisampack.def
+1
-0
netware/mysql.def
netware/mysql.def
+1
-0
netware/mysql_install_db.def
netware/mysql_install_db.def
+1
-0
netware/mysqladmin.def
netware/mysqladmin.def
+1
-0
netware/mysqlbinlog.def
netware/mysqlbinlog.def
+1
-0
netware/mysqlcheck.def
netware/mysqlcheck.def
+1
-0
netware/mysqld_safe.def
netware/mysqld_safe.def
+1
-0
netware/mysqldump.def
netware/mysqldump.def
+1
-0
netware/mysqlimport.def
netware/mysqlimport.def
+1
-0
netware/perror.def
netware/perror.def
+1
-0
scripts/make_binary_distribution.sh
scripts/make_binary_distribution.sh
+4
-0
sql/tztime.cc
sql/tztime.cc
+5
-0
No files found.
netware/BUILD/compile-linux-tools
View file @
f7489c32
...
...
@@ -28,7 +28,8 @@ rm -f */*.linux
./configure
--without-innodb
--without-docs
# build tools only
make clean all-local
make clean
make
(
cd
dbug
;
make libdbug.a
)
(
cd
strings
;
make libmystrings.a
)
(
cd
mysys
;
make libmysys.a
)
...
...
@@ -53,7 +54,7 @@ make clean all-local
# copying required linux tools
cp
extra/comp_err extra/comp_err.linux
cp
libmysql/conf_to_src libmysql/conf_to_src.linux
cp
libmysql_r/conf_to_src libmysql_r/conf_to_src.linux
#
cp libmysql_r/conf_to_src libmysql_r/conf_to_src.linux
cp
sql/gen_lex_hash sql/gen_lex_hash.linux
cp
strings/conf_to_src strings/conf_to_src.linux
netware/libmysql.def
View file @
f7489c32
...
...
@@ -7,5 +7,6 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Res
DESCRIPTION "MySQL Client Library"
VERSION 4, 0
AUTOUNLOAD
STACKSIZE 32768
XDCDATA ../netware/mysql.xdc
#DEBUG
netware/my_print_defaults.def
View file @
f7489c32
...
...
@@ -5,6 +5,7 @@ MODULE libc.nlm
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Print Defaults Tool"
VERSION 4, 0
STACKSIZE 32768
XDCDATA ../netware/mysql.xdc
#DEBUG
netware/myisamlog.def
View file @
f7489c32
...
...
@@ -6,6 +6,7 @@ SCREENNAME "MySQL MyISAM Table Log Tool"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL MyISAM Table Log Tool"
VERSION 4, 0
STACKSIZE 32768
XDCDATA ../netware/mysql.xdc
#DEBUG
netware/myisampack.def
View file @
f7489c32
...
...
@@ -6,6 +6,7 @@ SCREENNAME "MySQL MyISAM Table Pack Tool"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL MyISAM Table Pack Tool"
VERSION 4, 0
STACKSIZE 32768
XDCDATA ../netware/mysql.xdc
#DEBUG
netware/mysql.def
View file @
f7489c32
...
...
@@ -6,6 +6,7 @@ SCREENNAME "MySQL Monitor[scrollable]"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Monitor"
VERSION 4, 0
STACKSIZE 32768
MULTIPLE
XDCDATA ../netware/mysql.xdc
#DEBUG
...
...
netware/mysql_install_db.def
View file @
f7489c32
...
...
@@ -6,6 +6,7 @@ SCREENNAME "MySQL Install"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Initial Database Installer"
VERSION 4, 0
STACKSIZE 32768
XDCDATA ../netware/mysql.xdc
#DEBUG
netware/mysqladmin.def
View file @
f7489c32
...
...
@@ -6,6 +6,7 @@ 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
STACKSIZE 32768
XDCDATA ../netware/mysql.xdc
#DEBUG
netware/mysqlbinlog.def
View file @
f7489c32
...
...
@@ -6,6 +6,7 @@ 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
STACKSIZE 32768
XDCDATA ../netware/mysql.xdc
#DEBUG
netware/mysqlcheck.def
View file @
f7489c32
...
...
@@ -6,6 +6,7 @@ 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
STACKSIZE 32768
XDCDATA ../netware/mysql.xdc
#DEBUG
netware/mysqld_safe.def
View file @
f7489c32
...
...
@@ -6,6 +6,7 @@ SCREENNAME "MySQL Database Server"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Database Server Monitor"
VERSION 4, 0
STACKSIZE 32768
MULTIPLE
XDCDATA ../netware/mysql.xdc
#DEBUG
...
...
netware/mysqldump.def
View file @
f7489c32
...
...
@@ -6,6 +6,7 @@ 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
STACKSIZE 32768
XDCDATA ../netware/mysql.xdc
#DEBUG
netware/mysqlimport.def
View file @
f7489c32
...
...
@@ -6,6 +6,7 @@ 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
STACKSIZE 32768
XDCDATA ../netware/mysql.xdc
#DEBUG
netware/perror.def
View file @
f7489c32
...
...
@@ -5,6 +5,7 @@ MODULE libc.nlm
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Error Code Description Tool"
VERSION 4, 0
STACKSIZE 32768
XDCDATA ../netware/mysql.xdc
#DEBUG
scripts/make_binary_distribution.sh
View file @
f7489c32
...
...
@@ -177,6 +177,7 @@ if [ $BASE_SYSTEM = "netware" ] ; then
libname
=
`
basename
$i
.a
`
$MV
$i
$BASE
/lib/
$libname
.lib
done
rm
-f
$BASE
/lib/
*
.la
fi
copyfileto
$BASE
/include config.h include/
*
...
...
@@ -266,6 +267,9 @@ if [ $BASE_SYSTEM = "netware" ] ; then
$BASE
/support-files/mysql
*
.spec
\
$BASE
/support-files/mysql-log-rotate
\
$BASE
/support-files/binary-configure
\
$BASE
/support-files/build-tags
\
$BASE
/support-files/MySQL-shared-compat.spec
\
$BASE
/support-files/ndb-config-2-node.ini
\
$BASE
/INSTALL-BINARY
\
$BASE
/MySQLEULA.txt
else
...
...
sql/tztime.cc
View file @
f7489c32
...
...
@@ -2359,6 +2359,7 @@ scan_tz_dir(char * name_end)
int
main
(
int
argc
,
char
**
argv
)
{
#ifndef __NETWARE__
MY_INIT
(
argv
[
0
]);
if
(
argc
!=
2
&&
argc
!=
3
)
...
...
@@ -2417,6 +2418,10 @@ main(int argc, char **argv)
free_root
(
&
tz_storage
,
MYF
(
0
));
}
#else
fprintf
(
stderr
,
"This tool has not been ported to NetWare
\n
"
);
#endif
/* __NETWARE__ */
return
0
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment