tsmith/tim@siva.hindu.god
aeced431e3
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
...
into siva.hindu.god:/usr/home/tim/m/bk/51
2006-10-23 23:41:07 -06:00
stewart@willster.(none)
910e4d974c
BUG#20839 Illegal error code: 155 returned downgrading from 5.1.12-> 5.1.11
...
post-review fixups - magnus suggested creating dynstr_trunc instead of doing
it manually.
2006-10-20 22:47:28 +10:00
istruewing@chilla.local
5af9dfa6ba
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-merge
2006-10-19 10:15:08 +02:00
cmiller@zippy.cornsilk.net
184467a2cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-10-17 11:23:07 -04:00
Kristofer.Pettersson@naruto.
cda2a11330
Merge naruto.:C:/cpp/bug23010/my51-bug23010
...
into naruto.:C:/cpp/mysql-5.1-new-maint
2006-10-17 13:32:58 +02:00
Kristofer.Pettersson@naruto.
550c9e55f3
Merge naruto.:C:/cpp/bug23010/my50-bug23010
...
into naruto.:C:/cpp/mysql-5.0-maint
2006-10-17 10:53:53 +02:00
Kristofer.Pettersson@naruto.
44e01d4144
Merge naruto.:C:/cpp/bug23010/my50-bug23010
...
into naruto.:C:/cpp/bug23010/my51-bug23010
2006-10-17 10:37:55 +02:00
tsmith/tim@siva.hindu.god
285c14d3e7
Merge siva.hindu.god:/usr/home/tim/m/bk/b4053/51
...
into siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/51
2006-10-16 20:10:48 -06:00
tsmith/tim@siva.hindu.god
93d351f4c6
Merge siva.hindu.god:/usr/home/tim/m/bk/b4053/50
...
into siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/50
2006-10-16 20:03:43 -06:00
tsmith/tim@siva.hindu.god
43608c2583
Merge siva.hindu.god:/usr/home/tim/m/bk/b4053/41
...
into siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/41
2006-10-16 20:01:30 -06:00
dli@dev3-76.dev.cn.tlan
01c02f34a9
ndb - fixed for BUG#15021, binlog_index table become inconsistent if errors during purge of binlogs.
...
if EMFILE error occured while purging binary logs, stop purging logs and report error message to user.
2006-10-13 12:48:05 +08:00
kent@mysql.com/c-584072d5.010-2112-6f72651.cust.bredbandsbolaget.se
8a7413f704
thr_alarm.c, thr_lock.c, my_global.h:
...
Avoid multiple define of DBUG_OFF (bug#21749)
2006-10-12 19:43:47 +02:00
istruewing@chilla.local
35c94b6e2d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-bug8283
2006-10-11 17:57:47 +02:00
lars@black.(none)
0b4e65e12b
Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-10-10 21:59:23 +02:00
mats@romeo.(none)
0b6ff112b2
Fix to make it build on all platforms.
...
Replacing C++ code with C code in a C file.
2006-10-10 12:29:24 +02:00
istruewing@chilla.local
b15a23a79e
Merge chilla.local:/home/mydev/mysql-5.0-bug8283
...
into chilla.local:/home/mydev/mysql-5.1-bug8283
2006-10-09 22:24:55 +02:00
Kristofer.Pettersson@naruto.
3b316569a7
Bug#23010 _my_b_read() passing illegal file handles to my_seek()
...
- The io cache flag seek_not_done was not set properly in the reinit_
io_chache function call and this led my_seek to be called despite an
invalid file handle.
- Added a test in reinit_io_cache to ensure we have a valid file handle
before setting seek_not_done flag.
2006-10-09 21:13:37 +02:00
istruewing@chilla.local
c299de14ee
Merge chilla.local:/home/mydev/mysql-4.1-bug8283-one
...
into chilla.local:/home/mydev/mysql-5.0-bug8283
2006-10-09 20:03:12 +02:00
istruewing@chilla.local
1daa6a710d
Merge chilla.local:/home/mydev/mysql-4.1-bug8283
...
into chilla.local:/home/mydev/mysql-4.1-bug8283-one
2006-10-09 19:40:16 +02:00
istruewing@chilla.local
5f08a83186
Bug#8283 - OPTIMIZE TABLE causes data loss
...
OPTIMIZE TABLE with myisam_repair_threads > 1 performs a non-quick
parallel repair. This means that it does not only rebuild all
indexes, but also the data file.
Non-quick parallel repair works so that there is one thread per
index. The first of the threads rebuilds also the new data file.
The problem was that all threads shared the read io cache on the
old data file. If there were holes (deleted records) in the table,
the first thread skipped them, writing only contiguous, non-deleted
records to the new data file. Then it built the new index so that
its entries pointed to the correct record positions. But the other
threads didn't know the new record positions, but put the positions
from the old data file into the index.
The new design is so that there is a shared io cache which is filled
by the first thread (the data file writer) with the new contiguous
records and read by the other threads. Now they know the new record
positions.
Another problem was that for the parallel repair of compressed
tables a common bit_buff and rec_buff was used. I changed it so
that thread specific buffers are used for parallel repair.
A similar problem existed for checksum calculation. I made this
multi-thread safe too.
2006-10-09 19:26:55 +02:00
mats@romeo.(none)
d4d26ba7d5
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
...
into romeo.(none):/home/bk/b19459-mysql-5.1-new
2006-10-06 15:31:05 +02:00
mats@romeo.(none)
e762328b54
BUG#19459 (BINLOG RBR command does not lock tables correctly causing
...
crash for, e.g., NDB):
Before, mysqlbinlog printed table map events as a separate statement, so
when executing the event, the opened table was subsequently closed
when the statement ended. Instead, the row-based events that make up
a statement are now printed as *one* BINLOG statement, which means
that the table maps and the following *_rows_log_event events are
executed fully before the statement ends.
Changing implementation of BINLOG statement to be able to read the
emitted format, which now consists of several chunks of BASE64-encoded
data.
2006-10-06 10:17:02 +02:00
msvensson@neptunus.(none)
ca21b57992
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-03 09:28:44 +02:00
msvensson@shellback.(none)
3bed246481
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-03 01:01:06 +02:00
mats@romeo.(none)
d1b9686245
BUG#19459 (BINLOG RBR command does not lock tables correctly causing
...
crash for, e.g., NDB):
Adding new function my_b_copy_to_file() to copy an IO_CACHE to a file.
2006-10-02 15:08:40 +02:00
mats@romeo.(none)
7b85fb5c13
BUG#19459 (BINLOG RBR command does not lock tables correctly causing
...
crash for, e.g., NDB):
Submitting patch to base64_decode() adding extra parameter.
2006-10-02 15:05:05 +02:00
svoj@april.(none)
115c4fe8dc
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2006-10-02 15:11:08 +05:00
svoj@mysql.com/april.(none)
361c46eefe
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-10-02 14:52:09 +05:00
svoj@mysql.com/april.(none)
7afbe5f86e
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
2006-10-02 14:42:12 +05:00
tsmith/tim@siva.hindu.god
44f0e55ca4
Merge siva.hindu.god:/usr/home/tim/m/bk/50
...
into siva.hindu.god:/usr/home/tim/m/bk/mrg/51
2006-09-29 18:04:34 -06:00
cmiller@zippy.cornsilk.net
5275e2437a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-29 16:24:21 -04:00
jimw@rama.(none)
c8801bcecc
Merge rama.(none):/home/jimw/my/mysql-5.0-clean
...
into rama.(none):/home/jimw/my/mysql-5.1-clean
2006-09-28 18:00:26 -07:00
svoj@april.(none)
7ed413d17b
Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.1-engines
2006-09-29 00:23:43 +05:00
svoj@mysql.com/april.(none)
ad7da7f1de
Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines
2006-09-29 00:00:27 +05:00
svoj@mysql.com/april.(none)
b271d7653b
BUG#21617 - crash when selecting from merge table with inconsistent indexes
...
Crash may happen when selecting from a merge table that has underlying
tables with less indexes than in a merge table itself.
If number of keys in merge table is not bigger than requested key number,
return error.
2006-09-28 22:10:06 +05:00
gkodinov/kgeorge@macbook.gmz
a01e7b12ce
Merge macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.0-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.1-opt
2006-09-27 13:03:41 +03:00
holyfoot/hf@mysql.com/deer.(none)
f8eeebbc4c
Merge mysql.com:/home/hf/work/mysql-4.1.15428
...
into mysql.com:/home/hf/work/mysql-5.0-mrg
2006-09-25 16:44:53 +05:00
tsmith/tim@siva.hindu.god
da3e328ebf
Remove unused (and incorrect) my_lread() and my_lwrite()
2006-09-14 23:29:44 -06:00
tsmith/tim@siva.hindu.god
d2e030cae3
Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/50
...
into siva.hindu.god:/usr/home/tim/m/bk/tmp/51
2006-09-14 23:23:48 -06:00
tsmith/tim@siva.hindu.god
fb6625e495
Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/41
...
into siva.hindu.god:/usr/home/tim/m/bk/tmp/50
2006-09-14 23:22:25 -06:00
tsmith/tim@siva.hindu.god
43e8890abc
Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/40
...
into siva.hindu.god:/usr/home/tim/m/bk/tmp/41
2006-09-14 23:20:13 -06:00
tsmith/tim@siva.hindu.god
7b9f4086fa
Bug #4053 : too many of "error 1236: 'binlog truncated in the middle of event' from master"
...
- Fix my_read/my_write to handle return values from read/write correctly
- Add debugging 'deprecated function' warning to my_lread/my_lwrite
- Add debugging 'error, read/write interrupt not handled' warning to my_quick_read/my_quick_write
There is no test case associated with these changes. However, this is a conservative change,
and no repeatable test case is available.
2006-09-14 23:19:24 -06:00
tsmith/tim@siva.hindu.god
5ec2bfe94c
Bug #4053 : too many of "error 1236: 'binlog truncated in the middle of event' from master"
...
- Detect read failure in my_read_charset_file
2006-09-14 21:06:14 -06:00
jimw@rama.(none)
ce0846b862
Bug #18246 : compilation error with tcp_wrapper
...
Fix the functions in my_libwrap.c to return the results of the
underlying call to libwrap.
2006-09-11 16:23:45 -07:00
holyfoot/hf@mysql.com/deer.(none)
c32f62bebb
bug #12620 (UTF-8 indexing causes ER_NO_KEYFILE error)
...
The problem is that on some Mac OS X-es the file writing/reading
call with zero bytes to read/write returns error.
So here i try to eliminate that kinds of calls.
2006-09-04 19:47:24 +05:00
grichter@bk-internal.mysql.com
6993e3a3f7
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-cmake
2006-09-02 11:03:16 +02:00
georg@lmy002.wdf.sap.corp
5686da41ac
Fixes for crashes and test failures
2006-09-01 14:34:37 +02:00
georg@lmy002.wdf.sap.corp
9d6471c33e
make dist changes for Cmake build
2006-09-01 10:32:12 +02:00
georg@lmy002.wdf.sap.corp
27636d9303
Additional files for cmake support
2006-08-31 19:52:42 +02:00
cmiller@zippy.cornsilk.net
9c94dade04
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-08-31 12:45:49 -04:00