Commit graph

75157 commits

Author SHA1 Message Date
Vladislav Vaintroub
f18514df2e Add minimal clarication about 'root' user to the installer UI 2012-04-15 01:21:18 +02:00
Vladislav Vaintroub
742ccf7a47 MDEV-221 : Fix potential memory access past the end of input string in filename_to_tablename() 2012-04-15 01:19:39 +02:00
Vladislav Vaintroub
2451628923 Fixed some simple warnings on Windows. 2012-04-13 19:44:22 +02:00
Vladislav Vaintroub
85a025f30c Threadpool - use EV_ONESHOT with kevent, to prevent race condition when 2
threads are retrieving events at the same time.
2012-04-12 01:40:44 +02:00
Vladislav Vaintroub
f544b21fcb Fix build on OSX
- Workaround linker bug that prevents linking aria test executables
   using -fno-common on OSX
- Skip system readline detection (OSX readline is incompatible one)
- Make Xcode generator work
2012-04-12 01:33:43 +02:00
Sergei Golubchik
9f010e3294 tweak the test to pass, until the upstream bug#61209 is *completely* fixed
(see my comments starting from [9 Apr 22:18])
2012-04-10 08:30:20 +02:00
Sergei Golubchik
16c5c53fc2 mysql 5.5.23 merge 2012-04-10 08:28:13 +02:00
Sergei Golubchik
f860b2aad4 merge 2012-04-07 15:58:46 +02:00
Igor Babaev
b95ae56b9f Fixed LP bug #972973.
When the function free_tmp_table deletes the handler object for
a temporary table the field TABLE::file for this table should be
set to NULL. Otherwise an assertion failure may occur.
2012-04-07 02:29:04 -07:00
Igor Babaev
c1feaf8d8a Merge. 2012-04-06 16:40:39 -07:00
Igor Babaev
4ca9b8eb3a Fixed bug #915222.
This bug happened because the function find_field_in_view formed
autogenerated names of view columns without a possibility to roll
them back. In some situation it could cause memory misuses reported
by valgrind or even crashes.
2012-04-06 15:08:09 -07:00
unknown
545377ab50 Unused method removed. 2012-04-06 13:18:12 +03:00
Alexey Botchkov
4632f33d33 merging. 2012-04-06 14:24:00 +05:00
Alexey Botchkov
ab5c6cd736 merging. 2012-04-06 13:51:42 +05:00
Alexey Botchkov
357c5f7464 MDEV-80 Memory engine table full at much less than max_heap_table_size with btree index.
RB-tree index in the MEMORY table fails if it grews over 4G.
        That happened because the old_allocated variable in hp_rb_write_key()
        had the uint type. Changed with the 'size_t' type to be same as the
        'rb_tree.allocated'.

per-file comments:
  storage/heap/hp_write.c
MDEV-80 Memory engine table full at much less than max_heap_table_size with btree index.
        uint->size_t for the 'old_allocated'.
