Commit graph

89827 commits

Author SHA1 Message Date
Sergei Golubchik
db2399b0c1 small cleanup 2014-10-10 22:27:40 +02:00
Sergei Golubchik
8f15bf9d0c cleanup: remove hidden I_S.VARIABLES and I_S.STATUS tables
their only purpose was to distinguish between
SHOW and SELECT and there are cleaner ways of doing  it.
2014-10-10 22:27:40 +02:00
Sergei Golubchik
2fae1b576d prefer to use new flag name when possible 2014-10-10 22:27:40 +02:00
Sergei Golubchik
ab34aecff3 MDEV-6513 deprecate engine_condition_pushdown value of the @@optimizer_switch
* ignore the OPTIMIZER_SWITCH_ENGINE_CONDITION_PUSHDOWN bit
* issue a deprecation warning on 'engine_condition_pushdown=on'
* remove unused remains of the old pre-5.5 engine_condition_pushdown variable
2014-10-10 22:27:40 +02:00
Sergei Golubchik
686f102eb9 MDEV-6609 SQL inside an anonymous block is executed with wrong SQL_MODE
MDEV-6606 Server crashes in String::append on selecting sql_mode inside anonymous block
2014-10-10 22:27:40 +02:00
Sergei Golubchik
30ea6ddda0 MDEV-6603 SBR failure upon executing a prepared statement with input placeholder under anonymous block
Normally, Prepared_statement object rewrites the query on execution
to replace ?-placeholders with values. The rewritten query may be written
to logs (including binlog) or stored in the query cache.

But for compound statements, the whole block is prepared and executed,
while contained statements are logged individually. So it doesn't make
sense to rewrite the original statement block. Instead, we need to rewrite
every contained statement. SP is already doing it to replace SP variables
with values. Let it rewrite PS parameters too in the same loop.
2014-10-10 22:27:39 +02:00
Sergei Golubchik
013f0f6cec cleanup: query rewrites for Item_param and Item_splocal
Fix query rewrites in PS code - it was memcpy-ing the same query tail
many times. Instead use the same logic as in SP code, copy query pieces
into the destination buffer.

Extract this logic into a separate class Rewritable_query_parameter
with Item_param and Item_splocal inheriting from it.

Create a helper class Copy_query_with_rewrite that incapsulates
the query rewriting logic, use it in SP and PS.
2014-10-10 22:27:39 +02:00
Sergei Golubchik
d7c1e0ebbd MDEV-5317 Compound statement / anonymous blocks
originally based on the patch by Antony T Curtis
2014-10-10 22:27:39 +02:00
Sergei Golubchik
a99af484cd MDEV-5317 out parameters in PREPARE "SELECT ... INTO"
originally based on the patch by Antony T Curtis
2014-10-10 22:27:39 +02:00
Sergei Golubchik
278f7fdd7e cleanup: get rid of (Item_splocal*)item downcast 2014-10-10 22:27:39 +02:00
Sergei Golubchik
932100c813 cleanup sql_yacc.yy: remove redundant ev_sql_stmt_inner rule 2014-10-10 22:27:39 +02:00
Sergei Golubchik
60475b8f27 cleanup sql_yacc.yy: rules for the CASE ... END CASE statement 2014-10-10 22:27:38 +02:00
Sergei Golubchik
319f206d01 cleanup sql_yacc.yy: s/IF/IF_SYM/ 2014-10-10 22:27:38 +02:00
Sergei Golubchik
09c1af9364 cleanup sql_yacc.yy: reduce code duplication in rules for BEGIN...END with and without label 2014-10-10 22:27:38 +02:00
Sergei Golubchik
d49e11834a cleanup sql_yacc.yy: factor out duplicate code in PROCEDURE/FUNCTION/TRIGGER/EVENT grammar 2014-10-10 22:27:38 +02:00
Sergei Golubchik
352723cd90 cleanup sql_yacc.yy: rename rules for loops with and without label to follow BEGIN...END rule naming 2014-10-10 22:27:38 +02:00
Sergei Golubchik
45907bec50 cleanup sql_yacc.yy: remove duplicate code in opt_union rule 2014-10-10 22:27:38 +02:00
Sergei Golubchik
71485e7c7b cleanup sql_yacc: introduce opt_not rule, combine otherwise duplicate rules 2014-10-10 22:27:38 +02:00
Sergei Golubchik
c655609d1e cleanup sql_yacc.yy: s/YYABORT/MYSQL_YYABORT/ 2014-10-10 22:27:37 +02:00
Sergei Golubchik
fdf32f578c cleanup: param_marker rule in the parser
preserve the Item_param type of the param_marker in the parser,
don't upcast cast it to Item
2014-10-10 22:27:37 +02:00
Sergei Golubchik
1e0a11a3c7 cleanup: class my_var
* split my_var class in three - base my_var and two descencants, move
  properties into descendants, remove if(), create a virtual method instead
