mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
58550 commits 2784 branches 343 tags 1.6 GiB
Commit graph

203 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
Timothy Smith
4382222ed5 Merge up from 5.0-build 2009-02-04 04:54:05 +01:00
Timothy Smith
058b33d048 The nwbootstrap script depended on BitKeeper, and was fairly complicated. It's much 
simpler to just use the source .tar.gz to do a build.  So the script has been renamed
to nwbuild, and simplified.
 2009-02-04 04:20:42 +01:00
Chad MILLER
59ac54214b Merge from 5.0-bugteam local. 2008-08-18 13:33:00 -04: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.
a0fbcc0326 Merge trift2.:/MySQL/M50/merge-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-12-21 13:13:22 +01:00
kent/mysqldev@mysql.com/production.mysql.com
7ca11181ac sp_head.cc: 
Made sp_head::operator delete() match prototype, added throw()
mysql_test_run.c, mysqld_safe.c:
  Include "mysql_version.h" to get MYSQL_PORT defined
 2007-12-14 18:23:11 +01: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
cmiller@zippy.cornsilk.net
04296df344 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-10-08 12:40:21 -04:00
cmiller@zippy.cornsilk.net
eedde95a33 Change URLs. 
Our web server has been restructured several times, and references
to it in our source code has stayed the same.  This patch from Paul
DuBois updates all URLs to modern semantics.
 2007-10-05 13:16:54 -04:00
tnurnberg@sin.intern.azundris.com
f3b1822c7a Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/tnurnberg/15327/51-15327
 2007-09-15 05:12:02 +02:00
tnurnberg@sin.intern.azundris.com
7451aaf48c Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/tnurnberg/15327/50-15327
 2007-09-15 04:45:20 +02:00
tnurnberg@sin.intern.azundris.com
d5174aad89 Merge mysql.com:/home/tnurnberg/15327/50-15327 
into  mysql.com:/home/tnurnberg/15327/51-15327
 2007-09-15 04:09:38 +02:00
tnurnberg@mysql.com/sin.intern.azundris.com
3c6ca8d6ed Bug #15327: configure: --with-tcp-port option being partially ignored 
make sure that if builder configured with a non-standard (!= 3306)
default TCP port that value actually gets used throughout. if they
didn't configure a value, assume "use a sensible default", which
will be read from /etc/services or, failing that, from the factory
default. That makes the order of preference
- command-line option
- my.cnf, where applicable
- $MYSQL_TCP_PORT environment variable
- /etc/services (unless configured --with-tcp-port)
- default port (--with-tcp-port=... or factory default)
 2007-09-13 16:19:46 +02: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)
be15e3bc15 Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-23 20:20:40 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f Many files: 
Changed header to GPL version 2 only
 2006-12-23 20:17:15 +01:00
kent@kent-amd64.(none)
b011500fe9 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-12-02 06:10:46 +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/mysqldev@suse9-x86.mysql.com
81f97ed648 myisampack.def, myisamlog.def, myisam_ftdump.def, myisamchk.def: 
Adjusted for storage path
nwbootstrap:
  Corrected bad merge
 2006-12-02 04:25:41 +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
kent@kent-amd64.(none)
3749d77c8c Merge mysql.com:/home/kent/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-11-29 14:35:59 +01:00
joerg@trift2.
648e86e108 netware/BUILD/nwbootstrap : Editing "mwenv" is now obsolete and even plain wrong - drop it. 2006-11-28 18:36:53 +01:00
cmiller@zippy.cornsilk.net
b074e13483 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-11-02 17:51:59 -05:00
msvensson@neptunus.(none)
e8881843a9 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-24 15:46:54 +02:00
msvensson@neptunus.(none)
e5bf79e608 Replace all refernces to .la libraries with direct references 
to their .libs/*.a library
Add comment describing why mwldnlm is called with "x" flag
 2006-10-24 13:12:34 +02:00
msvensson@neptunus.(none)
33a200d73d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-24 12:53:47 +02:00
msvensson@neptunus.(none)
6b920ebd84 Temporary fixes for building from source dist in pushbuild 2006-10-24 11:16:53 +02:00