1. 29 Apr, 2020 2 commits
    • Daniel Black's avatar
      MDEV-20685: compile fixes for Solaris/OSX/AIX · c238e9b9
      Daniel Black authored
      sig_return: Solaris/OSX returns different function ptr
      Move defination to my_alarm.h as its the only use.
      
      prevents compile warnings (copied from 10.3 branch)
      
      mysys/my_sync.c:136:19: error: 'cur_dir_name' defined but not used [-Werror=unused-const-variable=]
        136 | static const char cur_dir_name[]= {FN_CURLIB, 0};
            |                   ^~~~~~~~~~~~
      
      fix compile error (DEPRECATED) leaked from ssl headers.
      
      In file included from /export/home/dan/mariadb-server-10.4/sql/sys_vars.cc:37:
      /export/home/dan/mariadb-server-10.4/sql/sys_vars.ic:69: error: "DEPRECATED" redefined [-Werror]
         69 | #define DEPRECATED(X) X
            |
      In file included from /export/home/dan/mariadb-server-10.4/include/violite.h:150,
                       from /export/home/dan/mariadb-server-10.4/sql/sql_class.h:38,
                       from /export/home/dan/mariadb-server-10.4/sql/sys_vars.cc:36:
      /usr/include/openssl/ssl.h:2356: note: this is the location of the previous definition
       2356 | # define DEPRECATED __attribute__((deprecated))
            |
      
      Avoid Werror condition on non-Linux:
      
      plugin/server_audit/server_audit.c:2267:7: error: variable 'db_len_off' set but not used [-Werror=unused-but-set-variable]
       2267 |   int db_len_off;
            |       ^~~~~~~~~~
      plugin/server_audit/server_audit.c:2266:7: error: variable 'db_off' set but not used [-Werror=unused-but-set-variable]
       2266 |   int db_off;
            |       ^~~~~~
      
      auth_gssapi fix include path for Solaris
      
      Consistent with the upstream packaged patch:
      https://github.com/OpenIndiana/oi-userland/blob/oi/hipster/components/database/mariadb-103/patches/06-gssapi.h.patch
      
      compile warnings on Solaris
      
      [ 91%] Building C object plugin/server_audit/CMakeFiles/server_audit.dir/server_audit.c.o
      /plugin/server_audit/server_audit.c: In function 'auditing_v8':
      /plugin/server_audit/server_audit.c:2194:20: error: unused variable 'db_len_off' [-Werror=unused-variable]
       2194 |   static const int db_len_off= 128;
            |                    ^~~~~~~~~~
      /plugin/server_audit/server_audit.c:2193:20: error: unused variable 'db_off' [-Werror=unused-variable]
       2193 |   static const int db_off= 120;
            |                    ^~~~~~
      /plugin/server_audit/server_audit.c:2192:20: error: unused variable 'cmd_off' [-Werror=unused-variable]
       2192 |   static const int cmd_off= 4432;
            |                    ^~~~~~~
      At top level:
      /plugin/server_audit/server_audit.c:2192:20: error: 'cmd_off' defined but not used [-Werror=unused-const-variable=]
      /plugin/server_audit/server_audit.c:2193:20: error: 'db_off' defined but not used [-Werror=unused-const-variable=]
       2193 |   static const int db_off= 120;
            |                    ^~~~~~
      /plugin/server_audit/server_audit.c:2194:20: error: 'db_len_off' defined but not used [-Werror=unused-const-variable=]
       2194 |   static const int db_len_off= 128;
            |                    ^~~~~~~~~~
      cc1: all warnings being treated as errors
      
      tested on:
      $ uname -a
      SunOS openindiana 5.11 illumos-b97b1727bc i86pc i386 i86pc
      c238e9b9
    • Alexey Botchkov's avatar
      MDEV-22337 Assertion `Alloced_length >= (str_length + length +... · 4af4284b
      Alexey Botchkov authored
      Fix pointer calculations in the Session_tracker::store.
      Most of the fix for this bug goes to the 10.5, but this part should be also fixed
      earlier.
      4af4284b
  2. 28 Apr, 2020 11 commits
  3. 27 Apr, 2020 11 commits
    • Vlad Lesin's avatar
      MDEV-20230: mariabackup --ftwrl-wait-timeout never times out on explicit · d0150dc1
      Vlad Lesin authored
      lock
      
      --ftwrl-wait-timeout does not finish mariabackup execution when acquired
      backup lock can't be grabbed for the certain amount of time, it just
      waits for a long queries finishing before acquiring the lock to avoid
      unnecessary locking.
      
      This commit extends --ftwrl-wait-timeout so, that mariabackup execution
      is finished if it waits for backup lock during certain amount of time.
      d0150dc1
    • Marko Mäkelä's avatar
      MDEV-7962: Follow-up fix for 10.2 · 581df0df
      Marko Mäkelä authored
      dict_stats_update_if_needed(): Replace the parameter THD*
      with const trx_t& so that trx_t::is_wsrep() can be invoked
      instead of the more expensive wsrep_on().
      
      Replace also other occurrences of wsrep_on() with trx_t::is_wsrep().
      581df0df
    • Marko Mäkelä's avatar
      Merge 10.1 into 10.2 · c06845d6
      Marko Mäkelä authored
      c06845d6
    • Marko Mäkelä's avatar
      XtraDB 5.6.47-87.0 · d956175d
      Marko Mäkelä authored
      The only change is a change of the version number.
      As noted in commit 02af6278
      there were no changes to InnoDB between MySQL 5.6.46 and 5.6.47
      either.
      d956175d
    • Marko Mäkelä's avatar
      MDEV-7962 wsrep_on() takes 0.14% in OLTP RO · edbdfc2f
      Marko Mäkelä authored
      The function wsrep_on() was being called rather frequently
      in InnoDB and XtraDB. Let us cache it in trx_t and invoke
      trx_t::is_wsrep() instead.
      
      innobase_trx_init(): Cache trx->wsrep = wsrep_on(thd).
      
      ha_innobase::write_row(): Replace many repeated calls to current_thd,
      and test the cheapest condition first.
      edbdfc2f
    • Sergei Golubchik's avatar
      MDEV-22271 Excessive stack memory usage due to WSREP_LOG · dd4124c2
      Sergei Golubchik authored
      fix embedded innodb_plugin tests
      
      followup for 7198c6ab
      dd4124c2
    • Sergei Golubchik's avatar
      MDEV-22078 MariaDB-compat missing from MariaDB 10.4 CentOS 8 Yum Repo · f462fbac
      Sergei Golubchik authored
      Backport INSALL_SYMLINK cmake macro from 10.3.
      It'll make libmysqlclient_r.* symlinks to link to the actual
      shared library file, not to another symlink.
      
      As a bonus it'll fix cmake warning about deprecated LOCATION property
      f462fbac
    • Marko Mäkelä's avatar
      MDEV-22203: WSREP_ON is unnecessarily expensive to evaluate · 6be05ceb
      Marko Mäkelä authored
      This is a backport of the applicable part of
      commit 93475aff and
      commit 2c39f69d
      from 10.4.
      
      Before 10.4 and Galera 4, WSREP_ON is a macro that points to
      a global Boolean variable, so it is not that expensive to
      evaluate, but we will add an unlikely() hint around it.
      
      WSREP_ON_NEW: Remove. This macro was introduced in
      commit c863159c
      when reverting WSREP_ON to its previous definition.
      
      We replace some use of WSREP_ON with WSREP(thd), like it was done
      in 93475aff. Note: the macro
      WSREP() in 10.1 is equivalent to WSREP_NNULL() in 10.4.
      
      Item_func_rand::seed_random(): Avoid invoking current_thd
      when WSREP is not enabled.
      6be05ceb
    • Marko Mäkelä's avatar
      Fix clang 10 warnings · 758fbec6
      Marko Mäkelä authored
      _ma_fetch_keypage(): Correct an assertion that used to always hold.
      Thanks to clang -Wint-in-bool-context for flagging this.
      
      double_to_datetime_with_warn(): Suppress -Wimplicit-int-float-conversion
      by adding a cast. LONGLONG_MAX converted to double will actually be
      LONGLONG_MAX+1.
      758fbec6
    • Marko Mäkelä's avatar
      6a3fc110
    • Marko Mäkelä's avatar
      MDEV-22271: Follow-up fix of --embedded · d28ee189
      Marko Mäkelä authored
      Since commit 7198c6ab
      the ./mtr --embedded tests would fail to start innodb_plugin
      because of an undefined reference to the symbol wsrep_log().
      
      Let us define a stub for that function. The embedded server
      is never built WITH_WSREP, but there are no separate storage
      engine builds for the embedded server. Hence, by default,
      the dynamic InnoDB storage engine plugin would be built WITH_WSREP
      and it would fail to load into the embedded server library due to
      a reference to the undefined symbol.
      d28ee189
  4. 24 Apr, 2020 3 commits
    • Eugene Kosov's avatar
      cleanup THR_KEY_mysys · 2c5067b6
      Eugene Kosov authored
      read TLS with my_thread_var
      write TLS with set_mysys_var()
      
      my_thread_var is no longer __attribute__ ((const)): this attribute
      is simply incorrect here. Read gcc manual for more information.
      sql/threadpool_generic.cc fails with that attribute.
      2c5067b6
    • Marko Mäkelä's avatar
      Cleanup: Make row_upd_store_row() static · da7564ed
      Marko Mäkelä authored
      da7564ed
    • Marko Mäkelä's avatar
      Cleanup: Remove a constant parameter · 57ec41d6
      Marko Mäkelä authored
      row_vers_vc_matches_cluster(): Remove the parameter in_purge,
      which was always passed as in_purge=true.
      
      This parameter became constant in
      mysql/mysql-server@1dec14d346ac55fe72989dccb071f84b3b0d3bd6
      and it always was constant in MariaDB starting from the
      introduction of the function in
      commit 2e814d47 (MariaDB 10.2.2).
      57ec41d6
  5. 23 Apr, 2020 2 commits
  6. 22 Apr, 2020 4 commits
  7. 21 Apr, 2020 1 commit
    • Vlad Lesin's avatar
      MDEV-19347: Mariabackup does not honor ignore_db_dirs from server · 0efe1971
      Vlad Lesin authored
      config.
      
      The solution is to read the system variable value on startup and to fill
      databases_exclude_hash.
      
      xb_load_list_string() became non-static and was reformatted. The system
      variable value is read and processed in get_mysql_vars(), which was also
      reformatted.
      0efe1971
  8. 18 Apr, 2020 6 commits