* factor out the common code in the select_var_ident parser rule
2014-10-10 22:27:37 +02:00
Sergei Golubchik
624888b4e6 cleanup: inherit from Sql_alloc
instead of copy-pasting its methods into a new class
2014-10-10 22:27:37 +02:00
Sergei Golubchik
43d1f0b6b9 cleanup: rename List<> methods
prepand() -> prepend()
concat() -> append()
2014-10-10 22:27:37 +02:00
Sergei Golubchik
aabb33cc54 cleanup: public Item_param::get_settable_routine_parameter()
make Item_param::get_settable_routine_parameter() public, because it's
public in the parent Item class and all other Item descendants too
2014-10-10 22:27:37 +02:00
Sergei Golubchik
e8fb24664e cleanup: use null_lex_str where appropriate 2014-10-10 22:27:37 +02:00
Sergei Golubchik
6e05aabb9b cleanup: case SQLCOM_CALL
move SP invocation code out of the huge switch in mysql_execute_command
2014-10-10 22:27:36 +02:00
Sergei Golubchik
3d9aa6c467 Plugin API: increase SHOW_VAR_FUNC_BUFF_SIZE for 64-bit CPUs
instead of having it 1K everywhere, make it 1K on 32-bit and 2K on 64-bit.
As the latter has larger pointers (and larger sizeof(SHOW_VAR),
it needs a larger buffer to store the same amount of SHOW_VARs
2014-10-10 22:27:36 +02:00
Sergei Golubchik
03ec3511a8 cleanup: galera misc cleanups
also disable galera-specific output in mysql_tzinfo_to_sql,
it'll be enabled later.
2014-10-10 22:27:36 +02:00
Sergei Golubchik
8596b70f96 cleanup: simplify the usage of WSREP_FORMAT macro 2014-10-10 22:27:36 +02:00
Sergei Golubchik
d103e359f8 followup changes to timeout commit
* fix debian patch
* update the copyright
* rename include guards to follow conventions
* restore incorectly deleted test file, add clarification in a comment
* capitalize the first letter of the status variable
2014-10-10 22:27:36 +02:00
Sergei Petrunia
e6152f9293 MDEV-6702: analyze_stmt test fails in --embedded 10.1
Provide Protocol_discard::storeXXX functions for all kinds
of objects that could be stored. Failure to so would caused
crashes in embedded server which attempted to collect the
stored info.

This also reduces the amount of copy operations for non-embedded
case.
2014-10-10 21:30:23 +04:00
Sergei Petrunia
988f3fbed9 MDEV-6846: Test tokudb_mariadb.mdev6657 fails in buildbot
Update the testcase so it is still meaningful when fix for MDEV-6657
is present in the code.
2014-10-10 14:40:21 +04:00
Monty
4439d1febf Merge branch '10.1' of github.com:MariaDB/server into 10.1
Merge with main branch
2014-10-07 11:40:10 +03:00
Monty
4af97bc0e3 Removed files that had been accidentally committed
Removed compiler warnings
2014-10-07 11:39:42 +03:00
Monty
cc8aed3eb7 MDEV 4427: query timeouts
Added MAX_STATEMENT_TIME user variable to automaticly kill queries after a given time limit has expired.

- Added timer functions based on pthread_cond_timedwait
- Added kill_handlerton() to signal storage engines about kill/timeout
- Added support for GRANT ... MAX_STATEMENT_TIME=#
- Copy max_statement_time to current user, if stored in mysql.user
- Added status variable max_statement_time_exceeded
- Added KILL_TIMEOUT
- Removed digest hash from performance schema tests as they change all the time.
- Updated test results that changed because of the new user variables or new fields in mysql.user

This functionallity is inspired by work done by Davi Arnaut at twitter.
Test case is copied from Davi's work.

Documentation can be found at
https://kb.askmonty.org/en/how-to-limittimeout-queries/

mysql-test/r/mysqld--help.result:
  Updated for new help message
mysql-test/suite/perfschema/r/all_instances.result:
  Added new mutex
mysql-test/suite/sys_vars/r/max_statement_time_basic.result:
  Added testing of max_statement_time
mysql-test/suite/sys_vars/t/max_statement_time_basic.test:
  Added testing of max_statement_time
mysql-test/t/max_statement_time.test:
  Added testing of max_statement_time
mysys/CMakeLists.txt:
  Added thr_timer
mysys/my_init.c:
mysys/mysys_priv.h:
  Added new mutex and condition variables
  Added new mutex and condition variables
mysys/thr_timer.c:
  Added timer functions based on pthread_cond_timedwait()
  This can be compiled with HAVE_TIMER_CREATE to benchmark agains timer_create()/timer_settime()
sql/lex.h:
  Added MAX_STATEMENT_TIME
sql/log_event.cc:
  Safety fix (timeout should be threated as an interrupted query)
sql/mysqld.cc:
  Added support for timers
  Added status variable max_statement_time_exceeded
sql/share/errmsg-utf8.txt:
  Added ER_QUERY_TIMEOUT
sql/signal_handler.cc:
  Added support for KILL_TIMEOUT
sql/sql_acl.cc:
  Added support for GRANT ... MAX_STATEMENT_TIME=#
  Copy max_statement_time to current user
sql/sql_class.cc:
  Added timer functionality to THD.
  Added thd_kill_timeout()
sql/sql_class.h:
  Added timer functionality to THD.
  Added KILL_TIMEOUT
  Added max_statement_time variable in similar manner as long_query_time was done.
sql/sql_connect.cc:
  Added handling of max_statement_time_exceeded
sql/sql_parse.cc:
  Added starting and stopping timers for queries.
sql/sql_show.cc:
  Added max_statement_time_exceeded for user/connects status in MariaDB 10.0
sql/sql_yacc.yy:
  Added support for GRANT ... MAX_STATEMENT_TIME=# syntax, to be enabled in 10.0
sql/structs.h:
  Added max_statement_time user resource
sql/sys_vars.cc:
  Added max_statement_time variables
mysql-test/suite/roles/create_and_drop_role_invalid_user_table.test
  Removed test as we require all fields in mysql.user table.
scripts/mysql_system_tables.sql
scripts/mysql_system_tables_data.sql
scripts/mysql_system_tables_fix.sql
  Updated mysql.user with new max_statement_time field
2014-10-07 11:37:36 +03:00
Nirbhay Choubey
f7c57b4a36 MDEV-6667: Merged fix from maria-10.0-galera. 2014-10-06 15:26:09 -04:00
Sergei Petrunia
1a7d17311c Merge ../10.1-orderby-fixes into 10.1 2014-10-06 12:21:53 +04:00
Nirbhay Choubey
61d8b4a29b MDEV-6833: SIGSEGV on shutdown with non-default wsrep_slave_threads
thd->variables' table_plugin & tmp_table_plugin should be set to
NULL for wsrep system threads.
Also made a minor change to skip checking of wsrep options if
wsrep_on is not set.
2014-10-04 13:59:07 -04:00
Nirbhay Choubey
c768af75b7 Minor modifications
- Simplified test cases in wsrep.variables
- Fixed a condition in wsrep_check_opts.cc
- Fixed an "unbound variable" in wsrep_sst_rsync
2014-10-04 13:53:33 -04:00
Jan Lindström
7474e7baa0 MDEV-6807: InnoDB: Assertion failure in file lock0lock.cc
(lock != ctx->wait_lock)

References: lp:1364840 lp:1280896 - reverted a part of fix for
lp:1280896 (updating a unique key can cause parallel applying to hang )
in revision #4105. This "BF (brute force) lock skipping" caused
regression which surfaced in randgen test for bug lp:1364840
2014-10-02 21:17:57 +03:00
Sergei Golubchik
ebe4fadcd5 when running mtr tests don't let galera-started rsyncd to log to syslog 2014-10-02 18:54:01 +02:00
Jan Lindström
251239af67 Fix Windows compiler error 'log2f': identifier not found 2014-10-02 15:09:17 +03:00
Sergei Golubchik
f13cf62147 don't enable SECURITY_HARDENED on old gcc
on CentOS 5 x86 (at least) this results in a binary
that cannot load plugins. Draw the line, quite
arbitrarily, at gcc 4.6.
2014-10-01 23:48:36 +02:00
Sergei Golubchik
2156f62d2e portability: use getifaddrs()
instead of exec'ing /usr/sbin/ifconfig|grep|sed|awk
2014-10-01 23:48:36 +02:00
Sergei Golubchik
edd1de3d1c cleanup: introduce CF_SKIP_WSREP_CHECK
remove if() over many COM_xxx values
2014-10-01 23:48:36 +02:00
Sergei Golubchik
b3469520a1 cleanup: remove OPT_WSREP_START_POSITION and OPT_WSREP_SST_AUTH
there is no reason to initialize wsrep start position
and auth from inside the get_one_option() callback
2014-10-01 23:48:35 +02:00
Sergei Golubchik
eaec266eb1 restore and fix wsrep status variables 2014-10-01 23:48:35 +02:00
Sergei Golubchik
13af416a82 cleanup: wsrep_check_opts 2014-10-01 23:48:35 +02:00
Sergei Golubchik
425dc6d2fd small cleanup 2014-10-01 23:48:35 +02:00
Sergei Golubchik
7aabc2ded2 fixing embedded: WaaS. Wsrep as a Service. 2014-10-01 23:48:34 +02:00