summaryrefslogtreecommitdiff
path: root/netware
Commit message (Collapse)AuthorAgeFilesLines
* Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-161-2/+2
|\
| * Bug #45058 init_available_charsets uses double checked lockingStaale Smedseng2009-12-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As documented in the bug report, the double checked locking pattern has inherent issues, and cannot guarantee correct initialization. This patch replaces the logic in init_available_charsets() with the use of pthread_once(3). A wrapper function, my_pthread_once(), is introduced and is used in lieu of direct calls to init_available_charsets(). Related defines MY_PTHREAD_ONCE_* are also introduced. For the Windows platform, the implementation in lp:sysbench is ported. For single-thread use, a simple define calls the function and sets the pthread_once control variable. Charset initialization is modified to use my_pthread_once().
* | Backport WL#4085: Merge revno:2617.56.29 from 6.0.Alexander Nozdrin2009-10-061-1/+0
|/
* Auto-merge up from 5.0Timothy Smith2009-02-071-1/+1
|\
| * Handle renamed nwbootstrap -> nwbuildTimothy Smith2009-02-061-1/+1
| |
* | Merge up from 5.0-buildTimothy Smith2009-02-042-196/+86
|\ \ | |/
| * The nwbootstrap script depended on BitKeeper, and was fairly complicated. ↵Timothy Smith2009-02-042-191/+86
| | | | | | | | | | | | | | 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.
* | Merge from 5.0-bugteam local.Chad MILLER2008-08-181-0/+9
|\ \ | |/
* | Merge from 5.0-bugteam local.Chad MILLER2008-08-184-10/+24
|\ \ | |/
| * Bug#30129: mysql_install_db appears to run normally, but the databases \Chad MILLER2008-08-064-10/+24
| | | | | | | | | | | | | | | | | | | | 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.
* | Merge trift2.:/MySQL/M50/merge-5.0joerg@trift2.2007-12-212-0/+2
|\ \ | |/ | | | | into trift2.:/MySQL/M51/push-5.1
| * sp_head.cc:kent/mysqldev@mysql.com/production.mysql.com2007-12-142-0/+2
| | | | | | | | | | | | 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
* | Minor Makefile fixes:joerg@trift2.2007-10-301-3/+0
| | | | | | | | | | | | 1) Add a new top level "Makefile.am" target "make embedded-test". 2) Fix a syntax error (bad merge) in "netware/Makefile.am".
* | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2007-10-081-1/+1
|\ \ | |/ | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
| * Change URLs.cmiller@zippy.cornsilk.net2007-10-051-1/+1
| | | | | | | | | | | | 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.
| * Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-mainttnurnberg@sin.intern.azundris.com2007-09-152-2/+3
| |\ | | | | | | | | | into mysql.com:/home/tnurnberg/15327/50-15327
| * \ Merge trift2.:/MySQL/M50/netware2-5.0joerg@trift2.2007-08-242-5/+18
| |\ \ | | | | | | | | | | | | into trift2.:/MySQL/M50/push-5.0
| * | | NetWare packages were missing the scripts to initialize the database: add them.joerg@trift2.2007-08-241-1/+1
| | | |
* | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-mainttnurnberg@sin.intern.azundris.com2007-09-152-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | into mysql.com:/home/tnurnberg/15327/51-15327
| * \ \ \ Merge mysql.com:/home/tnurnberg/15327/50-15327tnurnberg@sin.intern.azundris.com2007-09-152-2/+3
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | into mysql.com:/home/tnurnberg/15327/51-15327
| | * | | Bug #15327: configure: --with-tcp-port option being partially ignoredtnurnberg@mysql.com/sin.intern.azundris.com2007-09-132-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | | | Merge trift2.:/MySQL/M51/netware2-5.1joerg@trift2.2007-08-241-3/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1
| * \ \ \ \ Merge trift2.:/MySQL/M50/netware2-5.0joerg@trift2.2007-08-242-6/+18
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| | into trift2.:/MySQL/M51/netware2-5.1
| | * | | Fixes for the NetWare builds, discovered during 5.1.21-beta and backported ↵joerg@trift2.2007-08-242-6/+19
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge trift2.:/MySQL/M51/netware-5.1joerg@trift2.2007-08-234-37/+1
|\ \ \ \ | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1
| * \ \ \ Merge trift2.:/MySQL/M50/netware-5.0joerg@trift2.2007-08-234-37/+1
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| into trift2.:/MySQL/M51/netware-5.1
| | * | Cleanup in the "netware" subdirectory:joerg@trift2.2007-08-224-37/+1
| | |/ | | | | | | | | | | | | | | | | | | 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.
* | | NetWare fixes: 1) Link options, 2) SQL command filesjbruehe/mysqldev@suse9-x86.mysql.com2007-08-202-3/+10
|/ /
* | Merge trift2.:/MySQL/M50/mysql-5.0joerg@trift2.2007-05-021-3/+3
|\ \ | |/ | | | | into trift2.:/MySQL/M51/mysql-5.1
| * Format corrections for various "Makefile.am": Leading tab, no trailing blank.joerg@trift2.2007-05-021-3/+3
| |
* | Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508msvensson@pilot.blaudden2007-04-111-1/+5
|\ \ | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| * | Bug#22508 BUILD/compile-dist fails due to problem with readline/libeditmsvensson@pilot.blaudden2007-03-271-2/+6
| | | | | | | | | | | | | | | - Move the link_sources command from top level Makefile into each subdir that need to link files
* | | Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-buildkent@kent-amd64.(none)2007-03-203-85/+25
|\ \ \ | | |/ | |/| | | | into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
| * | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-workdf@pippilotta.erinye.com2007-03-201-1/+1
| |\ \ | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
| * | | netware/Makefile.am : "libmysql.imp" must survive a "make clean" for the ↵joerg@trift2.2007-03-191-1/+2
| | | | | | | | | | | | | | | | NetWare builds.
| * | | Bug#20166 mysql-test-run.pl does not test system privilege tables creationjoerg@trift2.2007-03-163-85/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-workdf@pippilotta.erinye.com2007-03-201-1/+1
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
| * | small build fixdf@pippilotta.erinye.com2007-03-201-1/+1
| |/
* | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-232-4/+2
|\ \ | |/ | | | | into mysql.com:/home/kent/bk/main/mysql-5.1
| * Many files:kent@mysql.com/kent-amd64.(none)2006-12-232-4/+2
| | | | | | | | Changed header to GPL version 2 only
* | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-buildkent@kent-amd64.(none)2006-12-022-0/+12
|\ \ | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.1-build
| * \ Merge mysql.com:/home/kent/bk/mysql-5.0-buildkent@kent-amd64.(none)2006-12-022-0/+12
| |\ \ | | |/ | | | | | | into mysql.com:/home/kent/bk/mysql-5.1-build
| | * Makefile.am:kent@mysql.com/kent-amd64.(none)2006-12-022-0/+12
| | | | | | | | | | | | | | | | | | Added "mysql_client_test.def" mysql_client_test.def: BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_client_test.def
* | | myisampack.def, myisamlog.def, myisam_ftdump.def, myisamchk.def:kent/mysqldev@suse9-x86.mysql.com2006-12-025-6/+5
|/ / | | | | | | | | | | Adjusted for storage path nwbootstrap: Corrected bad merge
* | Merge mysql.com:/home/kent/bk/mysql-5.0-buildkent@kent-amd64.(none)2006-12-0129-22/+41
|\ \ | |/ | | | | into mysql.com:/home/kent/bk/mysql-5.1-build
| * mysql_upgrade.def Makefile.am:kent@mysql.com/kent-amd64.(none)2006-12-0129-21/+40
| | | | | | | | | | | | Added new "mysql_upgrade.def" for Netware (bug#23504) *.def: Allocate 128K stack for all executables (bug#23504)
* | Merge mysql.com:/home/kent/bk/mysql-5.0-buildkent@kent-amd64.(none)2006-11-291-15/+14
|\ \ | |/ | | | | into mysql.com:/home/kent/bk/mysql-5.1-build
| * netware/BUILD/nwbootstrap : Editing "mwenv" is now obsolete and even plain ↵joerg@trift2.2006-11-281-9/+9
| | | | | | | | wrong - drop it.
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1cmiller@zippy.cornsilk.net2006-11-026-7/+46
|\ \ | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
| * \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@neptunus.(none)2006-10-241-0/+7
| |\ \ | | |/ | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint