Commit graph

34701 commits

Author SHA1 Message Date
jimw@mysql.com
dd81642594 Fix events_logs_tests so it won't fail on Windows due to appearance
of hostname in query results.
2006-05-23 17:51:17 -07:00
brian@zim.(none)
9368ab52f3 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1
2006-05-23 17:33:12 -07:00
brian@zim.(none)
ca63edc88b Removing mysql_explain_log from 5.1 2006-05-23 17:26:56 -07:00
kent@mysql.com
3be0495299 configure.in:
Updated release number 4.1.16a
2006-05-24 01:05:20 +02:00
kent@mysql.com
97674810b0 don't let bugfix for bug#8303 break the bugfix for bug#8378
revert the fix for bug#8303
correct the test for bug#8378
2006-05-24 00:55:53 +02:00
jimw@mysql.com
e7c78a04eb Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-23 15:13:30 -07:00
jimw@mysql.com
9df9098e63 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-23 13:03:33 -07:00
cmiller@zippy.(none)
971dc90e3a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0--bug11151
2006-05-23 15:01:05 -04:00
kent@mysql.com
5095d77f00 configure.in:
Changed version to 5.0.17c
2006-05-23 20:43:48 +02:00
rburnett@bk-internal.mysql.com
37d1e803f1 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-05-23 20:28:52 +02:00
brian@zim.(none)
b514d3a89c Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1
2006-05-23 11:25:11 -07:00
msvensson@neptunus.(none)
f25fcf79a5 Bug#19938 Valgrind error (race) in handle_slave_sql() 2006-05-23 20:16:57 +02:00
jimw@mysql.com
d2132bc04a Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-23 09:49:04 -07:00
kent@mysql.com
ade3de74d7 event_scheduler.h, event_scheduler.cc:
Rename load_event() to load_named_event(), to avoid name clash on HP-UX
2006-05-23 17:47:17 +02:00
jani@ua141d10.elisa.omakaista.fi
8dabbe3441 Removed wrong ascii codes from source code.
Fixed core dump in --help
2006-05-23 18:27:54 +03:00
msvensson@neptunus.(none)
0f1ae1305d Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-05-23 17:05:37 +02:00
andrey@lmy004.
046e77a2e5 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into lmy004.:/work/mysql-5.1-release
2006-05-23 16:51:37 +02:00
andrey@lmy004.
a1c30e4877 __FUNCTION__ is not available everywhere.
make us see at least with gcc the function proto. this can be extended
probably for windows too.
Fix build on intelxeon3 (sun compiler and others)
2006-05-23 16:50:01 +02:00
msvensson@neptunus.(none)
cc9f33283d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-release
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-23 16:30:50 +02:00
cmiller@zippy.(none)
e700e84567 Guilhelm suggested that the "load data infile" command should be flagged as
not transaction-safe for stored procedures.  Related to Bug#11151.
2006-05-23 10:29:58 -04:00
msvensson@neptunus.(none)
12a47bf265 Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-23 16:27:40 +02:00
msvensson@neptunus.(none)
6fb8f4f878 Bug #19938 Valgrind error (race) in handle_slave_sql() 2006-05-23 16:20:03 +02:00
msvensson@neptunus.(none)
ebedae2cb3 Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060523082057|49143 2006-05-23 16:14:48 +02:00
msvensson@neptunus.(none)
e1b8982e19 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-release
2006-05-23 16:07:23 +02:00
msvensson@neptunus.(none)
9580c05ccc Make wait_timeout test not timing dependent 2006-05-23 15:45:16 +02:00
gkodinov@mysql.com
d81a8437e4 Bug #18742: Test 'group_min_max' fails if "classic" configuration in 5.0
Moved the InnoDB related tests to innodb_mysql
2006-05-23 16:43:01 +03:00
andrey@lmy004.
fd2792cbe4 Merge lmy004.:/work/mysql-5.1-release
into lmy004.:/work/mysql-5.1-release-17619-try3
2006-05-23 15:07:08 +02:00
andrey@lmy004.
fb42ce5fd7 update log_tables.test so it is less fragile 2006-05-23 15:01:23 +02:00
msvensson@neptunus.(none)
4b51242460 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-release
2006-05-23 14:39:30 +02:00
svoj@april.(none)
59302e5540 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.0
2006-05-23 17:30:55 +05:00
andrey@lmy004.
9670bb6ae4 Merge lmy004.:/work/mysql-5.1-release
into lmy004.:/work/mysql-5.1-release-17619-try3
2006-05-23 13:49:24 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
b756f55af0 BUG#17455: Wrong results from Repair/Optimize .. table for partitioned tables 2006-05-23 07:39:35 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
0bd08dd4b6 BUG#19304: Merge handler allowed in partitioned tables 2006-05-23 07:37:03 -04:00
andrey@lmy004.
86052a9567 various fixes after push of fix for bug#17619 2006-05-23 13:32:22 +02:00
knielsen@mysql.com
03ee153539 Merge mysql.com:/usr/local/mysql/mysql-5.0-gcov
into  mysql.com:/usr/local/mysql/mysql-5.0
2006-05-23 13:23:45 +02:00
andrey@lmy004.
c04a800f3d Merge lmy004.:/work/mysql-5.1-release
into lmy004.:/work/mysql-5.1-release-17619-try3
2006-05-23 12:13:02 +02:00
andrey@lmy004.
f234eef13b update result
drop users at the end of events_stress
2006-05-23 12:10:07 +02:00
msvensson@neptunus.(none)
7667b271d8 Merge bk-internal:/home/bk/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-05-23 11:38:05 +02:00
msvensson@neptunus.(none)
b9779e9acd Move the requirement for "not running as root" to information_schema_chmod 2006-05-23 10:52:53 +02:00
andrey@lmy004.
60b75a3a02 make it less stressful. some pushbuild boxes cannot cope with it 2006-05-23 10:49:09 +02:00
msvensson@neptunus.(none)
5e19424c00 Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-05-23 10:36:06 +02:00
msvensson@neptunus.(none)
cb7958ce1b Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-05-23 10:34:59 +02:00
msvensson@neptunus.(none)
0144b51445 Add comment for 'kill_server' function 2006-05-23 10:33:53 +02:00
gluh@eagle.intranet.mysql.r18.ru
474ef8ed43 Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode
transfer NO_DEFAULT_VALUE_FLAG flag to new field
2006-05-23 13:27:45 +05:00
msvensson@neptunus.(none)
26face9f8b Bug#19938 Valgrind error (race) in handle_slave_sql()
- Unlock the mutex after looking at rli->events_till_abort
 - Already fixed in 5.1 so it will be null merged.
2006-05-23 10:20:57 +02:00
anozdrin@mysql.com
f0a01456e5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/mnt/raid/MySQL/devel/5.1-rt-wl3158-merged
2006-05-23 12:08:47 +04:00
msvensson@neptunus.(none)
5df9964651 Bug#20002 Old --with-openssl and --with-yassl options just silently ignored
- Terminate configure with error(and message) if --with-yassl or --with-openssl is used.
2006-05-23 10:07:07 +02:00
gluh@eagle.intranet.mysql.r18.ru
457aea43fc Bug#16681 information_schema shows forbidden VIEW details
show view definition to users that have the needed privilleges
2006-05-23 12:45:25 +05:00
msvensson@neptunus.(none)
6571f513f4 Bug#20018 Class declared inside of function causes problem with gcc 2.95.3
- Move class MY_HOOKS out of function
2006-05-23 09:25:07 +02:00
stewart@mysql.com
147df8bf4d BUG#20015 mgmsrv and mgmapi: get statport is dead code
Remove unused and obsolete mgmapi functionality (that did nothing anyway).
2006-05-23 14:35:18 +10:00