tsmith@ramayana.hindu.god
b606ad3888
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-10-09 10:59:53 -06:00
tsmith@sita.local
d1c559d8a0
Merge sita.local:/Users/tsmith/m/bk/maint/50
...
into sita.local:/Users/tsmith/m/bk/maint/51
2007-10-04 13:51:27 -06:00
tnurnberg@sin.intern.azundris.com
8402823d41
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into sin.intern.azundris.com:/home/tnurnberg/30444/51-30444
2007-10-04 19:06:27 +02:00
tnurnberg@sin.intern.azundris.com
567ceed59d
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into sin.intern.azundris.com:/home/tnurnberg/30444/50-30444
2007-10-04 19:02:31 +02:00
kaa@polly.(none)
8121b06a8f
Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-maint
...
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-10-04 13:52:41 +04:00
kaa@polly.(none)
605f0b05a8
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-04 13:45:45 +04:00
kaa@polly.(none)
84659e2de1
Merge polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-04 13:38:58 +04:00
kaa@polly.(none)
bd885daa4f
Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
...
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-10-04 13:29:37 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
9d0318a22c
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b31070/b31070.5.0
2007-10-04 14:14:11 +05:00
kaa@polly.(none)
8f204ea029
Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
...
into polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731
2007-10-04 13:07:11 +04:00
kaa@polly.(none)
1ba3f4f56b
Issue a warning if a user sets an option or a variable to a value that is greater than a defined maximum for the option/variable.
...
This is for bug #29446 "Specifying a myisam_sort_buffer > 4GB on 64 bit machines not possible". Support for myisam_sort_buffer_size > 4 GB on 64-bit Windows will be looked at later in 5.2.
2007-10-04 12:34:00 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
b5347808ed
Merge mysql.com:/home/ram/work/b31070/b31070.5.0
...
into mysql.com:/home/ram/work/b31070/b31070.5.1
2007-10-04 12:10:15 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
6e6727d244
merging: results adjusted
2007-10-04 12:09:22 +05:00
tnurnberg@sin.intern.azundris.com
34d43d3b04
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into sin.intern.azundris.com:/home/tnurnberg/30444/51-30444
2007-10-04 08:53:39 +02:00
tnurnberg@sin.intern.azundris.com
c8a6f30a5b
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into sin.intern.azundris.com:/home/tnurnberg/30444/50-30444
2007-10-04 08:42:36 +02:00
tnurnberg@sin.intern.azundris.com
2686905392
Merge sin.intern.azundris.com:/home/tnurnberg/30444/50-30444
...
into sin.intern.azundris.com:/home/tnurnberg/30444/51-30444
2007-10-04 08:38:27 +02:00
tnurnberg@sin.intern.azundris.com
fee111cd29
Merge sin.intern.azundris.com:/home/tnurnberg/30444/41-30444
...
into sin.intern.azundris.com:/home/tnurnberg/30444/50-30444
2007-10-04 08:32:43 +02:00
tnurnberg@sin.intern.azundris.com
c623e73e8f
Bug #30444 : 5.0 mysqldump silently allows wrong backup to be taken against a 4.0 database
...
The combination of --single-transaction and --master-data requires
START TRANSACTION WITH CONSISTENT SNAPSHOT which is available from
mysqld 4.1 on. When trying this against an older server, print
diagnostic, then, if --force is not given, abort.
No test-case given since it would require a mysqld < 4.1.
2007-10-04 08:27:03 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
fa252fec68
Merge mysql.com:/home/ram/work/b31070/b31070.4.1
...
into mysql.com:/home/ram/work/b31070/b31070.5.0
2007-10-04 10:54:51 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
bc9b4834e1
Fix for bug #31069 : crash in 'sounds like'
...
and for bug #31070 : crash during conversion of charsets
Problem: passing a 0 byte length string to some my_mb_wc_XXX()
functions leads to server crash due to improper argument check.
Fix: properly check arguments passed to my_mb_wc_XXX() functions.
2007-10-04 10:20:00 +05:00
msvensson@pilot.mysql.com
2079d7619d
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
2007-10-03 13:44:37 +02:00
msvensson@pilot.mysql.com
81d65227ab
Merge pilot.mysql.com:/data/msvensson/mysql/bug31167/my50-bug31167
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
2007-10-03 11:49:59 +02:00
msvensson@pilot.mysql.com
0e9ca3e59d
Merge pilot.mysql.com:/data/msvensson/mysql/bug31167/my51-bug31167
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
2007-10-03 11:46:55 +02:00
msvensson@pilot.mysql.com
2f0e8a3fa3
Merge pilot.mysql.com:/data/msvensson/mysql/bug31167/my50-bug31167
...
into pilot.mysql.com:/data/msvensson/mysql/bug31167/my51-bug31167
2007-10-03 11:19:24 +02:00
tsmith@sita.local
0111438b45
Bug #20358 : InnoDB hang on the adaptive hash index latch in btr0sea.c
...
Add --skip-innodb-adaptive-hash-index option, which is a way to
work around the bug (by disabling the adaptive hash feature entirely).
This may be useful even once the bug is fixed, for benchmarking purposes.
There are some workloads for which the adaptive hash index is not effective.
2007-10-02 23:47:30 -06:00
msvensson@pilot.mysql.com
e4d7e21683
Bug#27597 mysqld-debug broken
...
- "on" -> "restore" to avoid warning in MSVC when compiling with debug
2007-10-02 20:44:37 +02:00
kaa@polly.(none)
c255faf279
Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-02 13:43:50 +04:00
kaa@polly.(none)
467a299840
Merge polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-02 13:39:00 +04:00
kaa@polly.(none)
80a2d47b22
Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
...
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-10-02 13:34:33 +04:00
kaa@polly.(none)
a097de5b7d
Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
...
into polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731
2007-10-02 13:12:44 +04:00
kaa@polly.(none)
b794e5f212
Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731_buffer_limits
...
into polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
2007-10-02 12:41:08 +04:00
kaa@polly.(none)
7c58ed48d0
Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
...
into polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731
2007-10-02 11:32:33 +04:00
kaa@polly.(none)
d8d3698b4a
Merge polly.(none):/home/kaa/src/maint/bug5731.old/my50-bug5731-read_buffer_size
...
into polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
2007-10-02 11:18:00 +04:00
kaa@polly.(none)
cfb88e652d
Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731_keycache
...
into polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
2007-10-02 11:14:19 +04:00
tsmith@ramayana.hindu.god
1be91eac96
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-09-28 10:57:45 -06:00
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
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
dfischer/mysqldev@mysql.com/production.mysql.com
6257abbc83
Raise version number after cloning 5.0.50
2007-09-26 19:15:42 +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
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
