Vladislav Vaintroub
9edb94c69e
fix make install/ mysqld_safe
2009-11-14 14:29:14 +01:00
Vladislav Vaintroub
1b2fe5f257
fix tree name in bzr config file
2009-11-13 13:37:13 +01:00
Vladislav Vaintroub
c5eb846110
merge
2009-11-13 13:29:11 +01:00
Vladislav Vaintroub
2925dcd169
automerge
2009-11-13 13:26:16 +01:00
Alexander Nozdrin
aaf2e7a003
Update version tag (new: 5.6).
2009-11-12 06:11:55 +03:00
Alexander Nozdrin
a673c89731
Auto-merge from mysql-trunk.
2009-11-12 05:22:00 +03:00
Alexander Nozdrin
e2f935eff7
Auto-merge from mysql-next-mr.
2009-11-12 18:00:24 +03:00
Alexander Nozdrin
732597b54e
Auto-merge from mysql-trunk-bugfixing.
2009-11-12 05:20:39 +03:00
Alexander Nozdrin
5fef8b1d06
Auto-merge from mysql-trunk.
2009-11-12 04:58:56 +03:00
Alexander Nozdrin
13b7ee7f09
Auto-merge from mysql-trunk.
2009-11-12 15:10:26 +03:00
Alexey Botchkov
4e612a1c66
test updated
2009-11-11 21:30:51 +04:00
Vladislav Vaintroub
12c7945b5b
correctly specify working directory for dtrace_prelink. Also, generate _dtrace.o in the object directory
2009-11-11 12:51:44 +00:00
Alexey Botchkov
0503387ccc
loadxml test update.
2009-11-11 05:42:02 +04:00
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.
2009-11-11 01:10:30 +04:00
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.
2009-11-11 00:55:05 +04:00
Vladislav Vaintroub
3d6465d987
Fix libedit out-of-source build
2009-11-10 18:24:59 +01:00
Alexander Nozdrin
e81cd9dfe1
Fix build failure.
2009-11-10 12:32:29 +03:00
Alexander Nozdrin
55b4a2ab87
Auto-merge from mysql-next-mr-alik.
2009-11-10 11:34:26 +03:00
Alexander Nozdrin
dadf820743
Auto-merge from mysql-next-mr.
2009-11-10 10:31:33 +03:00
Vladislav Vaintroub
2dced72b27
remove debug output
2009-11-10 02:43:23 +01:00
Vladislav Vaintroub
c69715f36b
refactor libedit, generate files in binary tree, not in source tree
2009-11-10 02:19:58 +01:00
Alexander Nozdrin
516b39c683
Fix manual-merge (2nd attempt).
2009-11-10 00:08:17 +03:00
Vladislav Vaintroub
d47ac4d7a6
Fix problems found by Joro (Xcode generator specific)
2009-11-09 19:14:33 +01:00
Alexander Nozdrin
6a795bf3b9
Auto-merge from mysql-trunk-merge.
2009-11-09 18:14:53 +03:00
Alexander Nozdrin
72362ac7fa
Fix manual-merge.
2009-11-09 18:13:11 +03:00
Alexander Nozdrin
157affe8c4
Fix innodb.test due to Bug#48636.
2009-11-09 14:56:15 +03:00
Vladislav Vaintroub
360ee02d5d
fix branch name
2009-11-09 12:42:29 +01:00
Vladislav Vaintroub
13cd7170cc
WL#5161 : Cross-platform build with CMake
2009-11-09 12:32:48 +01:00
Mikael Ronstrom
52beed00e2
Merge BUG#48161, BUG#48447
2009-11-06 23:23:28 +01:00
Alexander Nozdrin
e89a561d52
Auto-merge from mysql-trunk-merge.
2009-11-06 19:15:09 +03:00
Alexander Nozdrin
35b00a182e
Manual merge from mysql-trunk-merge.
2009-11-06 19:13:33 +03:00
Alexander Nozdrin
f56223598e
Auto-merge from mysql-trunk-merge.
2009-11-06 18:33:37 +03:00
Alexander Nozdrin
db6334d49e
Auto-merge from mysql-trunk-merge.
2009-11-06 18:28:25 +03:00
Alexander Nozdrin
9c61ec687f
Manual merge from mysql-trunk-merge.
2009-11-06 18:19:24 +03:00
Alexander Nozdrin
2ca5b2c791
Manual merge from mysql-trunk-merge.
2009-11-06 17:20:27 +03:00
Mikael Ronstrom
d4ca8b12cd
Review fixes for BUG#48161 and BUG#48447
2009-11-06 11:49:27 +01:00
Alexander Nozdrin
7a90f041cc
Auto-merge from mysql-trunk-merge.
2009-11-06 13:32:54 +03:00
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.
2009-11-06 13:30:41 +03:00
Alexander Nozdrin
f956ea3771
Manual-merge from mysql-trunk-merge.
2009-11-06 12:52:45 +03:00
Alexander Nozdrin
112d9fd9db
Auto-merge from mysql-trunk-merge.
2009-11-06 12:37:00 +03:00
Alexander Nozdrin
d9d3271da3
Auto-merge from mysql-trunk-merge.
2009-11-06 12:17:01 +03:00
Alexander Nozdrin
ab2450efd5
Manual merge from mysql-trunk-merge.
...
Fix partition_column.test.
2009-11-06 11:56:48 +03:00
Alexander Nozdrin
ef862653af
Manual merge from mysql-trunk-merge.
2009-11-05 23:48:01 +03:00
Alexander Nozdrin
f620cae974
Manual merge from mysql-trunk-merge.
2009-11-05 23:28:35 +03:00
Alexander Nozdrin
2242926ae0
Manual merge from mysql-5.1.
2009-11-05 17:59:05 +03:00
Alexander Nozdrin
3cf6345535
Fix automerge: use 'thd->query()' instead of 'thd->query'.
2009-11-05 17:51:00 +03:00
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
2009-11-05 15:42:03 +01:00
Sergey Vojtovich
cbe94583c2
Manually applied fix for innodb_bug39438 test from 5.1.
2009-11-05 18:06:28 +04:00
Sergey Vojtovich
2cd0b2f373
Updates for test cases from innodb-zip-ss6129.
2009-11-05 17:23:50 +04:00
Sergey Vojtovich
21fad4ee1f
Merge of innodb-zip-ss6129 from 5.1 to mysql-trunk.
2009-11-05 16:29:58 +04:00
