Commit graph

59352 commits

Author SHA1 Message Date
MySQL Build Team
ac0654166f Type change: "fk->name" is no "const char *" any more, rather a "LEX_STRING".
To access its string part, the ".str" element must be accessed.

This change was missing in "storage/ibmdb2i/db2i_constraints.cc", add it now.
2009-11-17 14:35:05 +01:00
MySQL Build Team
4bf94dec9b The "hash_*" functions have got a prefix "my_" in 2008.
Recently, the "#define" directives mapping the old names to the new ones
have been removed, so now all callers must use the new names.

This change was missing in the DB2 storage handler modules.
2009-11-17 13:55:42 +01:00
MySQL Build Team
b0c7053192 In a C file, use C style comments and not C++ style. 2009-11-16 19:36:55 +01:00
MySQL Build Team
3ae5a3034a Add missing cleanup, needed for "make distcheck" to succeed. 2009-11-13 23:07:41 +01:00
MySQL Build Team
a85bebb3c4 Solve a "make" rule issue in the context of dtarce and shared objects:
Replace a correct dependency in "storage/Makefile.am"
(which "make" cannot handle correctly, because it is to a "libtool"
convenience module) by a hack which it should.
2009-11-13 21:32:29 +01:00
Alexander Nozdrin
03baeb7653 Auto-merge from mysql-trunk-bugfixing. 2009-11-12 05:20:39 +03:00
Alexander Nozdrin
e99e453633 Auto-merge from mysql-next-mr. 2009-11-12 18:00:24 +03:00
Alexander Nozdrin
819a299235 Auto-merge from mysql-trunk. 2009-11-12 04:58:56 +03:00
Alexander Nozdrin
0e7c10445f Auto-merge from mysql-trunk. 2009-11-12 15:10:26 +03:00
Alexey Botchkov
5e85d7170a test updated 2009-11-11 21:30:51 +04:00
Alexey Botchkov
134d2fb675 loadxml test update. 2009-11-11 05:42:02 +04:00
Alexey Botchkov
c868e89f82 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
6388a13230 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
Alexander Nozdrin
ad6883c4f2 Fix build failure. 2009-11-10 12:32:29 +03:00
Alexander Nozdrin
ecd6047172 Auto-merge from mysql-next-mr-alik. 2009-11-10 11:34:26 +03:00
Alexander Nozdrin
b712dce3d5 Auto-merge from mysql-next-mr. 2009-11-10 10:31:33 +03:00
Alexander Nozdrin
49bb8cba8e Fix manual-merge (2nd attempt). 2009-11-10 00:08:17 +03:00
Alexander Nozdrin
a15de1841f Auto-merge from mysql-trunk-merge. 2009-11-09 18:14:53 +03:00
Alexander Nozdrin
831c8434a7 Fix manual-merge. 2009-11-09 18:13:11 +03:00
Alexander Nozdrin
fae99a38a8 Fix innodb.test due to Bug#48636. 2009-11-09 14:56:15 +03:00
Mikael Ronstrom
6590cb3bd6 Merge BUG#48161, BUG#48447 2009-11-06 23:23:28 +01:00
Alexander Nozdrin
966e0d9df4 Auto-merge from mysql-trunk-merge. 2009-11-06 19:15:09 +03:00
Alexander Nozdrin
6b1d61ecb0 Manual merge from mysql-trunk-merge. 2009-11-06 19:13:33 +03:00
Alexander Nozdrin
ae71ffc1c8 Auto-merge from mysql-trunk-merge. 2009-11-06 18:33:37 +03:00
Alexander Nozdrin
e6d79c2bc9 Auto-merge from mysql-trunk-merge. 2009-11-06 18:28:25 +03:00
Alexander Nozdrin
ea0bbb7248 Manual merge from mysql-trunk-merge. 2009-11-06 18:19:24 +03:00
Alexander Nozdrin
7cd11f45be Manual merge from mysql-trunk-merge. 2009-11-06 17:20:27 +03:00
Mikael Ronstrom
bf7771df3f Review fixes for BUG#48161 and BUG#48447 2009-11-06 11:49:27 +01:00
Alexander Nozdrin
5462a6dbcc Auto-merge from mysql-trunk-merge. 2009-11-06 13:32:54 +03:00
Alexander Nozdrin
b3b4137d52 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
e253068bee Manual-merge from mysql-trunk-merge. 2009-11-06 12:52:45 +03:00
Alexander Nozdrin
85929aacc8 Auto-merge from mysql-trunk-merge. 2009-11-06 12:37:00 +03:00
Alexander Nozdrin
1a07288310 Auto-merge from mysql-trunk-merge. 2009-11-06 12:17:01 +03:00
Alexander Nozdrin
52b1bfe405 Manual merge from mysql-trunk-merge.
Fix partition_column.test.
2009-11-06 11:56:48 +03:00
Alexander Nozdrin
eed607b829 Manual merge from mysql-trunk-merge. 2009-11-05 23:48:01 +03:00
Alexander Nozdrin
cd14c47c99 Manual merge from mysql-trunk-merge. 2009-11-05 23:28:35 +03:00
Alexander Nozdrin
e0c62aad36 Manual merge from mysql-5.1. 2009-11-05 17:59:05 +03:00
Alexander Nozdrin
120425ccfd Fix automerge: use 'thd->query()' instead of 'thd->query'. 2009-11-05 17:51:00 +03:00
Mikael Ronstrom
ca9fe97e9f 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
45c2de8ffd Manually applied fix for innodb_bug39438 test from 5.1. 2009-11-05 18:06:28 +04:00
Sergey Vojtovich
345c79edf7 Updates for test cases from innodb-zip-ss6129. 2009-11-05 17:23:50 +04:00
Sergey Vojtovich
ced8719400 Merge of innodb-zip-ss6129 from 5.1 to mysql-trunk. 2009-11-05 16:29:58 +04:00
Alexander Nozdrin
3e2c9aac11 Auto-merge from mysql-5.1. 2009-11-05 15:13:16 +03:00
Alexander Nozdrin
d74f9f8805 Null-merge revid:svoj@sun.com-20091103091902-vwszwwpfi1f4zrpn from mysql-5.1 2009-11-05 15:10:39 +03:00
Alexander Nozdrin
d476bbb0be Auto-merge from mysql-next-mr. 2009-11-05 15:08:37 +03:00
Alexander Nozdrin
e1a2211ad9 Auto-merge from mysql-5.1. 2009-11-05 14:03:16 +03:00
Alexander Nozdrin
99d2c97208 Auto-merge from mysql-5.1. 2009-11-05 13:59:58 +03:00
Alexander Nozdrin
132c439a0b Manual merge from mysql-5.1. 2009-11-05 13:58:14 +03:00
Alexander Nozdrin
89cfb564e3 Auto-merge from mysql-5.1. 2009-11-05 12:38:14 +03:00
Alexander Nozdrin
ff867d21f4 Auto-merge from mysql-5.1. 2009-11-05 12:37:26 +03:00