Commit graph

48736 commits

Author SHA1 Message Date
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
kent@kent-amd64.(none)
fd3b865149 Merge mysql.com:/home/kent/bk/config_h/mysql-5.0-build
into  mysql.com:/home/kent/bk/config_h/mysql-5.1-build
2007-07-30 21:45:06 +02:00
kent@kent-amd64.(none)
01ad489356 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/config_h/mysql-5.0-build
2007-07-30 21:40:13 +02:00
kent@mysql.com/kent-amd64.(none)
a9d2569cba Generate "config.h" directly into the "include" directory, later copied
to "my_config.h". Not to pollute the top directory, and to get more control
over what is included. Made the include path for "libedit" pick up its own
"config.h" first.
2007-07-30 21:09:45 +02:00
kent@kent-amd64.(none)
a0571dedb3 Merge mysql.com:/home/kent/bk/config_h/mysql-4.1-build
into  mysql.com:/home/kent/bk/config_h/mysql-5.0-build
2007-07-30 20:42:30 +02:00
kent@mysql.com/kent-amd64.(none)
e99df6fd02 my_pthread.c:
Backport of correction for Mac OS X build problem, global variable not
  initiated is "common" and can't be used in shared libraries, unless
  special flags are used (bug#26218)
2007-07-30 20:40:49 +02:00
omer@linux.site
ce5044072e Merge obarnir@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  linux.site:/home/omer/source/jrg51
2007-07-30 11:09:37 -07:00
omer@linux.site
971bc31dea Merge linux.site:/home/omer/source/bld50_0724
into  linux.site:/home/omer/source/jrg51
2007-07-30 08:37:33 -07:00
kent@kent-amd64.(none)
038357dd43 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
2007-07-30 13:38:40 +02:00
joerg@trift2.
79a90dad8e Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-07-30 11:18:50 +02:00
joerg@trift2.
315ece5d8f Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-07-30 11:15:14 +02:00
jperkin@production.mysql.com
88ef9a4214 Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0
2007-07-27 20:49:23 +02:00
jperkin@production.mysql.com
7731aad613 Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0
2007-07-27 20:47:30 +02:00
jperkin@production.mysql.com
61a1e17260 Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.1
2007-07-27 20:43:34 +02:00
jperkin@production.mysql.com
87a297061c Merge production.mysql.com:/usersnfs/jperkin/bk/bug-28585-5.0
into  production.mysql.com:/usersnfs/jperkin/bk/bug-28585-5.1
2007-07-27 20:28:34 +02:00
df@pippilotta.erinye.com
50e7239d7b BUG#20815 for the 5.1 branch 2007-07-27 19:14:08 +02:00
kent@mysql.com/kent-amd64.(none)
519ebab04e SSL/Makefile.am mysql-test/Makefile.am:
Moved CERT files to where they are used, avoids conflict
  between two make files trying to install the same CERTs
SSL/*.pem, 
  Move: SSL/*.pem -> mysql-test/std_data/
2007-07-27 17:39:07 +02:00
joerg@debian.(none)
808a534d11 Merge mysqldev@production.mysql.com:my/mysql-5.1-funcs1-dep
into  debian.(none):/M51/omer-5.1
2007-07-27 16:13:07 +02:00
joerg/mysqldev@production.mysql.com
0dad584179 Merge mysql.com:/data0/mysqldev/my/mysql-5.1
into  mysql.com:/data0/mysqldev/my/mysql-5.1-funcs1-dep
2007-07-27 16:06:50 +02:00
joerg/mysqldev@mysql.com/production.mysql.com
4d279aa9df Merge mysql.com:/data0/mysqldev/my/mysql-5.1
into  mysql.com:/data0/mysqldev/my/mysql-5.1-funcs1-dep
2007-07-27 15:59:18 +02:00
joerg@debian.(none)
4d9cbaf313 Fix a bad BitKeeper dependency structure for the "funcs_1" suite:
Step 2:
Restore the 5.1 contents in the 5.0-dependent files.
2007-07-27 15:41:27 +02:00
jperkin@production.mysql.com
d5293e4584 More fixes and cleanups for bug#28585:
- make the 'dist-hook' from top-level Makefile work again.
  - we can find my_print_defaults from --basedir by parsing command
    line arguments prior to running my_print_defaults.
  - take advantage of additional command line parsing and allow the
    --no-defaults etc arguments to work anywhere rather than having
    to be the first argument.
  - find SQL files either from binary archive or source install.
  - consolidate and tidy code and error messages.
2007-07-27 15:14:21 +02:00
joerg@debian.(none)
c80ced4111 Fix a bad BitKeeper dependency structure for the "funcs_1" suite:
The files below "mysql-test/suite/funcs_1" in version 5.1
did not depend on the equivalent ones in 5.0,
probably because they had been checked in independent of each other
in both versions.

Step 1:
Foreach file F in the suite that has a "deleted" counterpart D, use
    bk rm $F
    bk mv $D $F
to get those files into the 5.1 suite that (for BK) depend on 5.0.
2007-07-27 13:32:32 +02:00
svoj@june.mysql.com
21b707e43d Merge mysql.com:/home/svoj/devel/mysql/BUG29957/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG29957/mysql-5.1-engines
2007-07-27 14:44:31 +05:00
svoj@june.mysql.com
81905ee14f Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG29957/mysql-5.0-engines
2007-07-27 14:36:43 +05:00
svoj@mysql.com/june.mysql.com
9d1bfec265 BUG#29957 - alter_table.test fails
INSERT/DELETE/UPDATE followed by ALTER TABLE within LOCK TABLES
may cause table corruption on Windows.

That happens because ALTER TABLE writes outdated shared state
info into index file.

Fixed by removing obsolete workaround.

Affects MyISAM tables on Windows only.
2007-07-27 14:30:25 +05:00
joerg@debian.(none)
7d08e0890a Merge debian.(none):/M51/rowlock-5.1
into  debian.(none):/M51/push-5.1
2007-07-26 21:15:44 +02:00
joerg@debian.(none)
25f39c08bb Merge debian.(none):/M50/rowlock-5.0
into  debian.(none):/M51/rowlock-5.1
2007-07-26 18:40:46 +02:00
joerg@debian.(none)
db5ad35ec9 Merge debian.(none):/M50/rowlock-5.0
into  debian.(none):/M50/push-5.0
2007-07-26 18:26:04 +02:00
joerg@debian.(none)
1e455b4c28 Remove the "row_lock" suite from the sources.
For more information, see WL#3866 and the bugs numbered 28685 and 20390.
2007-07-26 17:25:03 +02:00
acurtis/antony@ltamd64.xiphis.org
1db77a3896 Merge xiphis.org:/anubis/antony/work/mysql-5.0-engines.merge
into  xiphis.org:/anubis/antony/work/mysql-5.1-engines.merge
2007-07-26 08:18:32 -07:00
acurtis/antony@ltamd64.xiphis.org
cb50eec077 Merge xiphis.org:/anubis/antony/work/mysql-5.1-engines
into  xiphis.org:/anubis/antony/work/mysql-5.1-engines.merge
2007-07-26 07:57:50 -07:00
acurtis/antony@ltamd64.xiphis.org
c2080430c3 Merge xiphis.org:/anubis/antony/work/mysql-5.0-engines
into  xiphis.org:/anubis/antony/work/mysql-5.0-engines.merge
2007-07-26 07:56:37 -07:00
joerg@debian.(none)
a23b3dc3b0 Merge debian.(none):/M51/bug16635-5.1
into  debian.(none):/M51/push-5.1
2007-07-26 16:27:29 +02:00
joerg@debian.(none)
6010c58f1e Merge debian.(none):/M51/mysql-5.1
into  debian.(none):/M51/push-5.1
2007-07-26 16:21:01 +02:00
joerg@debian.(none)
e5cb63529d Merge debian.(none):/M50/bug16635-5.0
into  debian.(none):/M51/bug16635-5.1
2007-07-26 16:02:31 +02:00
joerg@debian.(none)
cb52840f13 Merge debian.(none):/M41/push-4.1
into  debian.(none):/M50/push-5.0
2007-07-26 15:44:58 +02:00
joerg@debian.(none)
2a71b66517 Merge debian.(none):/M50/bug16635-5.0
into  debian.(none):/M50/push-5.0
2007-07-26 15:41:57 +02:00
joerg@debian.(none)
1bf0b2f655 Merge debian.(none):/M50/mysql-5.0
into  debian.(none):/M50/push-5.0
2007-07-26 15:37:45 +02:00
joerg@debian.(none)
c3264eaa0f Merge debian.(none):/M41/bug16635-4.1
into  debian.(none):/M41/push-4.1
2007-07-26 15:32:32 +02:00
joerg@debian.(none)
fa040bba06 Merge debian.(none):/M41/bug16635-4.1
into  debian.(none):/M50/bug16635-5.0
2007-07-26 15:32:31 +02:00
jperkin@production.mysql.com
d2936fad10 mysql_install_db.sh:
Fix error in previous change, correct --language argument.
2007-07-26 14:31:11 +02:00
jperkin@production.mysql.com
2c95b97787 Apply a few more cleanups to improve the robustness of mysql_install_db 2007-07-26 14:27:36 +02:00
jperkin@production.mysql.com
8f87bd6008 Clean up the mysql_install_db script to ensure that a sane environment is
available and reduce the chance of failure.  This should fix bug#28585
which is caused by the script being quite random in how it finds files it
requires and not giving very good feedback to the user about what went
wrong.

Also update make_binary_distribution so that it provides the correct path
to the required SQL scripts when generating mysql_install_db.  The script
only previously worked because of the permissive behaviour which looked
around the current working directory before the "correct" location.  This
could lead to severe problems if the user happened to run the script from
a location which contained older or even broken copies of the SQL scripts.

We now require either a complete binary release (and the mysql_install_db
script ran from inside the extracted archive), or an installed compiled
tree, as this is the only way we can be sure everything that we need is
available and ready to run.

While working on this fix, also clean up the mysql_install_db script a lot
to make it simpler, easier to read, and hopefully less prone to bugs in
the future.
2007-07-26 12:57:46 +02:00
joerg@debian.(none)
560cad771a Raise the 64 character limit for path names in the error messages
to 150 or 107 characters for those messages which are generated
by the embedded server during release builds.

This fixes bug#16635:
   Error messages wrong: absolute path names, "%s" format code

See the bug report or the changelog for "sql/share/english/errmsg.txt"
for instructions how to do that with other languages, 
even at the customer site, and for the restrictions to keep.
2007-07-26 12:52:13 +02:00
antony@pcg5ppc.xiphis.org
ae709d4ef4 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  pcg5ppc.xiphis.org:/Users/antony/Work/p1-bug29522.1
2007-07-25 21:21:02 -07:00
gshchepa/uchum@gleb.loc
1339cdb75a Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into  gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-26 05:28:10 +05:00
acurtis/antony@ltamd64.xiphis.org
d60c0e7de2 Merge xiphis.org:/anubis/antony/work/p2-bug25679.3
into  xiphis.org:/anubis/antony/work/p2-bug25679.3.merge-5.1
2007-07-25 17:24:59 -07:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
2cc508b3f4 fix pushbuild failures 2007-07-25 17:22:52 -07:00