1. 19 May, 2021 40 commits
    • Monty's avatar
      Replace find_temporary_table() with is_temporary_table() · f671a9de
      Monty authored
      DROP TABLE opens all temporary tables at start, but then
      uses find_temporary_table() to check if a table is temporary
      instead of is_temporary_table() which is much faster.
      
      This patch fixes this issue.
      f671a9de
    • Monty's avatar
      Don't reset StringBuffers in loops when not needed · 949d10be
      Monty authored
      - Moved out creating StringBuffers in loops and instead create them
        outside and just reset the buffer if it was not allocated (to avoid
        a possible malloc/free for every entry)
      
      Other things related to set_buffer_if_not_allocated()
      - Changed Valuebuffer to not call set_buffer_if_not_allocated() when
        it is created.
      - Fixed geometry functions to reset string length before calling
        String::reserve().  This is because one should not access length()
        of an undefined.
      - Added Item_func_conv_charset::save_in_field() as the item is using
        str_value to store cached values, which conflicts with
        Item::save_str_in_field().
      - Changed Item_proc_string to not store the string value in sql_string
        as this clashes with Item::save_str_in_field().
      - Locally store value of full_name_cstring() in analyse::end_of_records()
        as Item::save_str_in_field() may overwrite it.
      - Marked some strings as set_thread_specific()
      - Added String::free_buffer() to be used internally in String functions
        to just free the buffer but not reset other String values.
      - Fixed uses_buffer_owned_by() to check for allocated length instead of
        strlength, which could be marked MEM_UNDEFINED().
      949d10be
    • Monty's avatar
      Change CHARSET_INFO character set and collaction names to LEX_CSTRING · a206658b
      Monty authored
      This change removed 68 explict strlen() calls from the code.
      
      The following renames was done to ensure we don't use the old names
      when merging code from earlier releases, as using the new variables
      for print function could result in crashes:
      - charset->csname renamed to charset->cs_name
      - charset->name renamed to charset->coll_name
      
      Almost everything where mechanical changes except:
      - Changed to use the new Protocol::store(LEX_CSTRING..) when possible
      - Changed to use field->store(LEX_CSTRING*, CHARSET_INFO*) when possible
      - Changed to use String->append(LEX_CSTRING&) when possible
      
      Other things:
      - There where compiler issues with ensuring that all character set names
        points to the same string: gcc doesn't allow one to use integer constants
        when defining global structures (constant char * pointers works fine).
        To get around this, I declared defines for each character set name
        length.
      a206658b
    • Monty's avatar
      b0910ddd
    • Sergei Golubchik's avatar
      cleanup: Item::can_eval_in_optimize() · 6de84e6f
      Sergei Golubchik authored
      a helper method to check whether an item can be evaluated
      in the query optimization phase (in and below JOIN::optimize()).
      6de84e6f
    • Monty's avatar
      Added override to all releveant methods in Item (and a few other classes) · 30f0a246
      Monty authored
      Other things:
      - Remove inline and virtual for methods that are overrides
      - Added a 'final' to some Item classes
      30f0a246
    • Monty's avatar
      Added full_name_cstring() · 53b43f30
      Monty authored
      This returns a LEX_CSTRING and allows one to avoid strlen() calls.
      53b43f30
    • Monty's avatar
      Reduce usage of strlen() · b6ff139a
      Monty authored
      Changes:
      - To detect automatic strlen() I removed the methods in String that
        uses 'const char *' without a length:
        - String::append(const char*)
        - Binary_string(const char *str)
        - String(const char *str, CHARSET_INFO *cs)
        - append_for_single_quote(const char *)
        All usage of append(const char*) is changed to either use
        String::append(char), String::append(const char*, size_t length) or
        String::append(LEX_CSTRING)
      - Added STRING_WITH_LEN() around constant string arguments to
        String::append()
      - Added overflow argument to escape_string_for_mysql() and
        escape_quotes_for_mysql() instead of returning (size_t) -1 on overflow.
        This was needed as most usage of the above functions never tested the
        result for -1 and would have given wrong results or crashes in case
        of overflows.
      - Added Item_func_or_sum::func_name_cstring(), which returns LEX_CSTRING.
        Changed all Item_func::func_name()'s to func_name_cstring()'s.
        The old Item_func_or_sum::func_name() is now an inline function that
        returns func_name_cstring().str.
      - Changed Item::mode_name() and Item::func_name_ext() to return
        LEX_CSTRING.
      - Changed for some functions the name argument from const char * to
        to const LEX_CSTRING &:
        - Item::Item_func_fix_attributes()
        - Item::check_type_...()
        - Type_std_attributes::agg_item_collations()
        - Type_std_attributes::agg_item_set_converter()
        - Type_std_attributes::agg_arg_charsets...()
        - Type_handler_hybrid_field_type::aggregate_for_result()
        - Type_handler_geometry::check_type_geom_or_binary()
        - Type_handler::Item_func_or_sum_illegal_param()
        - Predicant_to_list_comparator::add_value_skip_null()
        - Predicant_to_list_comparator::add_value()
        - cmp_item_row::prepare_comparators()
        - cmp_item_row::aggregate_row_elements_for_comparison()
        - Cursor_ref::print_func()
      - Removes String_space() as it was only used in one cases and that
        could be simplified to not use String_space(), thanks to the fixed
        my_vsnprintf().
      - Added some const LEX_CSTRING's for common strings:
        - NULL_clex_str, DATA_clex_str, INDEX_clex_str.
      - Changed primary_key_name to a LEX_CSTRING
      - Renamed String::set_quick() to String::set_buffer_if_not_allocated() to
        clarify what the function really does.
      - Rename of protocol function:
        bool store(const char *from, CHARSET_INFO *cs) to
        bool store_string_or_null(const char *from, CHARSET_INFO *cs).
        This was done to both clarify the difference between this 'store' function
        and also to make it easier to find unoptimal usage of store() calls.
      - Added Protocol::store(const LEX_CSTRING*, CHARSET_INFO*)
      - Changed some 'const char*' arrays to instead be of type LEX_CSTRING.
      - class Item_func_units now used LEX_CSTRING for name.
      
      Other things:
      - Fixed a bug in mysql.cc:construct_prompt() where a wrong escape character
        in the prompt would cause some part of the prompt to be duplicated.
      - Fixed a lot of instances where the length of the argument to
        append is known or easily obtain but was not used.
      - Removed some not needed 'virtual' definition for functions that was
        inherited from the parent. I added override to these.
      - Fixed Ordered_key::print() to preallocate needed buffer. Old code could
        case memory overruns.
      - Simplified some loops when adding char * to a String with delimiters.
      b6ff139a
    • Monty's avatar
      Added ErrConvString.lex_cstring() to simplify code · b3bc02f9
      Monty authored
      This allows us to use String::append() without using strlen().
      
      The changes to the ErrConvString class where done by Alexander Barkov
      b3bc02f9
    • Monty's avatar
      Add support for minimum field width for strings to my_vsnprintf() · 5c7d243b
      Monty authored
      This patch adds support for right aligned strings and numbers.
      Left alignment is left as an exercise for anyone needing it.
      
      MDEV-25612 "Assertion `to <= end' failed in process_args" fixed.
      (Was caused by the original version of this patch)
      5c7d243b
    • Alexander Barkov's avatar
      Replaced base_flags_t::IS_AUTOGENERATED_NAME with IS_EXPLICT_NAME · 8dd6ad57
      Alexander Barkov authored
      The name change was to make the intention of the flag more clear and
      also because most usage of the old flag was to test for
      NOT IS_AUTOGENERATED_NAME.
      
      Note that the new flag is the inverse of the old one!
      8dd6ad57
    • Monty's avatar
      Split item->flags into base_flags and with_flags · 6079b46d
      Monty authored
      This was done to simplify copying of with_* flags
      
      Other things:
      - Changed Flags to C++ enums, which enables gdb to print
        out bit values for the flags. This also enables compiler
        errors if one tries to manipulate a non existing bit in
        a variable.
      - Added set_maybe_null() as a shortcut as setting the
        MAYBE_NULL flags was used in a LOT of places.
      - Renamed PARAM flag to SP_VAR to ensure it's not confused with persistent
        statement parameters.
      6079b46d
    • Monty's avatar
      Removed Item::is_fixed() and Item::has_subquery() · 7ca4e381
      Monty authored
      One should instead use Item::fixed() and Item::with_subquery()
      
      Removed Item::is_fixed() and has_subquery() and did the following replace:
      replace is_fixed() fixed() -- *.*
      replace 'has_subquery()' 'with_subquery()' -- *.*
      7ca4e381
    • Michael Widenius's avatar
      Remove calls to current_thd() in Item functions · 94485484
      Michael Widenius authored
      - Added THD argument to functions that calls current_thd() or
        new without a mem_root argument:
        make_same(), set_comparator_func(), set_cmp_func(), set_cmp_func*(),
        set_aggregator() and prepare_sum_aggregators()
      - Changed "new Class" to "new (thd->mem_root) Class"
      
      Almost all changes mechanical, no logic changes.
      94485484
    • Michael Widenius's avatar
      Change bitfields in Item to an uint16 · 3105c9e7
      Michael Widenius authored
      The reason for the change is that neither clang or gcc can do efficient
      code when several bit fields are change at the same time or when copying
      one or more bits between identical bit fields.
      Updated bits explicitely with & and | is MUCH more efficient than what
      current compilers can do.
      3105c9e7
    • Michael Widenius's avatar
      Renamed 'flags' variables in Item_class · 451c4ae5
      Michael Widenius authored
      This is a preparation for adding a flags variable to Item class
      451c4ae5
    • Michael Widenius's avatar
      Revert MDEV-14517 Cleanup for Item::with_subselect · 189d03da
      Michael Widenius authored
      Added back variable 'with_subquery' to Item class as a bit field.
      
      This made the code shorter, faster (removed some virtual methods,
      less code to create an initialized item etc) and made many Item's 7 bytes
      smaller.
      
      This is the last set of my patches the decreases the size of Item.
      
      Some examples from gdb:
      sizeof(Item):        144 -> 120
      sizeof(Item_func)    208 -> 184
      sizeof(Item_sum_max) 368 -> 344
      189d03da
    • Michael Widenius's avatar
      Revert MDEV-16592 "Change Item::with_sum_func to a virtual method" · ae39f4f6
      Michael Widenius authored
      Added back variable 'with_sum_func' to Item class as a bit field.
      
      This made the code shorter, faster (removed some virtual methods,
      less code to create an initialized item etc) and made many Item's 7 bytes
      smaller.
      
      The code is also easier to understand as 'with_sum_func' is threated as any
      other Item variable when creating or copying items.
      ae39f4f6
    • Monty's avatar
      963e5e40
    • Michael Widenius's avatar
      Removed Item::common_flags and replaced it with bit fields · 00d13069
      Michael Widenius authored
      This is to make the Item instances smaller
      00d13069
    • Monty's avatar
      Renamed Type_all_attributes::set_maybe_null() to set_type_maybe_null() · cd1782d2
      Monty authored
      This was done to have Item::set_maybe_null() as an inline function
      cd1782d2
    • Monty's avatar
      c6bf04ab
    • Monty's avatar
      Removed not used Item_type_holder() function · 61822a9b
      Monty authored
      61822a9b
    • Monty's avatar
      Enable BUILD scripts to work with clang · 60335ba1
      Monty authored
      60335ba1
    • Monty's avatar
    • Monty's avatar
      Fixes that enables my_new.cc (new wrapper using my_malloc) · e42130e9
      Monty authored
      This is not enabled by default, as there are leaks in the
      server that needs to be fixed first. One can compile
      with -DUSE_MYSYS_NEW to find the memory leaks from
      'new'. More comments can be found in mysys/my_new.cc
      e42130e9
    • Monty's avatar
      Fixed my_addr_resolve · a93c5145
      Monty authored
      When a server is compiled with -fPIE, my_addr_resolve needs to subtract the info.dli_fbase from symbol addresses in memory for addr2line to recognize them.
      When a server is compiled without -fPIE, my_addr_resolve should not do it.
      Unfortunately not all compilers define __PIE__ when -fPIE was used
      (e.g. older gcc doesn't), so we have to resort to run-time detection.
      a93c5145
    • Monty's avatar
      Report memory leaks from mariadbd if -T or --debug is used · 942a5a89
      Monty authored
      Before memory leaks was only reported if server stopped normally.
      This made it harder to find out where the leaks happened when
      debugging test cases.
      942a5a89
    • Monty's avatar
      Optimize usage of c_ptr(), c_ptr_quick() and String::alloc() · 36cdd5c3
      Monty authored
      The problem was that when one used String::alloc() to allocate a string,
      the String ensures that there is space for an extra NULL byte in the
      buffer and if not, reallocates the string. This is a problem with the
      String::set_int() that calls alloc(21), which forces extra
      malloc/free calls to happen.
      
      - We do not anymore re-allocate String if alloc() is called with the
        Allocated_length. This reduces number of malloc() allocations,
        especially one big re-allocation in Protocol::send_result_Set_metadata()
        for almost every query that produced a result to the connnected client.
      - Avoid extra mallocs when using LONGLONG_BUFFER_SIZE
        This can now be done as alloc() doesn't increase buffers if new length is
        not bigger than old one.
      - c_ptr() is redesigned to be safer (but a bit longer) than before.
      - Remove wrong usage of c_ptr_quick()
        c_ptr_quick() was used in many cases to get the pointer to the used
        buffer, even when it didn't need to be \0 terminated. In this case
        ptr() is a better substitute.
        Another problem with c_ptr_quick() is that it did not guarantee that
        the string would be \0 terminated.
      - item_val_str(), an API function not used currently by the server,
        now always returns a null terminated string (before it didn't always
        do that).
      - Ensure that all String allocations uses STRING_PSI_MEMORY_KEY. The old
        mixed usage of performance keys caused assert's when String buffers
        where shrunk.
      - Binary_string::shrink() is simplifed
      - Fixed bug in String(const char *str, size_t len, CHARSET_INFO *cs) that
        used Binary_string((char *) str, len) instead of Binary_string(str,len).
      - Changed argument to String() creations and String.set() functions to use
        'const char*' instead of 'char*'. This ensures that Alloced_length is
        not set, which gives safety against someone trying to change the
        original string. This also would allow us to use !Alloced_length in
        c_ptr() if needed.
      - Changed string_ptr_cmp() to use memcmp() instead of c_ptr() to avoid
        a possible malloc during string comparision.
      36cdd5c3
    • Monty's avatar
      Optimize Sql_alloc · da85ad79
      Monty authored
      - Remove 'dummy_for_valgrind' overrun marker as this doesn't help much.
        The element also distorts the sizes of objects a bit, which makes it
        harder to calculate gain in object sizes when doing size optimizations.
      - Replace usage of thd_get_current_thd() with _current_thd()
      - Avoid one extra call indirection when using thd_get_current_thd(), which
        is used by Sql_alloc, by replacing it with _current_thd()
      da85ad79
    • Monty's avatar
      Improved storage size for Item, Field and some other classes · c76eabfb
      Monty authored
      - Changed order of class fields to remove dead alignment space.
      - Changed bool fields in Item to bit fields.
      - Used packed enum's for some fields in common classes
      - Removed not used Item::rsize.
      - Changed some class variables from uint/int to smaller type int's.
      - Ensured that field_index is uint16 in all classes and functions. Fixed
        also that we proparly compare with NO_CACHED_FIELD_INDEX when checking
        if variable is not set.
      - Removed checking of highest bit of unireg_check (has not been used in
        a long time)
      - Fixed wrong arguments to make_cond_for_table() for join_tab_idx_arg
        from false to 0.
      
      One of the result was reducing the size if class Item with ~24 bytes
      c76eabfb
    • Monty's avatar
      Optimize size of lex structures · 8e8bda7f
      Monty authored
      LEX, st_select_lex, st_select_unit optimized for space:
      - Use bit fields for bool variables
      - Ensure that all bit fields are initialized (improves
        performance for init functions as all bit fields can be
        initalized with one memory access)
      - Move members around in above structures to remove alignment
        gaps
      
      Some savings:
      LEX: 7032 -> 6880
      THD: 25608 -> 25456
      st_select_lex_unit: 2048 -> 2008
      
      LEX::start():                    1321 -> 1245 instructions
      st_select_lex_unit::init_query()  284 ->  214 instructions
      st_select_lex::init_query():      766 ->  692 instructions
      st_select_lex::init_select():     563 ->  540 instructions
      
      Other things:
      - Removed not used LEX::select_allow_into
      - Fixed MDEV-25510 Assertion `sel->select_lock ==
         st_select_lex::select_lock_type::NONE' which was caused by this commit.
      8e8bda7f
    • Monty's avatar
      Added typedef decimal_digits_t (uint16) for number of digits in most · fa7d4abf
      Monty authored
      aspects of decimals and integers
      
      For fields and Item's uint8 should be good enough. After
      discussions with Alexander Barkov we choose uint16 (for now)
      as some format functions may accept +256 digits.
      
      The reason for this patch was to make the usage and storage of decimal
      digits simlar. Before this patch decimals was stored/used as uint8,
      int and uint.  The lengths for numbers where also using a lot of
      different types.
      
      Changed most decimal variables and functions to use the new typedef.
      
      squash! af7f09106b6c1dc20ae8c480bff6fd22d266b184
      
      Use decimal_digits_t for all aspects of digits (total, precision
      and scale), both for decimals and integers.
      fa7d4abf
    • Monty's avatar
      MDEV-23001 Precreate static Item_bool() to simplify code · aee84453
      Monty authored
      The following changes where done:
      - Create global Item: Item_false and Item_true
      - Replace all creation if 'FALSE' and 'TRUE' top level items used for
        WHERE/HAVING/ON clauses to use Item_false and Item_true.
      
      The benefit are:
      - Less and faster code
      - No test needed if we where able to create the new item.
      - Fixed possible errors if 'new' would have failed for the Item_bool's
      
      fixup! 470277728d2e27fe057cf33a437a9e40e1a04b61
      aee84453
    • Brandon Nesterenko's avatar
      MDEV-25222: mysqlbinlog --base64-output wrong option default drops BINLOG from output · 78a0fe79
      Brandon Nesterenko authored
      The --help comment for the --base64-output option in
      mysqlbinlog was hard to decipher. This quick patch aims
      to refine it.
      
      Reviewed By:
      ==========
      Andrei Elkin: <andrei.elkin@mariadb.com>
      78a0fe79
    • Marko Mäkelä's avatar
      MDEV-25691 fixup: Correctly drop orphan foreign keys · 27141581
      Marko Mäkelä authored
      innodb_drop_database_fk(): Use the correct length when comparing.
      Fix a debug assertion in previously unreachable code.
      This error was caught by MSAN.
      
      innodb_drop_database(): Correct the SQL for traversing SYS_FOREIGN.
      The incorrect code would cause orphan FOREIGN KEY entries to be
      left behind in the test innodb.alter_foreign_crash.
      27141581
    • Marko Mäkelä's avatar
      Merge 10.5 into 10.6 · 5d495fc4
      Marko Mäkelä authored
      5d495fc4
    • Marko Mäkelä's avatar
      MDEV-8334: Adjust test results · e3adb434
      Marko Mäkelä authored
      e3adb434
    • Marko Mäkelä's avatar
      Merge 10.4 into 10.5 · db8fb408
      Marko Mäkelä authored
      db8fb408
    • Rucha Deodhar's avatar
      MDEV-8334: Rename utf8 to utf8mb3 · 2fdb556e
      Rucha Deodhar authored
      This patch changes the main name of 3 byte character set from utf8 to
      utf8mb3. New old_mode UTF8_IS_UTF8MB3 is added and set TRUE by default,
      so that utf8 would mean utf8mb3. If not set, utf8 would mean utf8mb4.
      2fdb556e