Commit graph

50025 commits

Author SHA1 Message Date
cmiller@zippy.cornsilk.net
f3d77c1979 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unification
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmerge
2007-10-17 14:05:43 -04:00
cmiller@zippy.cornsilk.net
c6b5c6af86 Further clean-up. 2007-10-17 13:03:08 -04:00
joerg@trift2.
571200d487 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-10-04 19:31:32 +02:00
joerg@trift2.
82767a0a45 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-10-04 19:24:32 +02:00
jperkin@production.mysql.com
09560c6539 Merge production.mysql.com:/usersnfs/jperkin/bk/build/5.0
into  production.mysql.com:/usersnfs/jperkin/bk/build/5.1
2007-10-04 12:21:51 +02:00
jperkin@production.mysql.com
583a3ef31d Merge production.mysql.com:/usersnfs/jperkin/bk/build/5.0
into  production.mysql.com:/usersnfs/jperkin/bk/bug-27692/5.0
2007-10-04 12:06:13 +02:00
jperkin@production.mysql.com
5c0c592145 Restore creation of test databases and the anonymous user which
were accidentally removed during a previous rototill of this
code.  Fixes bug#27692.
  
While it can be argued we should strive to provide a 'secure by
default' installation, this happens to be the setup currently
documented in the manual as the default, so defer changes that
improve security out of the box to a co-ordinated effort later
on.
  
For now, make a note about the test databases and anonymous user
in mysql_install_db and recommend that mysql_secure_installation
be ran for users wishing to remove these defaults.

[..re-commit of previously lost change..]
2007-10-04 11:30:30 +02:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
6515a7f4c3 testScanFilter.cpp:
Updated variable size arrays to use vector like Jonas did for 5.1 so that my build would not break
2007-10-02 21:21:45 +02:00
kent@kent-amd64.(none)
6598c8dc2d Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  mysql.com:/home/kent/bk/make-install/mysql-5.1-build
2007-10-01 18:52:25 +02:00
kent@mysql.com/kent-amd64.(none)
4d2c8e2445 make_binary_distribution.sh:
Added special handling of "mysql_install_db" and "mysql.server" scripts,
  find executables relative to the current directory.
2007-10-01 18:41:38 +02:00
joerg@trift2.
3114699f56 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-10-01 12:31:24 +02:00
joerg@trift2.
a4450a710c Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-10-01 12:19:06 +02:00
joerg@trift2.
7c0f4a7a2e Fix bug#31150 "Test case does not cleanup":
Add the cleanup by dropping the database 'track' in test "rpl_bug31076".
2007-10-01 12:10:46 +02:00
joerg@trift2.
290aaf7c4e Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift2.:/MySQL/M51/push-5.1
2007-09-29 22:04:44 +02:00
df@pippilotta.erinye.com
1f665da388 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-29 09:33:05 +02:00
df@pippilotta.erinye.com
6f8f1883cb Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-29 09:28:05 +02:00
df@pippilotta.erinye.com
877b17d6e2 align types 2007-09-29 09:26:33 +02:00
joerg@trift2.
5de0159493 Merge trift2.:/MySQL/M51/clone-5.1
into  trift2.:/MySQL/M51/push-5.1

This is mysql-5.1.22-rc.
2007-09-28 20:33:46 +02:00
joerg@trift2.
2b86686dab Preliminary fix for
Bug #30759  	mysql_install_db fails to set $extra_bindir properly in all cases.
2007-09-28 17:33:14 +02:00
kent@kent-amd64.(none)
ca8bb3d96f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  mysql.com:/home/kent/bk/make-dist-stable/mysql-5.1-build
2007-09-27 21:40:07 +02:00
kent@mysql.com/kent-amd64.(none)
96b62a5c13 Makefile.am, configure.in:
Handle pstack like other optional directories
  Check if a directory exists relative to $srcdir
2007-09-27 21:39:23 +02:00
joerg@trift-lap.fambruehe
6aa39a1cf6 Merge trift-lap.fambruehe:/MySQL/M51/push-5.1
into  trift-lap.fambruehe:/MySQL/M51/antony-5.1
2007-09-27 16:51:40 +02:00
kent@mysql.com/kent-amd64.(none)
e5ad2cdd58 Makefile.am, make_binary_distribution.sh:
Use custom 'pkgduppdir'
mysql.server.sh:
  The server is installed in 'libexecdir'
