Commit graph

67608 commits

Author SHA1 Message Date
unknown
255c04aed8 Compiler warning about assigned but not used variables fixed. 2011-10-18 13:44:12 +03:00
Sergei Golubchik
9f6e24a05a lp:817966 int_column IN (string_constant)
restore the status quo from before the microsecond patch
2011-10-13 13:44:50 +02:00
Sergei Golubchik
76e9131fbe typo. 2011-10-13 11:23:59 +02:00
Sergey Petrunya
94bf62b65b Remove garbage comment 2011-10-13 00:15:51 +04:00
Sergey Petrunya
88d8fccfca BUG#872702: Crash in add_ref_to_table_cond() when grouping by a PK
- Testcase
2011-10-12 21:40:56 +04:00
Sergey Petrunya
ae79dbdb95 Code cleanup: move variable into branch that uses it 2011-10-12 21:38:40 +04:00
Sergei Golubchik
4449d8e380 fix a compilation failure for perl Net::HandlerSocket module 2011-10-12 14:01:01 +02:00
Vladislav Vaintroub
d418175f15 merge 2011-10-12 12:45:35 +02:00
Vladislav Vaintroub
9d0b9ffa50 merge 2011-10-12 12:30:55 +02:00
Sergey Petrunya
42eeb557a6 Fix compile error: ‘cond_copy’ may be used uninitialized in this function. 2011-10-12 14:23:42 +04:00
Vladislav Vaintroub
f1b2ecc437 Add option to enable feedback plugin to the MSI installer. 2011-10-12 12:07:14 +02:00
Sergey Petrunya
2160a25adc BUG#869001: Wrong result with semijoin + materialization + firstmatch + multipart key
- Make advance_sj_state() not to attempt building duplicate removal strategies
  when we're doing optimization of an SJM-nest.
2011-10-12 13:19:37 +04:00
Sergey Petrunya
74497ff265 Update subselect_sj{,2}_mat.result with changes that were lost when
they were deleted and re-created.
2011-10-12 02:04:03 +04:00
unknown
5b165010af Restore files accidentally deleted in previous merge. 2011-10-11 23:38:26 +02:00
Sergey Petrunya
726fe69644 Merge: fix subselect_sj2*.test: add missing DROP TABLE statement 2011-10-11 23:52:23 +04:00
Sergey Petrunya
44f4cf6f40 Fix testcases from the previous push: add missing DROP TABLE statement 2011-10-11 23:48:50 +04:00
Sergei Golubchik
5cb67bbd77 when freeing a possibly NULL pointer under safemalloc - use MY_ALLOW_ZERO_PTR 2011-10-11 21:43:43 +02:00
Vladislav Vaintroub
7f975df6b8 merge 2011-10-11 20:20:19 +02:00
Vladislav Vaintroub
ae7207dad7 merge 2011-10-11 20:18:46 +02:00
Vladislav Vaintroub
d94deb4ac2 merge 2011-10-11 20:17:44 +02:00
Vladislav Vaintroub
08fe6cba06 merge 2011-10-11 20:16:11 +02:00
Vladislav Vaintroub
ab5c1e433e remove unconditional SAFEMALLOC/SAFEMUTEX from debug flags 2011-10-11 20:13:57 +02:00
Sergey Petrunya
8392fa8391 Merge fix for BUG#869012 2011-10-11 21:57:57 +04:00
Sergey Petrunya
039da95e3d BUG#869012: Wrong result with semijoin + materialization + AND in WHERE
- in make_join_select(), use the correct condition to check whether the current table is a SJM nest (the previous 
  condition used to be correct before, but then sj-materialization temp table creation was moved to happen before
  make_join_select was called)
2011-10-11 21:34:00 +04:00
Sergei Golubchik
ae63300801 merge 2011-10-11 12:55:42 +02:00
Igor Babaev
8feff690b6 Fixed LP bug #870046.
This bug is a consequence of the fix in the function add_ref_to_table_cond
for LP bug 826935 that turned out to be not quite correct: it tried to AND
the same generated condition with two different other conditions.
This patch creates a copy of the generated condition if the condition needs
to be ANDed with two different items.
2011-10-11 02:36:08 -07:00
unknown
daf52954a8 Merge 2011-10-10 23:34:32 +03:00
Sergei Golubchik
3e8731dee0 merge 2011-10-10 19:34:37 +02:00
Sergei Golubchik
85ac4da3a8 add a missing definition 2011-10-10 17:59:26 +02:00
Sergei Golubchik
298fc11b82 remove unnecessary define 2011-10-10 15:38:11 +02:00
Sergei Golubchik
d94ad2ad40 fix feedback plugin for 5.2 2011-10-08 19:00:00 +02:00
Sergei Golubchik
eeca1f8694 merge with 5.1 2011-10-07 00:18:30 +02:00
Sergei Golubchik
4a4aa358f3 sort results in tests to make them stable 2011-10-06 23:40:19 +02:00
Sergei Golubchik
e513652a4e disable feedback plugin by default. Now on windows too. 2011-10-06 23:39:44 +02:00
Sergei Golubchik
d554a6c10e merge the feedback tree 2011-10-06 21:42:43 +02:00
Vladislav Vaintroub
c9783670c7 Implement uname() on Windows.
Also, fix code to get physical memory size.
2011-10-06 20:55:38 +02:00
Sergei Golubchik
4170093ab5 merge with feedback-plugin
and disable feedback plugin by default, if it's compiled in.
2011-10-06 18:48:16 +02:00
Sergei Golubchik
033a2527da add #define WITH_FEEDBACK_PLUGIN 2011-10-06 18:24:00 +02:00
Michael Widenius
9c32088322 Fixed that when using a trigger mysql.proc is now accessed
Cleanup:  Changed procedure type from a int/char to an enum for easier to manage and debug code.

