kaa@polly.local
ca25403ca1
Merge polly.local:/home/kaa/src/maint/bug27643/my51-bug27643
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-05-31 16:07:17 +04:00
kaa@polly.local
7d2d483615
Corrected the error codes and messages for 5.1. This is to fix PB failures introduced by the patch for bug #27643 .
2007-05-31 16:04:58 +04:00
kaa@polly.local
1239481b13
Merge polly.local:/home/kaa/src/maint/bug27643/my51-bug27643
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-05-31 15:05:11 +04:00
kaa@polly.local
16f7290359
Merge polly.local:/home/kaa/src/maint/bug27643/my50-bug27643
...
into polly.local:/home/kaa/src/maint/bug27643/my51-bug27643
2007-05-31 14:58:22 +04:00
kaa@polly.local
d435b3ed74
Fix for bug #27643 "query failed : 1114 (The table '' is full)
...
Problem:
HASH indexes on VARCHAR columns with binary collations did not ignore trailing spaces from strings before comparisons. This could result in duplicate records being successfully inserted into a MEMORY table with unique key constraints.
As a direct consequence of the above, internal MEMORY tables used for GROUP BY calculation in testcases for bug #27643 contained duplicate rows which resulted in duplicate key errors when converting those temporary tables to MyISAM. Additionally, that error was incorrectly converted to the 'table is full' error.
Solution:
- ignore trailing spaces in VARCHAR fields with binary collations when calculating hashes.
- return a proper error from create_myisam_from_heap() when conversion fails.
2007-05-31 14:54:44 +04:00
kaa@polly.local
f1029f99af
Merge polly.local:/home/kaa/src/maint/bug28121/my51-bug28121
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-05-31 12:51:02 +04:00
kaa@polly.local
ab37c16a5a
Merge polly.local:/home/kaa/src/maint/bug28121/my50-bug28121
...
into polly.local:/home/kaa/src/maint/bug28121/my51-bug28121
2007-05-31 12:21:21 +04:00
tsmith@quadxeon.mysql.com
c57839166c
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-31 01:02:56 +02:00
tsmith@quadxeon.mysql.com
298e5002e3
mysqldump.c:
...
Fix harmless typo (caught thanks to warning)
2007-05-31 00:40:56 +02:00
tsmith@quadxeon.mysql.com
e97729a38f
mysqldump.c:
...
Fix harmless typo (caught thanks to warning)
2007-05-31 00:37:41 +02:00
tsmith@quadxeon.mysql.com
c1c60a17dc
Merge tsmith.mysql.internal:m/bk/maint/b4858/51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-31 00:29:02 +02:00
tsmith@quadxeon.mysql.com
91c484339c
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-30 23:48:20 +02:00
tsmith@quadxeon.mysql.com
64f582396b
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-05-30 23:46:21 +02:00
dkatz@damien-katzs-computer.local
6490419bb6
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
...
into damien-katzs-computer.local:/Users/dkatz/mysql51
2007-05-30 16:45:54 -04:00
dkatz@damien-katzs-computer.local
1ac607be32
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
...
into damien-katzs-computer.local:/Users/dkatz/50_dump
2007-05-30 16:42:18 -04:00
kaa@polly.local
d30872b4b2
Got rid of log_01[], because we don't really need it. Division and log_10[] can always be used instead, which is also a more precise way.
...
This is for bug #28121 .
2007-05-30 22:47:52 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
b0692ac99c
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b28436/b28436.5.1
2007-05-30 17:13:59 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
c98fa25956
Fix for bug #28436 : Incorrect position in SHOW BINLOG EVENTS causes server coredump
...
Problem: there is an ASSERT() in the Log_event::read_log_event() checking the integrity
of the event's data that may fail.
Fix: move the assert's condition to an explicit check.
2007-05-30 15:23:47 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
6f480c78cd
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b28631/b28631.5.1
2007-05-30 08:24:47 +05:00
kaa@polly.local
985d5e90df
Merge polly.local:/home/kaa/src/maint/bug24611/my51-bug24611
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-05-29 17:21:04 +04:00
kaa@polly.local
cc5d3d2e5b
Merge polly.local:/home/kaa/src/maint/bug24611/my50-bug24611
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-05-29 17:16:23 +04:00
kaa@polly.local
76c21eaecd
Merge polly.local:/home/kaa/src/maint/bug24611/my50-bug24611
...
into polly.local:/home/kaa/src/maint/bug24611/my51-bug24611
2007-05-29 17:11:03 +04:00
kaa@polly.local
cb0fe82363
Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-05-29 16:47:17 +04:00
kaa@polly.local
27cea11c29
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-05-29 16:44:16 +04:00
kaa@polly.local
bf8a4f1288
Merge polly.local:/home/kaa/src/maint/mysql-5.0-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-05-29 16:38:43 +04:00
kaa@polly.local
a7abb1d332
Moved size_of() from Field_double to Field_real in order to properly clone Field_float and Field_double. This is to fix PushBuild failures introduced by the patch for bug #28121 .
2007-05-29 16:35:55 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
4f68dd9d78
Fix for bug #28631 : Bit index creation failure after alter
...
Problem: altering a bit field we use Field::is_equal() to check if the bit
field is changed. Comparing the field type is not enough for bit fields.
Fix: add proper Field_bit::is_equal() that compares the field lengths as well.
2007-05-29 16:24:12 +05:00
msvensson@pilot.(none)
0946010521
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-05-29 13:02:20 +02:00
msvensson@pilot.(none)
c7ee7b33ce
Merge pilot.(none):/data/msvensson/mysql/bug26397/my41-bug26397
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-05-29 13:01:23 +02:00
msvensson@pilot.(none)
7d7a17df28
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-05-29 12:54:36 +02:00
msvensson@pilot.(none)
dec1657ac2
Merge pilot.(none):/data/msvensson/mysql/bug27597/my51-bug27597
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-05-29 12:54:02 +02:00
msvensson@pilot.(none)
17e575ce96
Merge pilot.(none):/data/msvensson/mysql/bug27597/my50-bug27597
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-05-29 12:53:23 +02:00
msvensson@pilot.(none)
5ceeb93291
Merge pilot.(none):/data/msvensson/mysql/bug27597/my50-bug27597
...
into pilot.(none):/data/msvensson/mysql/bug27597/my51-bug27597
2007-05-29 12:53:03 +02:00
kaa@polly.local
8a9fd5995e
Merge polly.local:/home/kaa/src/maint/mysql-5.0-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-05-28 21:46:03 +04:00
kaa@polly.local
0dc78d3913
Don't use log_01[] in my_strtod() to avoid loss of precision.
...
This is for bug #28121 .
2007-05-28 21:43:31 +04:00
msvensson@pilot.(none)
c6dc58337c
Bug #26397 mysql-test-run.pl --start-dirty removes binary logs
...
- Don't delete anything if starting dirty
2007-05-28 18:03:24 +02:00
kaa@polly.local
da4dd3c353
Merge polly.local:/home/kaa/src/maint/mysql-5.0-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-05-28 15:36:19 +04:00
kaa@polly.local
afc59d3381
Some Windows-related fixes to make Microsoft compilers happy. This is for bug #28128 .
2007-05-28 15:33:22 +04:00
kaa@polly.local
84c81bd534
Merge polly.local:/home/kaa/src/maint/bug28121/my50-bug28121
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-05-28 14:34:36 +04:00
kaa@polly.local
57917510e5
Merge polly.local:/home/kaa/src/maint/bug28121/my51-bug28121
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-05-28 14:30:28 +04:00
kaa@polly.local
c53168b9bd
Changed the warning messages in the testcase to match 5.1 text.
...
This is for bug #28121 .
2007-05-28 14:22:21 +04:00
kaa@polly.local
d6e66b6434
Merge polly.local:/home/kaa/src/maint/bug28121/my50-bug28121
...
into polly.local:/home/kaa/src/maint/bug28121/my51-bug28121
2007-05-28 12:52:05 +04:00
kaa@polly.local
8ac1ffdf1d
Fix for bug #28121 "INSERT or UPDATE into DOUBLE(200,0) field being truncated to 31 digits"
...
When storing a large number to a FLOAT or DOUBLE field with fixed length, it could be incorrectly truncated if the field's length was greater than 31.
This patch also does some code cleanups to be able to reuse code which is common between Field_float::store() and Field_double::store().
2007-05-28 12:44:59 +04:00
dkatz@damien-katzs-computer.local
4a7cdfc05d
Bug #24733 RESET MASTER run before dump with --delete-master-logs
...
fixed by using flush logs, dumping, then doing PURGE MASTER LOGS TO 'binfile', instead
of deleting the log files at the beginning.
NOTE: previously the delete-master-logs would reset the log names back to
filename.00001. Now the trailing number doesn't get reset. This may need to be
documented.
2007-05-27 11:50:10 -04:00
kaa@polly.local
939609b611
Fix for bug #24611 "mysqld crashes when connecting from remote host, and compiled from source".
...
On some Linux distributions with both LinuxThreads and NPTL glibc versions available, statically built binaries can crash, because linker defaults to LinuxThreads when linking statically, but calls to external libraries (like libnss) are resolved to NPTL versions.
Since there is nothing we can do in the code to work that around, just give user an advice on how to fix that, if a crash happened on such a binary/OS combination.
2007-05-25 20:52:01 +04:00
msvensson@pilot.blaudden
4ac551f499
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-05-25 16:48:23 +02:00
msvensson@pilot.blaudden
e50116e99e
Bug#26664 test suite times out on OS X 64bit
...
- Add checks to make sure net has a vio assigned
- For example bootstrap will create a fake "net" with vio
set to 0
2007-05-25 16:47:43 +02:00
msvensson@pilot.blaudden
792f6e349d
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-05-25 16:43:51 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
61dd2f61be
Test for bug #26842 moved to a separate file as it uses 'show binlog events' and fails with --binlog-format=row.
2007-05-25 17:24:45 +05:00
msvensson@pilot.blaudden
8eae98225c
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-05-25 11:41:10 +02:00