Commit graph

194 commits

Author SHA1 Message Date
joerg@mysql.com
671a1be31b The binary "mysql_upgrade" must be included in the distribution. (bug#18516 + 19353) 2006-06-23 12:17:11 +02:00
joerg@mysql.com
6838660267 Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1 2006-03-02 10:48:46 +01:00
kent@mysql.com
f9a23667b2 Merge 2006-02-12 04:33:50 +01:00
kent@mysql.com
1fe9126dc2 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2006-02-12 01:35:30 +01:00
kent@mysql.com
eec5726806 make_binary_distribution.sh:
print => echo in shell script
2006-02-12 01:33:43 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
13d7abe06f 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
2005-12-13 18:44:20 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
32466b14fb Minor Netware specific changes. 2005-12-13 18:30:10 +02:00
kent@mysql.com
85ab53357b thread_registry.h, thread_registry.cc:
Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX
Makefile.am:
  Preserve executable mode on scripts
make_binary_distribution.sh:
  Copy *.imtest files
2005-10-16 06:49:19 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
63ac3040a8 Small fixes for Netware. 2005-10-14 08:45:41 +03:00
jani@ua141d10.elisa.omakaista.fi
2dd1e4f94e Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-10-13 18:23:53 +03:00
jani@ua141d10.elisa.omakaista.fi
5dad171618 Some Netware related fixes and fixes for Metrowerks compiler. 2005-10-13 17:21:14 +03:00
kent@mysql.com
94ea4f188a make_binary_distribution.sh:
Copy *.cnf files in mysql-test/std_data/
Makefile.am:
  Added std_data/*.cnf to copy ndb config
2005-10-12 22:49:33 +02:00
lars@mysql.com
57f36732ca Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
into  mysql.com:/users/lthalmann/bk/mysql-5.0
2005-10-10 17:50:19 +02:00
kent@mysql.com
33f38f7ed8 make_binary_distribution.sh:
Copy zlib.a and valgrind.supp if exists
  Copy disabled.def
2005-10-07 13:08:07 +02:00
kent@mysql.com
c68c4f3cb7 Merge 2005-10-07 12:55:00 +02:00
kent@mysql.com
ae62a58817 make_binary_distribution.sh:
Corrected platform name output
Services.cpp:
  Dont print null address (back port from 5.0)
2005-10-07 01:56:11 +02:00
kent@mysql.com
87016b438c make_binary_distribution.sh:
Reintroduced --machine
  Better sh compatibility, "for i ; do" is not portable
2005-10-06 22:57:13 +02:00
kent@mysql.com
52181cc810 make_binary_distribution.sh:
Replaced --machine with --platform
  General code cleanup
2005-10-06 18:00:23 +02:00
kent@mysql.com
d859573bcf make_binary_distribution.sh:
Include libz.a in distribution if built bundled
2005-09-20 19:26:00 +02:00
lenz@mysql.com
611ae59245 - reverted adding mysql-test/t/*.def to the distribution (it is not supported in 4.1
at all)
2005-07-08 21:04:54 +02:00
lenz@mysql.com
79f43c864a - manual merge of the addition of including mysqlt-test/t/*.def 2005-07-08 11:27:08 +02:00
lenz@mysql.com
780d699b86 - added mysql-test/t/*.def to the source and binary distributions 2005-07-08 11:07:05 +02:00
lenz@mysql.com
a9e1b8756d - manual merge of the make_binary_distribution.sh ChangeSet propagation 2005-07-06 14:30:51 +02:00
lenz@mysql.com
68e5693096 Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build
2005-07-06 14:00:24 +02:00
lenz@mysql.com
49986c7e05 - backported a change for make_binary_distribution.sh from 5.0 for easier building of
all versions: added an option "--machine" that allows to override the autodetected
  architecture string (e.g. "i386") that becomes part of the binary package name with 
  a different one
- moved the removal of the BASE directory to the end of the make_binary_distribution
  script
2005-07-06 13:58:29 +02:00
lenz@mysql.com
024010e562 - make sure to include mysql-test/t/*.sql files in the binary distributions and when
"make install" is called (mysql_delimiter.sql was missing)
2005-06-08 11:49:24 +02:00
lenz@mysql.com
9afd2563e9 Merge of 4.1 -> 5.0 2005-06-01 15:11:14 +02:00
lenz@mysql.com
e877e71b17 Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-06-01 13:06:15 +02:00
lenz@mysql.com
7bd3dd7cb3 - removed references to some obsolete files (BUG#10824)
- removed obsolete mysql-max.spec.sc RPM spec file (Max is built out of the standard
  spec file)
2005-06-01 12:59:10 +02:00
kent@mysql.com
f81e6248d2 make_binary_distribution.sh:
To be safe, put "..." around variables to the test command
2005-05-18 12:49:43 +02:00
matt@mysql.com
4dca62401c make_binary_distribution.sh:
Use portable check for empty string.
2005-05-18 03:45:01 +02:00
mwagner@ultrafly.mysql.com
58409db4c9 make_binary_distribution.sh:
- Add --machine override
2005-05-09 14:57:45 +02:00
mwagner@ultrafly.mysql.com
f5ba5ab024 make_binary_distribution.sh:
- Print the platform name for the build logs.
2005-05-09 12:05:13 +02:00
mwagner@ultrafly.mysql.com
c5cb8a2bfa make_binary_distribution.sh:
- Remove vendor tag from package names.
  - Map standard OS names to user-friendly versions.
2005-05-08 23:02:50 +02:00
monty@mishka.local
de1b1fe54d Added more rows to test to get predictable results 2005-04-16 10:53:30 +03:00
jimw@mysql.com
3dcfc31e76 Remove references to result.es files 2005-04-12 18:04:32 -07:00
monty@mysql.com
beb28b27e0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-04-06 17:23:34 +03:00
monty@mysql.com
49e721677f Fixed errors descovered by valgrind 2.4
Added suppression file for some valgrind warnings that are not real errors
2005-04-06 17:22:21 +03:00
jimw@mysql.com
127afff8c8 Remove references to result.es files 2005-04-05 13:01:42 -07:00
petr@mysql.com
7730319738 Enable IM in the binary distribution and fix Bug #9513 (mysql.server script from the binary distibution
doesn't work out of the box)
2005-04-04 03:49:10 +04:00
serg@serg.mylan
956682de1a merged 2005-03-09 14:09:06 +01:00
kent@mysql.com
c6002966be mysql-test-run.pl:
Removed -c from /bin/sh call
make_win_src_distribution.sh:
  Copy all content in mysql-test
make_win_binary_distribution.sh, make_binary_distribution.sh:
  Add Perl version of mysql-test-run to package
s_win32_dsp, s_win32, s_vxworks, s_test, s_readme, s_java, s_javah:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
2005-03-09 01:34:22 +01:00
tulin@mysql.com
9171ff17ca Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-21 10:54:23 +01:00
mysqldev@mysql.com
94fb790b18 Merge mysql.com:/home/mysqldev/tulin/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 10:53:01 +01:00
tulin@mysql.com
84f0f11fff bug #8611, ndb includes in lib dir instead of include dir 2005-02-21 10:52:29 +01:00
kent@mysql.com
87d6da972f make_binary_distribution.sh, Makefile.am:
Make .disabled files part of distribution
2005-02-17 20:07:52 +01:00
jani@ua141d10.elisa.omakaista.fi
1c2f4ffecb Applied a patch for Netware. 2005-02-08 19:49:40 +02:00
jimw@mysql.com
8c8553af81 Merge changes 2005-02-04 11:59:02 -08:00
jimw@mysql.com
183d1327f0 Copy *.result.es files for binary distribution so embedded tests can be run 2005-02-03 14:21:16 -08:00
monty@mysql.com
422c2eb868 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
jimw@mysql.com
a8039e1ac8 Make sure mysql_client_test and embedded test clients get added to
binary distribution on all platforms.
2005-02-01 11:59:44 -08:00
jimw@mysql.com
d11081bd6f Merge 2005-01-24 13:48:48 -08:00
lenz@mysql.com
9675b0698f - renamed client_test -> mysql_client_test
- renamed the tests that use the embedded server (client_test -> 
  mysql_client_test_embedded, mysqltest -> mysql_test_embedded
  and changed some Makefiles and scripts so they are installed in $bindir
  (required to be able to run the test suite against the embedded server)
2005-01-20 16:25:38 +01:00
jimw@mysql.com
d28f83359b Update list of files copied for binary distribution. (Bug #7632) 2005-01-18 17:01:06 -08:00
jani@ua141d10.elisa.omakaista.fi
f3e73e26d7 A patch for Netware. 2005-01-13 19:24:54 +02:00
kent@mysql.com
bb806c1e98 make_win_src_distribution.sh, make_binary_distribution.sh, mysql-test-run.sh:
Removed references to ISAM and MERGE
2005-01-01 21:13:09 +01:00
monty@mysql.com
afbe601302 merge with 4.1 2004-10-29 19:26:52 +03:00
tomas@poseidon.ndb.mysql.com
009bf31915 use the right make in make_binary_distribution 2004-10-22 08:57:52 +00:00
mwagner@here.mwagner.org
edc4b65d5c mysql-test-run.sh:
Look for 'client_test' in tests/ not bin/
make_binary_distribution.sh:
  Copy 'client_test' into the dist
2004-10-08 13:38:35 -05:00
monty@mysql.com
31122efde7 Merge with 4.1
(Includes merge of arena code in 4.1 and 5.0)
2004-09-06 15:14:10 +03:00
serg@serg.mylan
e1237cbc53 manually merged 2004-08-18 19:57:55 +02:00
lenz@mysql.com
1097805cf2 - rename: EXCEPTIONS->EXCEPTIONS-CLIENT 2004-08-05 17:05:11 +02:00
lenz@mysql.com
e5cb60dcaa - applied the required changes to create the FOSS License exception
file "EXCEPTIONS" and include it in the source and binary 
   distributions
2004-08-05 01:54:04 +02:00
monty@mysql.com
1e31199995 Merge with 4.1.3-beta 2004-07-07 11:29:39 +03:00
lenz@mysql.com
edb9af25bc - added mysql_tzinfo_to_sql to binary distributions 2004-06-24 09:22:45 +02:00
tomas@poseidon.bredbandsbolaget.se
8d7d4c077b several ndb make changes, see respective file 2004-06-02 00:54:58 +00:00
monty@mysql.com
7d8f8bc77b Changed prototype of killed_ptr() to make it more portable
Applied patches for Netware
2004-05-26 19:12:49 +03:00
pem@mysql.com
71eddc362e Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02: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
ca8dbc24ee Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/tmp/skr99/mysql-4.0
2004-05-25 22:01:50 +03:00
monty@mysql.com
f2e1e3ce4c Added patches from Novell 2004-05-25 22:00:14 +03:00
monty@mysql.com
cd3dab49cc Merge with 4.0.20 2004-05-17 01:52:13 +03:00
lenz@mysql.com
b1f2932fff - make sure the binaries are executable before calling them during
make_binary_distribution (bug#2857)
2004-05-13 18:50:09 +02:00
pem@mysql.com
bf45960eef Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
tomas@mc05.(none)
8e381405eb make_binary_distribution.sh:
added --with-ndbcluster switch
2004-04-15 15:43:10 +02:00
pem@mysql.com
dfd59e296e Merge 4.1 -> 5.0. 2004-04-07 19:07:44 +02:00
lenz@kallisto.local
bbbb3f6540 - install all *.sql files into the "shared" directory for the binary tar.gz
distribution (this is more in line with how "make install" would install
   them) - this should also fix a test failure in the "system_mysql_db_fix"
   test.
2004-04-01 17:34:26 +02:00
monty@mysql.com
ce14578909 Merge with 4.0.18 2004-02-11 00:06:46 +01:00
lenz@mysql.com
9736c9c457 - renamed myisam/ft_dump to myisam/mysam_ftdump and added it to the
binary distribution and Server RPM
2004-02-03 22:25:02 +01:00
pem@mysql.com
6e717133c5 Merge 4.1 to 5.0 2003-12-01 16:14:40 +01:00
serg@serg.mylan
bff0bbeb1f merged 2003-11-25 18:26:53 +01:00
lenz@mysql.com
531eb44301 - Removed COPYING.LIB from all source and binary distributions
after it was removed from manual.texi (where it was automatically
   generated from).
2003-11-25 17:52:12 +01:00
pem@mysql.com
8d884c02bb Merging 4.1 -> 5.0 2003-09-24 11:29:38 +02:00
monty@narttu.mysql.fi
77a70a0a24 merge with 4.0.15 2003-08-29 13:44:35 +03:00
lenz@mysql.com
94c7024eaa - enabled embedded server in the binary distributions by default
(Do-compile)
 - added mysql.info to the binary distribution files (BUG#1019)
 - heavily reworked the Do-rpm script to be more in line with Do-pkg
 - create a "docs" subdirectory in the binary distribution and moved the
   manual, ChangeLog and mysql.info file into it to unclutter the top
   directory
2003-08-12 23:21:21 +02:00
greg@mysql.com[greg]
ea46c24279 rlyon-5.0.0-alpha.patch 2003-05-29 14:28:02 -04:00
monty@narttu.mysql.fi
a7708c7904 Merge with 4.0 2003-04-03 21:19:12 +03:00
greg@mysql.com
080b73ee18 Manual merge of Novell's changes for NetWare platform from 4.0, 4.1 patches 2003-03-28 14:24:32 -05:00
greg@mysql.com
9aeb60210f Improve make_binary_distribution from Novell code at Monty's request 2003-03-27 18:13:37 -05:00
greg@mysql.com
67985efed5 Post-4.0.12 changes from Novell: mostly NetWare-related code changes to utilize new LibC 2003-03-21 16:45:39 -05:00
monty@narttu.mysql.fi
112dfa5900 Fixes for fill_help_tables.sql 2003-03-21 18:53:55 +02:00
lenz@mysql.com
26f9bee733 - added missing file mysql-test/std_data/des_key_file to source and binary
distribution to fix a test failure in test "func_encrypt"
2003-03-04 22:24:00 +01:00
lenz@mysql.com
905ce89dc5 - added missing file mysql-test/std_data/des_key_file to source and binary
distribution to fix a test failure in test "func_encrypt"
2003-03-04 18:18:05 +01:00
greg@mysql.com[greg]
137bdcec5a novell41.patch 2003-03-04 10:34:32 -05:00
monty@narttu.mysql.fi
326b8abc89 merge with 3.23 to get corrected error message files and rename of files in mysql-test 2003-02-26 00:22:35 +02:00
monty@narttu.mysql.fi
e6c575dacc change 'slave-master-info.opt' to .slave-mi to avoid problems with long filenames on some OS 2003-02-26 00:04:13 +02:00
monty@mashka.mysql.fi
6051b2f998 Fixed multi-table-delete for InnoDB tables
Novell patches
2003-02-17 02:14:37 +02:00
lenz@mysql.com
cf25397e0e - fixed typo for better portability (many shells don't support the "=="
operator)
2003-01-29 09:22:20 +01:00
monty@mashka.mysql.fi
6b71279382 merge 2003-01-28 09:02:51 +02:00
monty@mashka.mysql.fi
689578a099 Fixes for Netware
Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL
2003-01-28 08:38:28 +02:00