Commit graph

58 commits

Author SHA1 Message Date
Timothy Smith
2515ce79e8 Auto-merge up from 5.0 2009-02-07 16:50:31 +01:00
Timothy Smith
299aeb53b7 Handle renamed nwbootstrap -> nwbuild 2009-02-06 15:07:45 +01:00
Chad MILLER
99545746c0 Merge from 5.0-bugteam local. 2008-08-18 11:08:57 -04:00
Chad MILLER
a308c9e3fa Bug#30129: mysql_install_db appears to run normally, but the databases \
are not created  {Netware}

The init and test sql files were not created at cross-compilation time.

Now, make them in the default build rule.  Additionally, remove the "fix" 
SQL instructions, which are unnecessary for newly initialized databases.
Also, clean up the english in an error message, and BZRify nwbootstrap.
2008-08-06 09:25:03 -04:00
joerg@trift2.
37e47a080a Minor Makefile fixes:
1) Add a new top level "Makefile.am" target "make embedded-test".

2) Fix a syntax error (bad merge) in "netware/Makefile.am".
2007-10-30 20:06:49 +01:00
joerg@trift2.
d7c1a81136 Merge trift2.:/MySQL/M50/netware2-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-08-24 23:40:36 +02:00
joerg@trift2.
ae77f187f5 Merge trift2.:/MySQL/M51/netware2-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-08-24 23:29:19 +02:00
joerg@trift2.
4d375e46e3 Merge trift2.:/MySQL/M50/netware2-5.0
into  trift2.:/MySQL/M51/netware2-5.1
2007-08-24 23:12:19 +02:00
joerg@trift2.
2fd45aaee6 Fixes for the NetWare builds, discovered during 5.1.21-beta and backported to 5.0:
1) Ensure "init_db.sql" and "test_db-sql" really get built.

2) Ensure the "*.def" files with NetWare linker options get distributed to the proper directories.
2007-08-24 23:07:59 +02:00
joerg@trift2.
aa588114a2 NetWare packages were missing the scripts to initialize the database: add them. 2007-08-24 10:47:13 +02:00
joerg@trift2.
c82475ca72 Merge trift2.:/MySQL/M51/netware-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-08-23 19:43:21 +02:00
joerg@trift2.
df891775ad Merge trift2.:/MySQL/M50/netware-5.0
into  trift2.:/MySQL/M51/netware-5.1
2007-08-23 18:46:07 +02:00
joerg@trift2.
18b8e7a33f Cleanup in the "netware" subdirectory:
1) We do not provide the "isam" table handler in 5.0 and up (different from "myisam" !),
   so we do not need the ".def" files for the "isam"-specific tools.

2) Use "basename" to get the base name of a file, not a harder-to-read sed expression.
2007-08-22 22:04:31 +02:00
jbruehe/mysqldev@suse9-x86.mysql.com
2d88be148c NetWare fixes: 1) Link options, 2) SQL command files 2007-08-20 16:35:16 +02:00
joerg@trift2.
f486530d2d Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M51/mysql-5.1
2007-05-02 14:08:43 +02:00
joerg@trift2.
bb2996f487 Format corrections for various "Makefile.am": Leading tab, no trailing blank. 2007-05-02 14:01:49 +02:00
msvensson@pilot.blaudden
2218fafa1f Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-11 09:34:02 +02:00
msvensson@pilot.blaudden
b554258a8e Bug#22508 BUILD/compile-dist fails due to problem with readline/libedit
- Move the link_sources command from top level Makefile into each subdir
   that need to link files
2007-03-27 23:56:48 +02:00
kent@kent-amd64.(none)
a149769b2d Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-20 17:58:30 +01:00
df@pippilotta.erinye.com
50c909128e Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-03-20 13:44:47 +01:00
df@pippilotta.erinye.com
f6c30190b3 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-03-20 13:34:09 +01:00
df@pippilotta.erinye.com
56856d6f31 small build fix 2007-03-20 13:33:17 +01:00
joerg@trift2.
1e3cec5458 netware/Makefile.am : "libmysql.imp" must survive a "make clean" for the NetWare builds. 2007-03-19 15:24:07 +01:00
joerg@trift2.
66960bd1e7 Bug#20166 mysql-test-run.pl does not test system privilege tables creation
- Build sql files for netware from the mysql_system_tables*.sq files
 - Fix comments about mysql_create_system_tables.sh
 - Use mysql_install_db.sh to create system tables for mysql_test-run-shell
 - Fix mysql-test-run.pl to also look in share/mysql for the msyql_system*.sql files

Changeset coded today by Magnus Svensson, just the application to 5.0.38 is by Joerg Bruehe.
2007-03-16 20:56:16 +01:00
kent@kent-amd64.(none)
bc1e7c916e Merge mysql.com:/home/kent/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/mysql-5.1-build
2006-12-02 06:09:34 +01:00
kent@mysql.com/kent-amd64.(none)
cbf529790a Makefile.am:
Added "mysql_client_test.def"
mysql_client_test.def:
  BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_client_test.def
2006-12-02 06:06:31 +01:00
kent@kent-amd64.(none)
289e7eac12 Merge mysql.com:/home/kent/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/mysql-5.1-build
2006-12-01 23:28:59 +01:00
kent@mysql.com/kent-amd64.(none)
fb5abf8f4f mysql_upgrade.def Makefile.am:
Added new "mysql_upgrade.def" for Netware (bug#23504)
*.def:
  Allocate 128K stack for all executables (bug#23504)
2006-12-01 23:09:14 +01:00
msvensson@neptunus.(none)
3f59918eab Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware_libmysql_imp
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-28 10:39:55 +02:00
msvensson@neptunus.(none)
c4a50dea3f Build fixes for netware/ directory
- Create the file netware/libmysql.imp from libmysql/libmysql.def
 - Remove the outdated netware/libmysql.imp file from version control
2006-09-27 17:11:19 +02:00
msvensson@neptunus.(none)
a29a522815 Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware
into  neptunus.(none):/home/msvensson/mysql/netware/my51-netware
2006-09-26 16:28:28 +02:00
msvensson@neptunus.(none)
ca81d57ff8 Netware changes for build with yaSSL
- Make mwenv automatically adapt the setting to current build dir.
- Fix include paths that mwccnlm does not understand
- Link libmysl with yassl
2006-09-22 17:43:05 +02:00
kent@mysql.com
8f0aa436ed Merge 2006-06-20 11:11:18 +02:00
kent@mysql.com
ed6ff12315 Merge 2006-06-17 02:05:48 +02:00
kent@mysql.com
5a242ffc4f .del-mysql_install.def~8da659e7c0f7e571:
Delete: netware/mysql_install.def
Makefile.am:
  Removed obsolete "mysql_install.def"
2006-06-16 22:29:52 +02:00
jani@ua141d10.elisa.omakaista.fi
2dcc483e6c Several Netware specific fixes. 2006-02-02 16:22:31 +02:00
kent@mysql.com
2205d1b8d5 mysql.spec.sh, make_binary_distribution.sh, Makefile.am, mysql.sln:
Added "client/mysqlslap"
mysqlslap.vcproj, mysqlslap.def:
  new file
2005-12-19 01:12:11 +01:00
kent@mysql.com
4742f585b1 Merge 2005-11-04 02:17:11 +01:00
kent@mysql.com
095efe48a5 Makefile.am, configure.in:
Enable "make distcheck" to work
2005-09-24 15:51:45 +02:00
kent@mysql.com
8e3b393d5c Merge 2005-07-06 00:06:11 +02:00
kent@mysql.com
a7be42163a Makefile.am:
Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
2005-07-05 23:24:48 +02:00
kent@mysql.com
4c914f1c15 Many files:
Removed references to ISAM and MERGE
2005-01-01 20:54:45 +01:00
monty@mysql.com
b11d258835 Merge with 4.0.21 2004-06-18 04:38:58 +03:00
monty@mysql.com
f56df164f0 ke it possible to use mysys functions in netware/mysql_test_run.c
Don't pass --user to mysqld if --user is not used
2004-06-18 04:22:43 +03:00
monty@mysql.com
f0d79c5aba Added new netware file 2004-05-27 02:53:00 +03:00
monty@mysql.com
f693787063 Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-05-27 02:51:28 +03:00
monty@mysql.com
833ec1653e netware files should always be in 'make dist'
use opt_net_buffer_length instead of net_buffer_length
2004-05-27 02:47:04 +03:00
monty@mysql.com
390d9898f9 merge with 4.0 to get Netware patches and fixes for libmysqld.dll 2004-05-25 22:54:00 +03:00
monty@mysql.com
f2e1e3ce4c Added patches from Novell 2004-05-25 22:00:14 +03:00
monty@mysql.com
ce14578909 Merge with 4.0.18 2004-02-11 00:06:46 +01:00