gkodinov/kgeorge@magare.gmz
7fe932ed82
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B33256-5.0-opt
2008-01-07 18:55:05 +02:00
hezx@mail.hezx.com
87abfe06e3
Replace one overlooked return with DBUG_RETURN in function log_loaded_block
2008-01-06 20:16:28 +08:00
hezx@mail.hezx.com
e2676d0f1c
Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/5.0
...
into mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/mysql-5.0-rpl
2008-01-06 15:39:46 +08:00
hezx@mail.hezx.com
5a5672d630
Fixed some test case after push of BUG#32205
2008-01-06 15:27:42 +08:00
hezx@mail.hezx.com
44a318efd5
Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#28908/5.0
...
into mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/mysql-5.0-rpl
2008-01-06 15:18:45 +08:00
hezx@mail.hezx.com
287b981c87
Add missing include test file for rpl_server_id test
2008-01-06 15:17:47 +08:00
hezx@mail.hezx.com
987b67cd01
Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/5.0
...
into mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/mysql-5.0-rpl
2008-01-06 13:20:52 +08:00
tsmith@ramayana.hindu.god
68980477dd
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2008-01-04 19:59:37 -07:00
tsmith@ramayana.hindu.god
e122756433
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2008-01-04 19:59:01 -07:00
thek@adventure.(none)
2a499f757d
Merge adventure.(none):/home/thek/Development/cpp/bug30887/my51-bug30887
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2008-01-03 15:37:54 +01:00
thek@adventure.(none)
96146a392f
Bug#30887 Server crashes on SET GLOBAL query_cache_size=0
...
Reseting the query cache by issuing a SET GLOBAL query_cache_size=0 caused the server
to crash if a the server concurrently was saving a new result set to the query cache. The
reason for this was that the invalidation wasn't waiting on the result writers to
release the block level locks on the query cache.
2008-01-03 15:36:48 +01:00
sven@riska.(none)
72676b226b
Merge ssandberg@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into riska.(none):/home/sven/bk/b26395-autocommit-xa/5.0-rpl
2008-01-02 14:23:14 +01:00
sven@riska.(none)
31a6b8f4dc
Merge ssandberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into riska.(none):/home/sven/bk/b26395-autocommit-xa/5.1-new-rpl
2008-01-02 14:12:05 +01:00
skozlov/ksm@mysql.com/virtop.localdomain
5c55bb7283
WL#4077 added support old versions of mysqld binaries
2007-12-31 17:30:17 +03:00
skozlov/ksm@mysql.com/virtop.localdomain
04ee08b9fe
WL#4077, added mask for SHOW DATABASES statement
2007-12-25 22:10:22 +03:00
kaa@polly.(none)
578b3632cc
Fix for bug #33305 : Test case in 'skip_grants' file need dynamic loading
...
to be compiled in
The problem was that on a statically built server an attempt to create
a UDF resulted in a different, but reasonable error ("Can't open shared
library" instead of "UDFs are unavailable with the --skip-grant-tables
option"), which caused a failure for the test case for bug #32020 .
Fixed by moving the test case for bug #32020 from skip_grants.test to a
separate test to ensure that it is only run when the server is built
with support for dynamically loaded libraries.
2007-12-24 17:42:13 +03:00
hezx@mail.hezx.com
162c347ad9
Remove test rpl_drop_view from main suite
2007-12-24 15:04:22 +08:00
hezx@mail.hezx.com
aa36cb781b
Move test rpl_server_id to suite rpl
2007-12-24 15:03:23 +08:00
hezx@mail.hezx.com
6cab71d3fa
Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#28908/5.0
...
into mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#28908/5.1
2007-12-24 14:55:59 +08:00
hezx@mail.hezx.com
d501c40629
Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#28908/5.0
...
into mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#28908/mysql-5.0-rpl
2007-12-24 11:08:39 +08:00
aelkin/elkin@koti.dsl.inet.fi
c5b597bc89
bug#30435
...
changes due to non-determinism in value of read_buffer_size.
2007-12-23 11:18:46 +02:00
aelkin/elkin@koti.dsl.inet.fi
d8100934a5
bug#30435
...
refining the test after it failed on pb.
2007-12-22 19:59:47 +02:00
aelkin/elkin@koti.dsl.inet.fi
7801f29041
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug33435-load_data_read_buffer_size
2007-12-21 22:37:10 +02:00
aelkin/elkin@koti.dsl.inet.fi
0ca3250e59
BUG#30435 loading large LOAD DATA INFILE breaks slave with
...
read_buffer_size set on master
BUG#33413 show binlog events fails if binlog has event size of close
to max_allowed_packet
The size of Append_block replication event was determined solely by
read_buffer_size whereas the rest of replication code deals with
max_allowed_packet.
When the former parameter was set to larger than the latter there were
two artifacts: the master could not read events from binlog;
show master events did not show.
Fixed with
- fragmenting the used io-cached buffer into pieces each size of less
than max_allowed_packet (bug#30435)
- incrementing show-binlog-events handling thread's max_allowed_packet
with the max estimated for the replication header size
2007-12-21 22:34:43 +02:00
sven@riska.(none)
2d343e75dc
Undo previous merge.
2007-12-21 21:30:20 +01:00
sven@riska.(none)
e0b7658653
Merge riska.(none):/home/sven/bk/b26395-autocommit-xa/5.0-rpl
...
into riska.(none):/home/sven/bk/b26395-autocommit-xa/5.1-new-rpl
Should really not be merged, will undo later
2007-12-21 21:15:03 +01:00
sven@riska.(none)
25d53f907c
BUG#26395: if crash during autocommit update to transactional table on master, slave fails
...
Now, every transaction (including autocommit transactions) start with
a BEGIN and end with a COMMIT/ROLLBACK in the binlog.
Added a test case, and updated lots of test case result files.
2007-12-21 20:30:23 +01:00
mhansson/martin@linux-st28.site
8b65423d9d
Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
...
into linux-st28.site:/home/martin/mysql/src/bug32848/my51-bug32848
2007-12-21 14:52:39 +01:00
aelkin/elkin@koti.dsl.inet.fi
3624851643
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug31359-future_gpos
2007-12-21 15:44:06 +02:00
joerg@trift2.
a0fbcc0326
Merge trift2.:/MySQL/M50/merge-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-12-21 13:13:22 +01:00
joerg@trift2.
9f96125023
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-12-21 12:53:05 +01:00
joerg@trift2.
bf1ba3d416
Merge trift2.:/MySQL/M50/clone-5.0
...
into trift2.:/MySQL/M50/merge-5.0
2007-12-21 12:48:14 +01:00
sven@riska.(none)
a431962d32
fixed broken result file
2007-12-21 12:22:09 +01:00
serg@janus.mylan
bf95cf1604
Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-12-21 12:02:49 +01:00
gkodinov/kgeorge@macbook.gmz
e4efb4a521
Bug #33256 : CREATE ... SELECT creates obsolete table
...
w/ Field_date instead of Field_newdate
Field_date was still used in temp table creation.
Fixed by using Field_newdate consistently throughout the server
except when reading tables defined with older MySQL version.
No test suite is possible because both Field_date and Field_newdate
return the same values in all the metadata calls.
2007-12-21 12:44:24 +02:00
serg@janus.mylan
baf53c8524
cast corrected
2007-12-21 11:28:34 +01:00
serg@janus.mylan
f8afc538fe
Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-12-21 10:59:14 +01:00
hezx@mail.hezx.com
2b4bc3e93c
Merge mail.hezx.com:/media/sda3/work/mysql/bkroot/mysql-5.0-rpl
...
into mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#28908/5.0
2007-12-21 17:52:25 +08:00
serg@janus.mylan
97754ffae7
warning on windows
2007-12-21 10:31:47 +01:00
df@pippilotta.erinye.com
bea1bfd5c7
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-12-21 09:44:08 +01:00
df@pippilotta.erinye.com
f25c6ffaee
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-33288-33057
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-12-21 09:40:53 +01:00
aelkin/elkin@koti.dsl.inet.fi
1032038579
Bug #31359 change_master sets group_master_log_pos twice,
...
ignores future_group_master_log_p
There was a redundant assignement. However, that's the only artifact.
Wrt to future_group_master_log_position, there is no issue.
The counter is supposed to be set at Log_event::exec_event().
It's used only by Innodb for recovery purposes.
2007-12-21 10:13:54 +02:00
mats@capulet.kindahl.net
1666ecf070
Merge capulet.kindahl.net:/home/mats/devel/b12691-mysql-5.0-rpl
...
into capulet.kindahl.net:/home/mats/devel/fix-mysql-5.0-rpl
2007-12-21 07:52:07 +01:00
hezx@mail.hezx.com
329d1a7bf7
BUG#28908 Replication: set global server_id is not setting the session server_id
...
When set the server-id dynamically, the server_id member of current thread is not updated.
Update the server_id member of current thread after updated the global variable value.
2007-12-21 11:02:48 +08:00
serg@janus.mylan
d745738628
merged
2007-12-21 00:02:00 +01:00
serg@janus.mylan
b9785bbcc0
variables.result, variables.test:
...
test case fixed
2007-12-21 00:01:07 +01:00
serg@janus.mylan
7b6e89ee39
after merge fix in mysqld.cc:
...
added missing status variables (assert works! :)
2007-12-21 00:00:28 +01:00
serg@janus.mylan
09012c2f5c
my_atomic-t.c:
...
gcc bug workaround
2007-12-20 23:58:09 +01:00
serg@janus.mylan
d9ca7b670e
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-12-20 22:11:37 +01:00
sven@riska.(none)
af01eb1a14
Merge ssandberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into riska.(none):/home/sven/bkroot/5.1-new-rpl
2007-12-20 22:08:02 +01:00