kaa@polly.local
80f839a36e
Merge polly.local:/home/kaa/src/maint/bug28895/my50-bug28895
...
into polly.local:/home/kaa/src/maint/bug28895/my51-bug28895
2007-06-12 09:42:19 +04:00
kaa@polly.local
0f5a1e5910
Fix for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long"
...
In create_tmp_table() don't set full table path as a table name. Other code assumes table names to not exceed NAME_LEN bytes.
2007-06-11 23:06:20 +04:00
msvensson@pilot.(none)
7c15ac32b0
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-01 15:43:47 +02:00
msvensson@pilot.(none)
583a126660
Merge pilot.(none):/data/msvensson/mysql/bug28373/my50-bug28373
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-01 15:43:04 +02:00
msvensson@pilot.(none)
146e087186
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-01 14:53:58 +02:00
msvensson@pilot.(none)
721d25f8ab
Merge pilot.(none):/data/msvensson/mysql/bug28497/my51-bug28497
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-01 14:49:21 +02:00
msvensson@pilot.(none)
8ed65b97e1
Merge pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-01 14:35:47 +02:00
msvensson@pilot.(none)
aede6302af
Fiux syntax errors in grant.test, connect command with both -- and ;
...
only one of those is allowed
2007-06-01 14:12:16 +02:00
msvensson@pilot.(none)
1b6d413a2f
Merge pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497
...
into pilot.(none):/data/msvensson/mysql/bug28497/my51-bug28497
2007-06-01 13:50:59 +02:00
msvensson@pilot.(none)
fd1c544384
Add missing semicolon after connect command
2007-06-01 13:39:54 +02:00
msvensson@pilot.(none)
62f71f5d7a
Merge pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497
...
into pilot.(none):/data/msvensson/mysql/bug28497/my51-bug28497
2007-06-01 12:38:54 +02:00
msvensson@pilot.(none)
91170035d9
Turn query_logging back on to avoid sideeffects in folloing test section
2007-06-01 12:38:41 +02:00
msvensson@pilot.(none)
d43153f274
Merge pilot.(none):/data/msvensson/mysql/bug28497/my41-bug28497-query_get_value
...
into pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497
2007-06-01 12:04:05 +02:00
msvensson@pilot.(none)
09c5c03cb2
Bug#28497 wait_for_slave_to_stop can cause random replication mysql-test failures
...
- Add funtion "query_get_value to allow reading a fields value
into a $variable
2007-06-01 12:01:42 +02:00
msvensson@pilot.(none)
42deaca611
Bug#28373 mysqltest test case fails with binlog disabled
...
- Update tests to be independent how the mysqld was started
2007-05-31 15:58:22 +02:00
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
054da00167
Merge polly.local:/home/kaa/src/maint/bug27643/my50-bug27643
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-05-31 15:01:49 +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
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
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@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
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
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
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
ramil/ram@ramil.myoffice.izhnet.ru
b49abf428c
Merge mysql.com:/home/ram/work/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b26842/b26842.5.0
2007-05-25 11:13:32 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
a311b3fefd
Merge mysql.com:/home/ram/work/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b26842/b26842.5.1
2007-05-25 11:11:15 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
1af7eea565
after-merge fix
2007-05-25 10:13:27 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
6369ff54b7
Merge mysql.com:/home/ram/work/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b28464.new/b28464.new.5.0
2007-05-24 20:21:04 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
e2d216450a
Merge mysql.com:/home/ram/work/b28464.new/b28464.new.5.0
...
into mysql.com:/home/ram/work/b28464.new/b28464.new.5.1
2007-05-24 18:42:38 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
2c759bd45f
Fix for
...
bug #26842 : master binary log contains invalid queries - replication fails
bug #12826 : Possible to get inconsistent slave using SQL syntax Prepared Statements
Problem:
binlogging PS' we may produce syntacticly incorrect queries in the binlog replacing
some parameters with variable names (instead of variable values).
E.g. in the reported case of "limit ?" clause: replacing "?" with "@var"
produces "limit @var" which is not a correct SQL syntax.
Also it may lead to different query execution on slave if we
set and use a variable in the same statement, e.g.
"insert into t1 values (@x:=@x+1, ?)"
Fix: make the stored statement string created upon its execution use variable values
(instead of names) to fill placeholders.
2007-05-24 15:35:43 +05:00
msvensson@pilot.blaudden
7327f42060
Merge pilot.blaudden:/home/msvensson/mysql/bug28521/my51-bug28521
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-05-24 12:31:48 +02:00
msvensson@pilot.blaudden
cca2c53113
Merge pilot.blaudden:/home/msvensson/mysql/bug27438/my51-bug27438
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-05-24 12:05:04 +02:00
msvensson@pilot.blaudden
a99fe7f3d6
Merge pilot.blaudden:/home/msvensson/mysql/bug27438/my50-bug27438
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-05-24 12:04:03 +02:00
msvensson@pilot.blaudden
4698a61ec4
Merge pilot.blaudden:/home/msvensson/mysql/bug27438/my50-bug27438
...
into pilot.blaudden:/home/msvensson/mysql/bug27438/my51-bug27438
2007-05-24 12:03:55 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
1f9b403b45
Merge mysql.com:/home/ram/work/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b28509/b28509.5.0
2007-05-23 13:48:31 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
3d940b1478
Merge mysql.com:/home/ram/work/b28509/b28509.5.0
...
into mysql.com:/home/ram/work/b28509/b28509.5.1
2007-05-23 13:47:34 +05:00
svoj@june.mysql.com
442969fd16
Merge mysql.com:/home/svoj/devel/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-05-23 12:41:30 +05:00
svoj@mysql.com/june.mysql.com
122167bb4b
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2007-05-23 12:39:33 +05:00
tomas@whalegate.ndb.mysql.com
a4934466c0
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-22 23:21:32 +02:00
tsmith@quadxeon.mysql.com
672237f5b5
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-21 20:51:31 +02:00
tsmith@quadxeon.mysql.com
99488b31b9
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-05-21 20:50:08 +02:00
tsmith@quadxeon.mysql.com
2c3bebc570
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
2007-05-21 20:49:24 +02:00
svoj@mysql.com/june.mysql.com
fbb5c31aa9
BUG#25659 - memory leak via "plugins" test
...
- Added suppressions for dlopen to make plugin test pass.
- Do not pass empty string to mysqld, since my_getopt is
not capable to handle it.
- Re-enabled trailing UNINSTALL PLUGIN statement of plugin.test.
The memory leak described in the bug report happens in libdl, not
in mysqld. On some valgrind installations this error is suppressed
by default, no idea why it isn't suppressed on pb-valgrind.
<observation>
If library remains open after thread has finished, and is closed by
another thread, we get memory leak. But in case library is opened and
closed by the same thread no leak occurs.
</observation>
2007-05-21 17:48:29 +05:00