mysql-test/r/trigger.result:
  Test that mysql.proc is not used as part of creating or using a trigger.
mysql-test/t/trigger.test:
  Test that mysql.proc is not used as part of creating or using a trigger.
sql/sp.cc:
  The main bug fix is to not look up triggers in mysql.proc; This is done by ignoreing type == TYPE_ENUM_TRIGGER in sp_add_used_routine()
  Cleanup:  Changed procedure type from a int/char to an enum.
sql/sp.h:
  Cleanup:  Changed procedure type from a int/char to an enum.
sql/sp_head.h:
  Cleanup:  Changed procedure type from a int/char to an enum.
sql/sql_db.cc:
  Fix include order
sql/sql_lex.cc:
  Fix include order
sql/sql_parse.cc:
  Cleanup:  Changed procedure type from a int/char to an enum.
sql/sql_show.cc:
  Fix include order
sql/sql_view.cc:
  Fix include order
2011-10-06 16:56:59 +03:00
Sergei Golubchik
da81a1f01e fix fulltext_plugin.test on windows 2011-10-05 20:16:42 +02:00
unknown
54caeee5d6 Making subquery cache on by default. 2011-10-05 18:18:00 +03:00
Michael Widenius
5f607a2c70 Automatic merge with 5.1 2011-10-05 16:53:35 +03:00
Michael Widenius
1351bef4df Fix for issue found in buildbot where mysqld.*.err files was missing
Added suppression message for valgrind failure found on OpenSuSE 11.1

mysql-test/mysql-test-run.pl:
  Fix for issue found in buildbot where mysqld.*.err files was missing
  Patch by Kristian Nielsen
mysql-test/valgrind.supp:
  Added suppression message for valgrind failure found on OpenSuSE 11.1
sql/mysqld.cc:
  Added missing space to comment
2011-10-05 16:37:05 +03:00
Michael Widenius
5c3e18fe0e Fixed lp:859051 "Periodic aria checkpoints prevent power management"
Now the aria_log_control_file and log file is not touched if aria files are not written to.

storage/maria/ma_checkpoint.c:
  Fixed wrong test if log file has increased.
  Don't reset pages_to_flush_before_next_checkpoint as this would cause the checkpoint to happen at next checkpoint interval
2011-10-05 15:59:49 +03:00
unknown
f40f0ff679 Fix bug lp:856152
Analysis:
The cause of the bug was that the method
subselect_rowid_merge_engine::partial_match()
was not designed for re-execution within the
same query. Specifically, it didn't cleanup
the bitmap of matching keys after completion.

The test query requires double execution of
the IN predicate because it first checks the
predicate as a constant condition. The second
execution during regular execution used the bitmap
of matching keys produced by the first execution
instead of starting with a clean one.

Solution:
Cleanup the bitmap of matching keys at the end of
the partial matching procedure.
2011-10-04 23:57:46 +03:00
Igor Babaev
1c47e1ca0d Made the result test of a test case platform independent
(correction for the previous patch).
2011-10-04 12:00:55 -07:00
Igor Babaev
3c3a1fbdcd Made the result test of a test case platform independent. 2011-10-04 08:45:01 -07:00
Sergei Golubchik
1b7e566683 tests for feedback plugin,
bugfix: garbage in PLUGIN_VAR_STR variables when INSTALL'ing a plugin

mysql-test/include/default_mysqld.cnf:
  disable feedback plugin by default.
  when enabled - tag is as a test run
2011-10-04 16:51:39 +02:00
Sergei Golubchik
031e78dd5b merge feedback plugin 2011-10-04 16:03:10 +02:00
Sergei Golubchik
c0e11db793 fix for static plugins in mariadb.
send "startup" message 5 minutes after startup, not immediately

Makefile.am:
  mariadb uses .la libraries for static plugins.
  mysql - .a libraries
plug.in:
  mariadb uses .la libraries for static plugins.
  mysql - .a libraries
sender_thread.cc:
  send "startup" message 5 minutes after startup, not immediately
url_http.cc:
  avoid "unused variable https" warning
2011-10-04 15:48:39 +02:00