2007-09-27 12:21:56 +02:00
kent@kent-amd64.(none)
b4f68ec357 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  mysql.com:/home/kent/bk/make-install/mysql-5.1-build
2007-09-27 10:33:59 +02:00
df@pippilotta.erinye.com
a02d8a5d06 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-27 10:01:28 +02:00
df@pippilotta.erinye.com
9edb893f95 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-27 09:49:46 +02:00
df@pippilotta.erinye.com
17fb92cce4 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-vista
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-09-27 09:46:28 +02:00
df@pippilotta.erinye.com
59f9885bb4 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-vista
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-27 09:42:54 +02:00
df@pippilotta.erinye.com
14e602e9e4 avoid using GetTempFileName in a way it's documented to not work on windows 2007-09-27 08:56:06 +02:00
kent@kent-amd64.(none)
efa1e3669d Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  mysql.com:/home/kent/bk/make-install/mysql-5.1-build
2007-09-26 20:21:23 +02:00
kent@mysql.com/kent-amd64.(none)
18acdc7581 make_binary_distribution.sh:
Use 'make install' to create the package
Makefile.am:
  Added 'pkgsuppdir' to control location separately
  Pass on mandir and infodir
  Don't install headers
2007-09-26 20:19:33 +02:00
kent@mysql.com/kent-amd64.(none)
1e5c06ea34 Makefile.am:
Corrected typo
2007-09-26 19:41:46 +02:00
dfischer/mysqldev@mysql.com/production.mysql.com
6257abbc83 Raise version number after cloning 5.0.50 2007-09-26 19:15:42 +02:00
kent@kent-amd64.(none)
c7c8f41894 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  mysql.com:/home/kent/bk/make-dist-stable/mysql-5.1-build
2007-09-26 18:49:09 +02:00
kent@mysql.com/kent-amd64.(none)
1b53e4a547 Makefile.am:
Always include all sub directories in "make dist"
  Removed incorrect comment
configure.in:
  Unconditionally list make files in AC_CONFIG_FILES
  Removed 'thread_dirs', it is not used
  Minor cleanup
compile-dist:
  Simplified the configure line needed for "make dist" to get it all
zlib.m4, ssl.m4:
  Unconditionally list make files in AC_CONFIG_FILES
Makefile.am:
  Removed DIST_SUBDIRS not needed
  Don't copy soft links as files into source package
2007-09-26 18:47:55 +02:00
df@pippilotta.erinye.com
7ef6e66bc6 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-25 17:53:01 +02:00
df@pippilotta.erinye.com
43310df9d9 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-25 17:44:53 +02:00
df@pippilotta.erinye.com
461f559adf Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-09-25 17:42:25 +02:00
joerg@trift-lap.fambruehe
a81116eef8 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22
into  trift-lap.fambruehe:/MySQL/M51/antony-5.1
2007-09-24 15:33:46 +02:00
jperkin@production.mysql.com
d6db96fb55 Merge production.mysql.com:/usersnfs/jperkin/bk/build-5.0
into  production.mysql.com:/usersnfs/jperkin/bk/build-5.1
2007-09-24 11:48:27 +02:00
mats@kindahl-laptop.dnsalias.net
983de3e27c Merge kindahl-laptop.dnsalias.net:/home/bk/b31076-mysql-5.1-rpl
into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-release
2007-09-24 10:53:41 +02:00
mats@kindahl-laptop.dnsalias.net
b2f5b2e83d BUG#31076 (Server crashes when start slave is issued):
Second patch to initailize more uninitialized variables.
2007-09-24 10:50:57 +02:00
jonathan@bagpuss.adsl.perkin.org.uk
3b3be2ada1 Revert previous attempt to fix bug#27693, the files removed from the
cmake list are auto-generated and thus still required.  Correct fix
not yet known.
2007-09-22 16:29:15 +02:00
gkodinov/kgeorge@macbook.local
ed7e4b82c1 fixed warnings by bug 30639 2007-09-21 12:17:09 +02:00
gkodinov/kgeorge@macbook.local
4eee02dd3d fixed type conversion warnings revealed by bug 30639 2007-09-21 10:15:16 +02:00
mats@kindahl-laptop.dnsalias.net
8aa3bb0418 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-release
into  kindahl-laptop.dnsalias.net:/home/bk/b31076-mysql-5.1-release
2007-09-20 16:38:36 +02:00
mats@kindahl-laptop.dnsalias.net
c5622b424f BUG#31076 (Server crashes when start slave is issued):
Row-based replication crashes when replicating from pre-5.1.22 to 5.1.22
due to an uninitialized variable.
2007-09-20 16:31:05 +02:00
gluh@eagle.(none)
7dbcdf9a64 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-09-20 16:28:46 +05:00
gluh@mysql.com/eagle.(none)
eef0772b89 result fix 2007-09-20 16:27:58 +05:00
gluh@eagle.(none)
2a02dd13e2 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-09-20 14:40:24 +05:00