Commit graph

50333 commits

Author SHA1 Message Date
tsmith@ramayana.hindu.god
37cbd6f7b4 Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-09-28 10:55:28 -06:00
tsmith@ramayana.hindu.god
5a1284ccb2 Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-09-28 10:54:49 -06: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
istruewing@stella.local
358fedc307 Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into  stella.local:/home2/mydev/mysql-5.1-axmrg
2007-09-28 15:13:10 +02:00
anozdrin/alik@station.
e452c06438 Prerequisite patch for BUG#30472: libmysql doesn't reset charset,
insert_id after succ. mysql_change_user() call.

Supply a correct packet length to dispatch command.
2007-09-28 15:42:37 +04:00
istruewing@stella.local
32fb502bd7 Merge stella.local:/home2/mydev/mysql-5.1-amain
into  stella.local:/home2/mydev/mysql-5.1-axmrg
2007-09-28 09:54:21 +02:00
istruewing@stella.local
4e615503d2 Merge stella.local:/home2/mydev/mysql-4.1-axmrg
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-09-28 09:13:50 +02:00
istruewing@stella.local
74ce2d1304 Merge stella.local:/home2/mydev/mysql-5.0-amain
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-09-28 09:13:21 +02:00
istruewing@stella.local
ab95dad7a4 Merge stella.local:/home2/mydev/mysql-4.1-amain
into  stella.local:/home2/mydev/mysql-4.1-axmrg
2007-09-28 08:43:24 +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
msvensson@pilot.(none)
2a1e556081 Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-09-27 08:49:23 +02:00
msvensson@pilot.(none)
e21bb2640a Move DBUG_ENTER to begining of function to avoid build failure with debug on windows 2007-09-27 08:48:39 +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
msvensson@pilot.(none)
c22a4a71f6 Update result file(s) for 5.1 2007-09-26 17:28:20 +02:00
msvensson@pilot.(none)
e068e99cd0 Bug#31167 Introduction of @@hostname breaks replication in a ring
- Use a local uservariable to avoid @@hostname in binlog
2007-09-26 17:04:41 +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
tsmith@sita.local
ec39c6d6e4 Merge sita.local:/Users/tsmith/m/bk/maint/50
into  sita.local:/Users/tsmith/m/bk/maint/51
2007-09-24 13:31:39 +02:00
tsmith@sita.local
a3c5169d0d Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sita.local:/Users/tsmith/m/bk/maint/50
2007-09-24 13:22:39 +02:00
msvensson@shellback.(none)
d07a83eadf Add test for named pipes on windows
Improve test for  shm on windows
2007-09-24 12:42:44 +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
tsmith@sita.local
7f66198af3 Merge sita.local:/Users/tsmith/m/bk/maint/50
into  sita.local:/Users/tsmith/m/bk/maint/51
2007-09-24 11:41:29 +02:00
tsmith@sita.local
2571ddb7d5 Merge sita.local:/Users/tsmith/m/bk/51
into  sita.local:/Users/tsmith/m/bk/maint/51
2007-09-24 11:37:26 +02:00
tsmith@sita.local
5aba321046 Merge sita.local:/Users/tsmith/m/bk/50
into  sita.local:/Users/tsmith/m/bk/maint/50
2007-09-24 11:33: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
msvensson@shellback.(none)
417e1059cf Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into  shellback.(none):/home/msvensson/mysql/my51-bug30843
2007-09-22 12:19:49 +02:00
msvensson@shellback.(none)
d8fd59a423 Bug#30843 Bad Test addition to t/archive.test 2007-09-22 12:17:14 +02:00
msvensson@shellback.(none)
6f086e56b8 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into  shellback.(none):/home/msvensson/mysql/my51-bug30843
2007-09-22 09:51:54 +02:00
msvensson@shellback.(none)
eb0a290bbd Merge bk-internal:/home/bk/mysql-5.1-maint
into  shellback.(none):/home/msvensson/mysql/my51-bug30843
2007-09-22 09:45:38 +02:00
iggy@alf.(none)
b6708a9757 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  alf.(none):/src/bug15327/my50-bug15327
2007-09-22 03:11:12 -04:00
iggy@alf.(none)
ac026cfeb6 Bug #15327: configure: --with-tcp-port option being partially ignored
make sure that if builder configured with a non-standard (!= 3306)
default TCP port that value actually gets used throughout.
2007-09-21 12:05:54 -04:00
msvensson@shellback.(none)
ed055965bf - Increase default connect_timeout to avoid intermittent
disconnects when test servers are put under load
2007-09-21 17:52:02 +02:00