Commit graph

33241 commits

Author SHA1 Message Date
bar@mysql.com
ed6899c64f Merge mysql.com:/usr/home/bar/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16319
2006-04-14 13:34:18 +05:00
jimw@mysql.com
6f5999e9b5 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-13 18:59:13 -07:00
jimw@mysql.com
b047dbbb1d Remove ancient version of Debian packaging files. 2006-04-13 17:18:43 -07:00
konstantin@mysql.com
b5863b3987 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
2006-04-14 02:38:41 +04:00
jimw@mysql.com
b1302af0d2 Merge mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-13 13:28:54 -07:00
jimw@mysql.com
19b9a6c97d Remove gcc-specific additions to AM_CFLAGS in unittest Makefile.am files 2006-04-13 13:26:22 -07:00
andrey@lmy004.
36b897f4c6 update 2006-04-13 23:26:02 +03:00
jimw@mysql.com
2396a360ca Merge mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-13 13:22:44 -07:00
jimw@mysql.com
4cfc378096 Clean up problem in mysql.spec caused by over-aggressive editor word-wrapping 2006-04-13 13:10:00 -07:00
konstantin@mysql.com
6f51b4199f Merge mysql.com:/opt/local/work/mysql-5.0-root
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
2006-04-14 00:07:04 +04:00
jimw@mysql.com
0ed6517ab8 Fix 'make distcheck' problems with new unittest code, and a small
portability problem.
2006-04-13 13:01:57 -07:00
jimw@mysql.com
515da4679b Don't remove mysql-test/std_data/*.pem in 'make clean' 2006-04-13 12:36:14 -07:00
aelkin@dl145j.mysql.com
b6992dd4c5 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  dl145j.mysql.com:/tmp/andrei/5.0-bug18715_drop_view_slave
2006-04-13 20:55:51 +02:00
jimw@mysql.com
66c29e0f49 Merge mysql.com:/home/jimw/my/mysql-5.1-clean
into  mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench
2006-04-13 10:37:57 -07:00
jimw@mysql.com
55727ef6d0 Remove sql-bench from the server repository -- it is being maintained
in a distinct mysql-bench repository. Also add a new --benchdir option
to mysql-test-run.pl so the location of the mysql-bench repository can
be specified. The default location is adjacent to the source tree.
2006-04-13 10:34:46 -07:00
mats@mysql.com
3b145bee57 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/bkroot/mysql-5.1-new
2006-04-13 18:38:40 +02:00
aelkin@mysql.com
676bcecd25 Bug#19074: rpl_row_func003 test failed
disabled for now.
2006-04-13 19:02:49 +03:00
mats@mysql.com
d05769e126 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/bkroot/mysql-5.1-new
2006-04-13 17:48:53 +02:00
igor@rurik.mysql.com
dbd87b39c0 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-04-13 08:41:15 -07:00
serg@serg.mylan
3acc678101 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-04-13 15:34:39 +02:00
tomas@poseidon.ndb.mysql.com
6230cdd418 retested all disabled ndb tests in pushbuild for 5+ runs and updated disabled.def accordingly 2006-04-13 15:34:38 +02:00
tomas@poseidon.ndb.mysql.com
d878c904c2 BUG#18976 test workaround 2006-04-13 15:16:02 +02:00
grog@mysql.com
da6210ee61 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/MySQL/5.0-Bug-17248a
2006-04-13 21:37:49 +09:30
sergefp@mysql.com
34b2ed5f7f Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/psergey/mysql-5.0-csc9139
2006-04-13 16:07:48 +04:00
sergefp@mysql.com
1d3a0c0ec8 BUG#19021, Crash in ROR-index_merge optimizer:
get_best_covering_ror_intersect() was copying ror_scans starting from the 
end of the array and not from its beginning.
2006-04-13 16:05:32 +04:00
tomas@poseidon.ndb.mysql.com
e24b750c23 disabled tests with accurate bug reports 2006-04-13 13:31:14 +02:00
mats@mysql.com
0bd7349557 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/merge-mysql-5.1-wl3206
2006-04-13 13:25:58 +02:00
tomas@poseidon.ndb.mysql.com
07753c59a0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-13 10:48:24 +02:00
serg@serg.mylan
d65ccb4493 merged 2006-04-13 10:24:44 +02:00
serg@serg.mylan
e3b9c80449 fix for distcheck 2006-04-13 09:57:51 +02:00
grog@mysql.com[grog]
3eb783813f foo2 2006-04-13 17:22:56 +09:30
grog@mysql.com[grog]
b2cd3a963a foo1 2006-04-13 17:20:33 +09:30
tomas@poseidon.ndb.mysql.com
66f745cd01 wrong ndb object used to drop event operation causing DBUG_ASSERT in shutdown/cleanup 2006-04-13 09:37:43 +02:00
jonas@perch.ndb.mysql.com
d935ab72e5 ndb - bug#18622
Fix 4 replica bug in packLqhKeyReq, problem introduced by opt. nr.
2006-04-13 08:47:22 +02:00
bpontz@shasta.mysql.com
19688a131a Child segfault when tring to call "mysql_error(NULL)", fixed by not
assigning "mysql" variable from return value of mysql_real_connect.
2006-04-12 23:16:15 -04:00
igor@rurik.mysql.com
134b659ba2 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-04-12 18:20:38 -07:00
igor@rurik.mysql.com
e6ce72fcef Fixes after manual merge. 2006-04-12 18:15:39 -07:00
igor@rurik.mysql.com
316eeff690 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-04-12 16:14:20 -07:00
konstantin@mysql.com
c49e6f8869 Post-merge fixes. Add a new error message for max_prepared_stmt_count
limit.
2006-04-13 01:46:44 +04:00
igor@rurik.mysql.com
fb75fcde65 Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-04-12 13:23:11 -07:00
kroki@mysql.com
2caec302fa Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug15933
2006-04-13 00:04:22 +04:00
jimw@mysql.com
86d6b16113 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-12 13:01:26 -07:00
mats@mysql.com
405ebbf231 Bug#17400 (Cluster Replication: Delete and update of row w/o PK fails):
Restarting scan after call to delete_row().
2006-04-12 21:19:24 +02:00
mats@mysql.com
0255538591 WL#3208 (Adding TAP support):
Making it portable to non-gcc compilers by defining __attribute__
macro for non-gcc compilers.
2006-04-12 21:14:32 +02:00
petr@mysql.com
6a3bb50ce6 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-im-sort-options
2006-04-12 23:12:04 +04:00
petr@mysql.com
9ac5b32a5f cleanup: sort IM options alphabetically 2006-04-12 23:08:50 +04:00
kent@mysql.com
f07838a7f5 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-04-12 20:41:40 +02:00
kent@mysql.com
dcf3ac77c7 disabled.def:
Disabled 'rpl_deadlock_innodb', randomly failing
2006-04-12 20:38:08 +02:00
kent@mysql.com
ce6319cd21 Merge 2006-04-12 20:19:40 +02:00
jimw@mysql.com
688659df11 Support --debug/-# in instance manager. 2006-04-12 11:14:56 -07:00