holyfoot/hf@mysql.com/hfmain.(none)
fbbd4391d9
Bug #32801 wait_timeout.test fails randomly
...
wait_timeout test enabled
2008-03-03 12:16:43 +04:00
skozlov/ksm@mysql.com/virtop.(none)
5aa9cd33c4
Bug#22438
2008-03-02 21:20:36 +03:00
skozlov/ksm@mysql.com/virtop.(none)
46c0342279
WL#4091, fix for rpl_flushlog_loop for windows platforms
2008-03-02 20:17:39 +03:00
skozlov/ksm@mysql.com/virtop.(none)
e9b8538fdc
WL#4091, enable rpl_flushlog_loop.test and fix for rpl_drop_temp.test
2008-03-01 00:05:23 +03:00
gluh@mysql.com/eagle.(none)
2f5abfd3ef
fixed problem with embedded server
2008-02-29 17:58:35 +04:00
bar@mysql.com/bar.myoffice.izhnet.ru
f83cc8e6db
Bug#23924 general_log truncates queries with character set introducers.
...
Problem: logging of utf8-incompatible binary strings didn't work
Fix: hex-encoding of incompatible sequences.
2008-02-29 17:56:50 +04:00
gluh@eagle.(none)
1616c68bde
Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2008-02-29 16:58:20 +04:00
gluh@mysql.com/eagle.(none)
4d582db8ea
test fix
2008-02-29 16:56:41 +04:00
gluh@mysql.com/eagle.(none)
931bdedbc2
after merge fix
2008-02-29 15:04:00 +04:00
gluh@eagle.(none)
df5fbf5ae0
Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2008-02-29 14:05:38 +04:00
gluh@mysql.com/eagle.(none)
13bb7e0a22
Bug#32167 another privilege bypass with DATA/INDEX DIRECORY(ver 4.1,5.0)
...
added new function test_if_data_home_dir() which checks that
path does not contain mysql data home directory.
Using of mysql data home directory in
DATA DIRECTORY & INDEX DIRECTORY is disallowed.
2008-02-29 13:55:00 +04:00
gluh@eagle.(none)
c59f1af6f5
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2008-02-29 13:00:45 +04:00
gluh@mysql.com/eagle.(none)
8343c6922a
additional test fix for Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY
2008-02-29 12:52:50 +04:00
davi@buzz.(none)
2905909d89
Merge buzz.(none):/home/davi/mysql-5.0-runtime
...
into buzz.(none):/home/davi/mysql-5.1-runtime
2008-02-28 20:22:50 -03:00
skozlov/ksm@mysql.com/virtop.(none)
0771579b82
Bug#32663, Bug#33045, Bug#23533, WL#4091
2008-02-29 00:50:15 +03:00
gshchepa/uchum@host.loc
cf484bb18c
Merge host.loc:/home/uchum/work/PP/5.0-opt-34620
...
into host.loc:/home/uchum/work/5.1-opt
2008-02-28 23:01:22 +04:00
gshchepa/uchum@host.loc
11a27f1215
Merge host.loc:/home/uchum/work/PP/5.0-opt-34620
...
into host.loc:/home/uchum/work/5.0-opt
2008-02-28 22:57:22 +04:00
gshchepa/uchum@host.loc
c51106740d
Fixed bug #34620 : item_row.cc:50: Item_row::illegal_method_call(const char*):
...
Assertion `0' failed
If ROW item is a part of an expression that also has
aggregate function calls (COUNT/SUM/AVG...), a
"splitting" with an Item::split_sum_func2 function
is applied to that ROW item.
Current implementation of Item::split_sum_func2
replaces this Item_row with a newly created
Item_aggregate_ref reference to it.
Then the row cache tries to work with the
Item_aggregate_ref object as with the Item_row object:
row cache calls row-emulation methods such as cols and
element_index. Item_aggregate_ref (like it's parent
Item_ref) inherits dummy implementations of those
methods from the hierarchy root Item, and call to
them leads to failed assertions and wrong data
output.
Row-emulation virtual functions (cols, element_index, addr,
check_cols, null_inside and bring_value) of Item_ref have
been overloaded to forward calls to an underlying item
reference.
2008-02-28 22:53:31 +04:00
msvensson@pilot.mysql.com
06cf8665c5
Fix after merge
2008-02-28 18:55:46 +01:00
davi@mysql.com/endora.local
361262c7c0
Bug#33851 Passing UNSIGNED param to EXECUTE returns ERROR 1210
...
The problem is that passing anything other than a integer to a limit
clause in a prepared statement would fail. This limitation was introduced
to avoid replication problems (e.g: replicating the statement with a
string argument would cause a parse failure in the slave).
The solution is to convert arguments to the limit clause to a integer
value and use this converted value when persisting the query to the log.
2008-02-28 11:34:08 -03:00
gkodinov/kgeorge@magare.gmz
b8a47c9858
merge of bug 33266 to 5.1-opt
2008-02-28 16:29:14 +02:00
anozdrin/alik@quad.
55f0fba462
Disable test case due to Bug#34891: sp_notembedded.test fails
...
sporadically.
2008-02-28 17:28:33 +03:00
gkodinov/kgeorge@magare.gmz
9b58d7b1f8
Merge magare.gmz:/home/kgeorge/mysql/work/B34747-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B34747-5.1-opt
2008-02-28 15:45:54 +02:00
gkodinov/kgeorge@magare.gmz
c8476efc7c
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B34747-5.0-opt
2008-02-28 15:27:50 +02:00
tnurnberg@mysql.com/white.intern.koehntopp.de
c6b4d7a7c4
Bug#34749: Server crash when using NAME_CONST() with an aggregate function
...
NAME_CONST('whatever', -1) * MAX(whatever) bombed since -1 was
not seen as constant, but as FUNCTION_UNARY_MINUS(constant)
while we are at the same time pretending it was a basic const
item. This confused the aggregate handlers in exciting ways.
We now make NAME_CONST() behave more consistently.
2008-02-28 14:23:22 +01:00
gluh@mysql.com/eagle.(none)
9d42a09675
Bug#32167 another privilege bypass with DATA/INDEX DIRECORY(3rd version for 5.1)
...
added new function test_if_data_home_dir() which checks that
path does not contain mysql data home directory.
Using of 'mysql data home'/'any db name' in
DATA DIRECTORY & INDEX DIRECTORY is disallowed
2008-02-28 16:46:52 +04:00
anozdrin/alik@quad.
b100bb1ff1
Fix for Bug#34852: SHOW OPEN TABLES output is not repeatable
...
(show_check.test fails sporadically).
Fix test case for Bug#12183 to make it stable.
2008-02-28 15:35:25 +03:00
skozlov/ksm@mysql.com/virtop.(none)
3c108889fb
WL#4091, replace sleeps
2008-02-28 14:36:14 +03:00
gkodinov/kgeorge@magare.gmz
0443189d89
Bug #34747 : crash in debug assertion check after derived table
...
Was a double-free of the Unique member of Item_func_group_concat.
This was not causing a crash because the Unique is a descendent of
Sql_alloc.
Fixed to free the Unique only if it was allocated for the instance
of Item_func_group_concat it was referenced from
2008-02-28 13:31:19 +02:00
msvensson@pilot.mysql.com
56a354794c
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
2008-02-28 12:21:44 +01:00
msvensson@pilot.mysql.com
0462076eac
Add variables fro myisamchk and myisampack
2008-02-28 11:49:14 +01:00
msvensson@pilot.mysql.com
a0dd86232c
Use car/tmp as tempdir for mysqld --bootstrap
...
Run "mysql --bootstrap" with verbose if turned on
2008-02-28 10:52:04 +01:00
msvensson@pilot.mysql.com
ae3f30828b
Merge bk-internal:/home/bk/mysql-5.1-rpl
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
2008-02-28 10:39:29 +01:00
davi@endora.local
4f98cd18b6
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-27 18:11:15 -03:00
davi@mysql.com/endora.local
d58c9e089e
Fix for team tree failure. Synchronously wait for the query state
...
to reach the desired value.
2008-02-27 18:08:29 -03:00
anozdrin/alik@quad.
476653102f
Fix information_schema.test to be case-insensitive.
2008-02-27 22:53:54 +03:00
svoj@mysql.com/june.mysql.com
cf50a67cca
BUG#13861 - START SLAVE UNTIL may stop 1 evnt too late if
...
log-slave-updates and circul repl
After merge fixes.
2008-02-27 21:46:06 +04:00
kostja@dipika.(none)
24d27e3b7c
Update Bug#12713 test results to take into account fixed bugs (29157, 33846)
2008-02-27 18:38:17 +03:00
kaa@kaamos.(none)
314b2377c6
Merge kaamos.(none):/data/src/opt/bug33834/my51-bug33834
...
into kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-02-27 18:18:15 +03:00
kaa@kaamos.(none)
67a9d33a3d
Merge kaamos.(none):/data/src/opt/bug33834/my50-bug33834
...
into kaamos.(none):/data/src/opt/mysql-5.0-opt
2008-02-27 18:17:25 +03:00
kaa@kaamos.(none)
a5dd9cdc7b
Merge kaamos.(none):/data/src/opt/bug33834/my50-bug33834
...
into kaamos.(none):/data/src/opt/bug33834/my51-bug33834
2008-02-27 18:13:12 +03:00
kaa@kaamos.(none)
d9e7b3b11c
Fixed test suite failures with --ps-protocol introduced in PB by
...
the patch for bug #33834 .
2008-02-27 18:12:08 +03:00
jani@hynda.mysql.fi
b806eea262
Merge hynda.mysql.fi:/home/my/mysql-5.1-main
...
into hynda.mysql.fi:/home/my/mysql-5.1-marvel
2008-02-27 16:46:32 +02:00
sven@riska.(none)
4aab65ad5c
Fix pushbuild errors.
2008-02-27 15:18:27 +01:00
svoj@june.mysql.com
6c6afd7130
Merge mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines
2008-02-27 17:43:54 +04:00
svoj@june.mysql.com
44340d9388
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.0-engines
2008-02-27 17:33:19 +04:00
mkindahl@dl145h.mysql.com
0b6471da9c
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-02-27 11:00:43 +01:00
mkindahl@dl145h.mysql.com
3f85bbe53d
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
2008-02-27 10:57:48 +01:00
anozdrin/alik@quad.
bdc83bf2cb
Merge quad.:/mnt/raid/alik/MySQL/devel/5.1
...
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2008-02-26 19:34:02 +03:00
anozdrin/alik@quad.
c61667bca8
Merge quad.:/mnt/raid/alik/MySQL/devel/5.0
...
into quad.:/mnt/raid/alik/MySQL/devel/5.0-rt-merged
2008-02-26 19:23:37 +03:00