2012-04-06 13:31:33 +05:00
Sergei Golubchik
a3073ecd96 merge 2012-04-05 23:07:18 +02:00
unknown
1a48919036 Fix of LP bug#968720.
When a view/derived table is converted from merged to materialized the
items from the used_item lists are substituted for items referring to
the fields of the result of the materialization. The problem appeared
with queries employing natural joins. Since the resolution of a natural
join was performed only once the used_item list formed at the second
execution of the query lacked the references to the fields that were
used only in the equality predicates generated for the natural join.
2012-04-05 23:32:57 +03:00
Sergei Golubchik
b43494620f mdev-208 thread pool breaks the server on XP 2012-04-05 15:57:27 +02:00
Sergei Golubchik
cbd52a42ee merge 2012-04-05 12:01:52 +02:00
Sergei Golubchik
dea3544b2d mysql-5.1.62 merge 2012-04-05 10:49:38 +02:00
Sergey Petrunya
cc2298ebb7 Make test results stable. 2012-04-04 21:35:34 +04:00
Sergei Golubchik
c72d5e80c5 mdev-212 sporadic main.connect failures in 5.3
don't cast implicitly an int to a char, when a boolean value is desired.
2012-04-04 15:41:50 +02:00
Michael Widenius
e14d6ef4b7 Merge with 5.2
Fixed additional changed pbxt test cases
2012-04-04 14:19:46 +03:00
Michael Widenius
70a3cafe4d Merge with 5.1 2012-04-04 13:50:24 +03:00
Michael Widenius
1ff3a106fb Merge in deleted fixes 2012-04-04 13:38:19 +03:00
Michael Widenius
6a0c2e8b21 Fixed test cases that changed as part of fixing bugs with record count and partitioning 2012-04-04 13:20:06 +03:00
Sergey Petrunya
4629de4fda Merge 2012-04-04 12:37:46 +04:00
Sergey Petrunya
656c284d81 BUG#913030: better comments and function names. 2012-04-04 12:26:36 +04:00
Michael Widenius
daf29d2a7a Merge with 5.2 2012-04-04 01:00:23 +03:00
Michael Widenius
24a67aa816 Merge with 5.1 2012-04-04 00:33:02 +03:00
Michael Widenius
a3bee835ee Fixed lp:970528 "Server crashes in my_strnncollsp_simple on LEFT JOIN with CSV table, TEXT field"
The main problem was a bug in CSV where it provided wrong statistics (it claimed the table was empty when it wasn't)
I also fixed wrong freeing of blob's in the CSV handler. (Any call to handler::read_first_row() on a CSV table with blobs would fail)



mysql-test/r/csv.result:
  Added new test case
mysql-test/r/partition_innodb.result:
  Updated test results after fixing bug with impossible partitions and const tables
mysql-test/t/csv.test:
  Added new test case
sql/sql_select.cc:
  Cleaned up code for handling of partitions.
  Fixed also a bug where we didn't threat a table with impossible partitions as a const table.
storage/csv/ha_tina.cc:
  Allocate blobroot onces.
2012-04-04 00:14:07 +03:00
Michael Widenius
2149a42928 Don't disable core on signal just becasue platform doesn't handle stack traces 2012-04-03 15:42:26 +03:00
unknown
34ed8f3379 lp:886550 Wrong installation path for some include files.
Now install all includes in a flat hierarchy under
$PREFIX/include/mysq/, same as 5.3. User can override with
-DINSTALL_INCLUDEDIR
2012-04-03 08:00:57 +02:00
Michael Widenius
b00ee6e8e5 Merge with 5.3 2012-04-03 16:00:57 +03:00
Michael Widenius
bea887e663 Define dummy my_init_stacktrace() to allow one to call it without #ifdef HAVE_STACKTRACE
Fixed compilation problem on windows.


configure.cmake:
  Added test for pthread_attr_getguardsize
include/my_stacktrace.h:
  Define dummy my_init_stacktrace() to allow one to call it without #ifdef HAVE_STACKTRACE
sql/mysqld.cc:
  Move my_setstacksize() to fix compilation problem on windows
  Don't disable core on signal just becasue platform doesn't handle stack trace
2012-04-03 15:48:56 +03:00
Sergey Petrunya
d734a13d05 Merge 2012-04-02 21:47:31 +04:00
Sergey Petrunya
2a16e7674b BUG#913030: Optimizer chooses a suboptimal excution plan for Q18 from DBT-3
- When doing join optimization, pre-sort the tables so that they mimic the execution
  order we've had with 'semijoin=off'. 
- That way, we will not get regressions when there are two query plans (the old and the
  new) that have indentical costs but different execution times (because of factors that
  the optimizer was not able to take into account).
2012-04-02 21:41:54 +04:00
Sergei Golubchik
97a3baef7b merge 2012-04-02 18:31:11 +02:00
Sergei Golubchik
1c6d95f3bb merge 2012-04-02 17:54:33 +02:00
Michael Widenius
d513153f77 Merge of compatibility fixes
Fixed failing tests in sys_vars as we have now stricter checking of setting of variables.

mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_basic.result:
  One can now only assign 0 or 1 to boolean variables
mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_basic.result:
  One can now only assign 0 or 1 to boolean variables
mysql-test/suite/sys_vars/r/innodb_large_prefix_basic.result:
  One can now only assign 0 or 1 to boolean variables
mysql-test/suite/sys_vars/r/innodb_random_read_ahead_basic.result:
  One can now only assign 0 or 1 to boolean variables
mysql-test/suite/sys_vars/r/innodb_stats_on_metadata_basic.result:
  One can now only assign 0 or 1 to boolean variables
mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result:
  One can now only assign 0 or 1 to boolean variables
mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result:
  One can now only assign 0 or 1 to boolean variables
mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result:
  One can now only assign 0 or 1 to boolean variables
mysql-test/suite/sys_vars/r/rpl_semi_sync_master_enabled_basic.result:
  One can now only assign 0 or 1 to boolean variables
mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_enabled_basic.result:
  One can now only assign 0 or 1 to boolean variables
mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_basic.test:
  One can now only assign 0 or 1 to boolean variables
mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_basic.test:
  One can now only assign 0 or 1 to boolean variables
mysql-test/suite/sys_vars/t/innodb_large_prefix_basic.test:
  One can now only assign 0 or 1 to boolean variables
mysql-test/suite/sys_vars/t/innodb_random_read_ahead_basic.test:
  One can now only assign 0 or 1 to boolean variables
mysql-test/suite/sys_vars/t/innodb_stats_on_metadata_basic.test:
  One can now only assign 0 or 1 to boolean variables
mysql-test/suite/sys_vars/t/innodb_strict_mode_basic.test:
  One can now only assign 0 or 1 to boolean variables
mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test:
  One can now only assign 0 or 1 to boolean variables
mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test:
  One can now only assign 0 or 1 to boolean variables
mysys/my_getsystime.c:
  Merge + fixed bug that __NR_clock_gettime didn't work in 5.5
2012-04-02 13:33:16 +03:00
Michael Widenius
635598f19c automatic merge 2012-04-02 12:31:53 +03:00
Michael Widenius
90bd2e8185 Ignore install_manifest.txt (created by 'make install') 2012-04-02 12:30:14 +03:00
Sergei Golubchik
534c2b1205 MDEV-209 SET PASSWORD in 5.2 does not update user's auth plugin 2012-04-02 11:29:28 +02:00
Michael Widenius
ca28d5fcf8 automatic merge 2012-04-02 12:27:15 +03:00
Michael Widenius
2887bfbe9e Fixed lp:886484 "nowatch option for mysqld (allow systemd)"
Added a --nowatch (with aliases --no-watch and --no-auto-restart) option to mysqld_safe that causes it to exit after
spawning mysqld.  We don't need mysqld_safe to restart mysqld after a crash, because systemd can do that just fine.

Based on code from Maarten Vanraes

scripts/mysqld_safe.sh:
  Added option --nowatch (with aliases --no-watch and --no-auto-restart)
2012-04-02 12:09:22 +03:00
Michael Widenius
398f754b54 Fixed lp:886479 "[PATCH] plugin boolean result"
Thanks to Maarten Vanraes for the patch


sql/sql_plugin.cc:
  Fix plugin boolean variables to receive the value "1", not "-1", when they are set to 1.
  Aside from being bizarre, the existing behavior is unportable: machines where char is unsigned print "255" instead.
2012-04-02 11:45:07 +03:00
Michael Widenius
3c0deee3fa Partial fix for lp:886476 [PATCH] disable tests
By Maarten Vanraes

mysql-test/suite/innodb/r/innodb.result:
  Make result portable
mysql-test/suite/innodb/t/innodb.test:
  Make result portable
2012-04-02 10:53:09 +03:00
Sergei Golubchik
43960b937b 1. support for testing statically built oqgraph
2. my_new.cc should redefine new (std:nothrow) too.
2012-03-30 22:15:44 +02:00
Sergei Golubchik
c01ec9d583 merge 2012-03-30 16:13:41 +02:00
Sergei Golubchik
ed5e97702c merge 2012-03-30 16:12:21 +02:00