mariadb

Tree: 1e46d6a032

Author	SHA1	Message	Date
Marc Alff	1e46d6a032	WL#2595 kernel-independent atomic operations Backport from 6.0.14 to 5.6.0 Original code from Sergei Golubchik	16 years ago
Marc Alff	9d3ddc48b8	Merge mysql-next-mr (revno 2922) --> mysql-next-mr-marc	16 years ago
Marc Alff	dced2bce99	New tree for merges	16 years ago
Alexander Nozdrin	aaf2e7a003	Update version tag (new: 5.6).	16 years ago
Alexander Nozdrin	a673c89731	Auto-merge from mysql-trunk.	16 years ago
Alexander Nozdrin	e2f935eff7	Auto-merge from mysql-next-mr.	16 years ago
Alexander Nozdrin	732597b54e	Auto-merge from mysql-trunk-bugfixing.	16 years ago
Alexander Nozdrin	5fef8b1d06	Auto-merge from mysql-trunk.	16 years ago
Alexander Nozdrin	13b7ee7f09	Auto-merge from mysql-trunk.	16 years ago
Alexey Botchkov	4e612a1c66	test updated	16 years ago
Alexey Botchkov	0503387ccc	loadxml test update.	16 years ago
Alexey Botchkov	643419754c	Bug #47139 Test "merge" crashes in "embedded" run In fact this crashes in normal (not embedded) run also. The problem is in the memory mapping. Handling the ha_myisammrg::extra(MMAP) the MERGE engine tries to mmap all the tables it unites. Though some can be empty and then in the mi_dynmap_file() we call the my_mmap(0). Normally this call returns MAP_FAILED, but not on FreeBSD. There it returns like a 'normal' value, and after the consequitive munmap systems gets unstable and crashes on some system call later. per-file comments: storage/myisam/mi_dynrec.c Bug #47139 Test "merge" crashes in "embedded" run don't try to mmap zero-length area, just return at once.	16 years ago
Alexey Botchkov	6d9aa9ea29	Bug#42520 killing load .. infile Assertion failed: ! is_set(), file .\sql_error.cc, line 8 The additional patch. That 'loadxml.test' failure was actually about our testing system, not the code. Firstly we need a new mysqltest command, wich i called 'send_eval'. So the expression can be evaluated, then started in a parallel thread. We only have separane 'send' and 'eval' commands at the moment. Then we need to add the waiting code after the 'KILL' to our test, so the thread will be killed before the test goes further. The present 'reap' command doesn't handle the killed threads well. per-file comments: client/mysqltest.cc Bug#42520 killing load .. infile Assertion failed: ! is_set(), file .\sql_error.cc, line 8 The 'send_eval' command implemented. mysql-test/r/loadxml.result Bug#42520 killing load .. infile Assertion failed: ! is_set(), file .\sql_error.cc, line 8 test result updated. mysql-test/t/loadxml.test Bug#42520 killing load .. infile Assertion failed: ! is_set(), file .\sql_error.cc, line 8 test case added.	16 years ago
Alexander Nozdrin	e81cd9dfe1	Fix build failure.	16 years ago
Alexander Nozdrin	55b4a2ab87	Auto-merge from mysql-next-mr-alik.	16 years ago
Alexander Nozdrin	dadf820743	Auto-merge from mysql-next-mr.	16 years ago
Alexander Nozdrin	516b39c683	Fix manual-merge (2nd attempt).	16 years ago
Alexander Nozdrin	6a795bf3b9	Auto-merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	72362ac7fa	Fix manual-merge.	16 years ago
Alexander Nozdrin	157affe8c4	Fix innodb.test due to Bug#48636.	16 years ago
Mikael Ronstrom	52beed00e2	Merge BUG#48161, BUG#48447	16 years ago
Alexander Nozdrin	e89a561d52	Auto-merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	35b00a182e	Manual merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	f56223598e	Auto-merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	db6334d49e	Auto-merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	9c61ec687f	Manual merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	2ca5b2c791	Manual merge from mysql-trunk-merge.	16 years ago
Mikael Ronstrom	d4ca8b12cd	Review fixes for BUG#48161 and BUG#48447	16 years ago
Alexander Nozdrin	7a90f041cc	Auto-merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	4d0c2629cd	Null-merge patch for Bug#47627 (revision-id: kristofer.pettersson@sun.com-20091019074333-g2ces0lo4c2ejar7), because it broke the tree and was reverted later.	16 years ago
Alexander Nozdrin	f956ea3771	Manual-merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	112d9fd9db	Auto-merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	d9d3271da3	Auto-merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	ab2450efd5	Manual merge from mysql-trunk-merge. Fix partition_column.test.	16 years ago
Alexander Nozdrin	ef862653af	Manual merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	f620cae974	Manual merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	2242926ae0	Manual merge from mysql-5.1.	16 years ago
Alexander Nozdrin	3cf6345535	Fix automerge: use 'thd->query()' instead of 'thd->query'.	16 years ago
Mikael Ronstrom	09580562a2	BUG#48447, BUG#48161, fixed a regression from fix of BUG#6045, where binary collations can use indexes/partition pruning for cases using equality conditions, however it cannot be used for any other condition like <, >, <=, >=, <>, also added test case for verification of BUG#47774 in this patch	16 years ago
Sergey Vojtovich	cbe94583c2	Manually applied fix for innodb_bug39438 test from 5.1.	16 years ago
Sergey Vojtovich	2cd0b2f373	Updates for test cases from innodb-zip-ss6129.	16 years ago
Sergey Vojtovich	21fad4ee1f	Merge of innodb-zip-ss6129 from 5.1 to mysql-trunk.	16 years ago
Alexander Nozdrin	26fc558319	Auto-merge from mysql-5.1.	16 years ago
Alexander Nozdrin	dae191d36a	Null-merge revid:svoj@sun.com-20091103091902-vwszwwpfi1f4zrpn from mysql-5.1	16 years ago
Alexander Nozdrin	411a6bfeb9	Auto-merge from mysql-next-mr.	16 years ago
Alexander Nozdrin	258ec2ebaa	Auto-merge from mysql-5.1.	16 years ago
Alexander Nozdrin	13f1ace38b	Auto-merge from mysql-5.1.	16 years ago
Alexander Nozdrin	110835764b	Manual merge from mysql-5.1.	16 years ago
Alexander Nozdrin	b591221eb1	Auto-merge from mysql-5.1.	16 years ago
Alexander Nozdrin	f51d08921a	Auto-merge from mysql-5.1.	16 years ago

1 2 3 4 5 ...

59352 Commits (1e46d6a032d238bf3ca749289ca8abc8432c4e23) All Branches Search

59352 Commits (1e46d6a032d238bf3ca749289ca8abc8432c4e23)

All Branches