Commit graph

773 commits

Author SHA1 Message Date
ingo@mysql.com
a21071d912 Merge mysql.com:/home/mydev/mysql-4.1-bug14400
into  mysql.com:/home/mydev/mysql-5.0-ateam
2006-07-05 11:20:10 +02:00
kent@mysql.com
748b287cad Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-06-26 23:47:14 +02:00
kent@mysql.com
c36dd28676 make_sharedlib_distribution.sh:
For compatibility, don't use {..,..} in pattern matching
make_binary_distribution.sh:
  Added .dylib and .sl as shared library extensions
2006-06-26 23:44:17 +02:00
kent@mysql.com
cae47f4b20 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-06-17 11:38:16 +02:00
kent@mysql.com
6783fc830f make_win_src_distribution.sh:
Make output less verbose
  Make temporary directory name unique
  Remove temporary directory on interrupt
2006-06-17 11:33:34 +02:00
kent@mysql.com
1b7d4cacfb make_win_src_distribution.sh:
Don't try copy non existing extra/{sql_state,mysqld_error}.h
2006-06-17 10:44:52 +02:00
kent@mysql.com
10833287ef Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-06-17 03:13:22 +02:00
kent@mysql.com
eadd351031 make_win_src_distribution.sh:
Include "sql_yacc.yy" for completeness (bug#20387)
2006-06-17 03:04:43 +02:00
igor@rurik.mysql.com
0585e50599 Merge rurik.mysql.com:/home/igor/tmp_merge
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-05-31 18:10:02 -07:00
kent@mysql.com
4f2e784ac2 make_win_src_distribution.sh:
Convert to DOS EOL if dsp/dsw is in package
2006-05-29 20:09:22 +02:00
kent@mysql.com
e9d96153e1 make_sharedlib_distribution.sh:
Solaris sh don't like {..} in file matching
2006-05-23 00:50:39 +02:00
kent@mysql.com
0298bfaac6 Merge 2006-04-03 03:52:22 +02:00
kent@mysql.com
6ba1a85726 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-04-03 03:40:54 +02:00
kent@mysql.com
e1d6c31984 mysql_install_db.sh, MySQLEULA.txt, mysql_install_db.c:
Changed web address order.mysql.com to shop.mysql.com
2006-04-03 03:37:43 +02:00
kent@mysql.com
6ce9c90db9 mysqld_safe.sh:
Added --help option, bug#16392
acinclude.m4:
  Use "$shrext_cmds" when testing if shared library exists, bug#16332
2006-03-29 23:51:23 +02:00
kent@mysql.com
0d332aef39 Merge 2006-03-29 15:05:06 +02:00
kent@mysql.com
67f2b0f3bc mysql_config.sh:
If installed, search built in lib path first, bug#13158
2006-03-29 14:59:53 +02:00
kent@mysql.com
6b51a2c69f Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-03-27 23:08:25 +02:00
kent@mysql.com
04f059c5bf mysql_config.sh:
Remove Solaris -xc99=none C option as C++ compiler can't handle it
2006-03-27 23:04:44 +02:00
kent@mysql.com
898db8b053 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-03-27 19:37:29 +02:00
kent@mysql.com
35ae639477 mysql_config.sh:
We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322
2006-03-27 19:25:25 +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
monty@mysql.com
82b77cdd90 Fixes to embedded server to be able to run tests with it
(Needed for "list of pushes" web page and autopush)
2006-02-24 18:34:15 +02:00
holyfoot@deer.(none)
796489ea1e Messgges corrected in mysql_upgrade script 2006-02-20 14:26:32 +04:00
holyfoot@deer.(none)
70fdbff94f --help option added to mysql_upgrade script 2006-02-18 14:55:31 +04:00
holyfoot@deer.(none)
053d90a234 WL#2645 (CHECK TABLE FOR UPGRADE)
necessary implementation in the server
mysql_upgrade script added
2006-02-17 10:52:32 +04: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
joerg@mysql.com
fa91e05bf5 Manual merge of the fix for bug#16106.
Currently failing tests (for me) in non-debug build:
blackhole fulltext fulltext_cache fulltext_left_join fulltext_multi
2006-01-16 16:48:05 +01:00
joerg@mysql.com
1155bf20d9 Merge mysql.com:/M40/push-4.0 into mysql.com:/M41/merge-4.1 2006-01-13 17:45:01 +01:00
joerg@mysql.com
9d4562e5fe extra/comp_err.c + scripts/mysqld_multi.sh :
Copyright string fixes (bug#16106)
2006-01-13 16:25:20 +01:00
kent@mysql.com
28a59073b0 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-12-15 00:43:41 +01:00
kent@mysql.com
c11b35d9bf Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-14 13:18:24 +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
43252fa1bb Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-12-11 09:23:38 +01:00
kent@mysql.com
cf57f12407 make_win_src_distribution.sh:
Removed Visual Studio 6 project files, as they are not maintained
2005-12-11 09:21:13 +01:00
jimw@mysql.com
085e7784b0 Merge mysql.com:/home/jimw/my/mysql-5.0-14610
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-30 13:10:50 -08:00
kent@mysql.com
bcdd552d6e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
2005-11-19 11:20:52 +01:00
kent@mysql.com
bd80dc6c2e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-11-19 11:11:09 +01:00
jimw@mysql.com
bb742ae0fa Don't try to mysqlhotcopy the INFORMATION_SCHEMA database. (Bug #14610) 2005-11-10 17:05:36 -08:00
jimw@mysql.com
3506e1e58b Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-10 11:24:57 -08:00
jimw@mysql.com
56a56a789a Merge mysql.com:/home/jimw/my/mysql-4.1-14469
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-11-10 11:23:52 -08:00
kent@mysql.com
4742f585b1 Merge 2005-11-04 02:17:11 +01:00
kent@mysql.com
ee0b6db191 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-11-04 01:15:35 +01:00
jimw@mysql.com
bb34222087 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-01 12:15:08 -08:00
jimw@mysql.com
6894cbc9eb Fix harmless typo in mysql_fix_privilege_tables.sql (Bug #14469) 2005-10-31 15:56:52 -08:00
jimw@mysql.com
1d9bfbf7d2 Handle decision to use mysqld-max over mysqld within mysqld_safe
even when --ledir option is specified. (Bug #13774)
2005-10-31 11:15:44 -08: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