1. 19 Feb, 2013 1 commit
  2. 18 Feb, 2013 2 commits
  3. 08 Feb, 2013 2 commits
  4. 04 Feb, 2013 1 commit
    • Vladislav Vaintroub's avatar
      MDEV-4127 : Export additional symbols when building RPM, · bfd179e8
      Vladislav Vaintroub authored
      to enable both recompiling mysqli or odbc from sources in addition to drop-in replacement functionality.
      
      The case in question is compiling mysqli from sources, that needs client_errors via ER() macro.
      
      Previously, we exported it as mysql_client_errors (compatibly to Fedora's style symbol renaming, see MDEV-3842).
      However, if MariaDB header files are used when compiling mysqli, client_errors needs to be exported with its original name.
      bfd179e8
  5. 02 Feb, 2013 1 commit
  6. 30 Jan, 2013 1 commit
    • Vladislav Vaintroub's avatar
      MDEV-4113: Assertion (group->connection_count > 0) fails with Percona server in replication test. · 1701ee33
      Vladislav Vaintroub authored
      Assertion happens in replication thread during THD destruction, when thread calls my_sync(), which in turn calls  thd_wait_begin() callback. Connection count can be 0, because the counter was decremented before THD destructor. 
      This assertion currently reproducible only in Percona server  and not in MariaDB, due to differences in replication code.
      
      Fixed by moving  code to decrement connection counter after the THD destructor.
      1701ee33
  7. 29 Jan, 2013 2 commits
  8. 28 Jan, 2013 6 commits
    • Vladislav Vaintroub's avatar
    • unknown's avatar
      Fix for MDEV-3948, and backport of the following collection of fixes and backports · f65e5841
      unknown authored
      from MariaDB 10.0.
        
      The bug in mdev-3948 was an instance of the problem fixed by Sergey's patch
      in 10.0 - namely that the range optimizer could change table->[read | write]_set,
      and not restore it.
        
      revno: 3471
      committer: Sergey Petrunya <psergey@askmonty.org>
      branch nick: 10.0-serg-fix-imerge
      timestamp: Sat 2012-11-03 12:24:36 +0400
      message:
        # MDEV-3817: Wrong result with index_merge+index_merge_intersection, InnoDB table, join, AND and OR conditions
        Reconcile the fixes from:
        #
        # guilhem.bichot@oracle.com-20110805143029-ywrzuz15uzgontr0
        # Fix for BUG#12698916 - "JOIN QUERY GIVES WRONG RESULT AT 2ND EXEC. OR
        # AFTER FLUSH TABLES [-INT VS NULL]"
        #
        # guilhem.bichot@oracle.com-20111209150650-tzx3ldzxe1yfwji6
        # Fix for BUG#12912171 - ASSERTION FAILED: QUICK->HEAD->READ_SET == SAVE_READ_SET
        # and
        #
        and related fixes from: BUG#1006164, MDEV-376:
        
        Now, ROR-merged QUICK_RANGE_SELECT objects make no assumptions about the values
        of table->read_set and table->write_set.
        Each QUICK_ROR_SELECT has (and had before) its own column bitmap, but now, all 
        QUICK_ROR_SELECT's functions that care: reset(), init_ror_merged_scan(), and 
        get_next()  will set table->read_set when invoked and restore it back to what 
        it was before the call before they return.
      
        This allows to avoid the mess when somebody else modifies table->read_set for 
        some reason.
      f65e5841
    • Sergei Golubchik's avatar
      5.3 merge · 87de27e4
      Sergei Golubchik authored
      87de27e4
    • unknown's avatar
    • Sergei Golubchik's avatar
      5.2 merge · 34e84c22
      Sergei Golubchik authored
      34e84c22
    • Sergei Golubchik's avatar
      5138bf42
  9. 26 Jan, 2013 2 commits
  10. 25 Jan, 2013 14 commits
    • Michael Widenius's avatar
      Automatic merge · 772bd60a
      Michael Widenius authored
      772bd60a
    • Vladislav Vaintroub's avatar
      fix embedded · 8199838a
      Vladislav Vaintroub authored
      8199838a
    • Michael Widenius's avatar
      Fixed MDEV-3890: Server crash inserting record on a temporary table after truncating it · ea1d5943
      Michael Widenius authored
      The problem was that a temporary table was re-created as a non-temporary table.
      
      
      mysql-test/suite/maria/truncate.result:
        Added test cases
      mysql-test/suite/maria/truncate.test:
        Added test cases
      sql/sql_truncate.cc:
        Mark that table to be created is a temporary table
      storage/maria/ha_maria.cc:
        Ensure that temporary tables are not transactional.
      ea1d5943
    • Vladislav Vaintroub's avatar
      Fix embedded build · db26ab8a
      Vladislav Vaintroub authored
      db26ab8a
    • Vladislav Vaintroub's avatar
      MDEV-3842, MDEV-3923 : · 76400fcc
      Vladislav Vaintroub authored
      Miscellaneous workarounds for  drop-in compatibility problems with Linux distributions, arounf versioning of the 
      MySQL 5.5 client shared library. There seems to be 3 different ways major distributions handle versioning
      
      1. Fedora  (also Mageia, and likely  other Redhat descendants) way 
         old, 5.1 API functions are given version libmysqlclient_16
         new API functions  (client plugins, mysql_stmt_next ) are given version libmysqlclient_18
         some extra functions beyond API are exported.
         some functions are renamed.
      
      2.Debian Wheezy way 
        all functions are given libmysqlclient_18 version
      
      3. Ubuntu  way (or MySQL/MariaDB download packages)
        no versioning
      
      UIp to this fix, MariaDB distributions did not have any versioning in the libraries, this rendered client library incompatible to distributions 
      thus exchanging  distribution's libmysqlclient.so.18.0.0  with MariaDB's did not work nicely (anywhere but on Ubuntu)
      
      
      THE FIX  
      is to build libraries the same way as distributions do it 
      - when building RPMs, use  same version script as Fedora does, Make sure to export extra-symbols, the same as Fedora exports.
      - when building DEBs, use the same version script as Debian Wheezy
      - do not use version scripts otherwise
      
      
      Also, makes sure that extensions of  MySQL APIs (asynchronous client functionality) is exported by  the shared libraries.
      76400fcc
    • Sergei Golubchik's avatar
      5.1 merge · e400450f
      Sergei Golubchik authored
      e400450f
    • Vladislav Vaintroub's avatar
      MDEV-3971 : problems installing MariaDB packages (conflicts with mysql-libs-5.5) · 88649405
      Vladislav Vaintroub authored
      FIx  : make "shared" RPM obsolete/provide mysql-libs
      88649405
    • unknown's avatar
      The problem was that expression with field after transformation (on the first execution) · 298008dc
      unknown authored
      reached by fix_fields() (via reference) before row which it belongs to (on the second execution)
      and fix_field for row did not follow usual protocol for Items with argument
      (first check that the item fixed then call fix_fields).
      
      Item_row::fix_field fixed.
      298008dc
    • Sergei Golubchik's avatar
      MDEV-729 lp:998028 - Server crashes on normal shutdown in closefrm after... · 7f208d3c
      Sergei Golubchik authored
      MDEV-729 lp:998028 - Server crashes on normal shutdown in closefrm after executing a query from MyISAM table
      
      don't write a key value into the record buffer - a key length can be larger then the record length.
      7f208d3c
    • Sergei Golubchik's avatar
      MDEV-759 lp:998340 - Valgrind complains on simple selects containing... · 326d2d56
      Sergei Golubchik authored
      MDEV-759 lp:998340 - Valgrind complains on simple selects containing expression DAY(FROM_UNIXTIME(-1))
      
      check item->null_value before using the result of item->val_int()
      326d2d56
    • Sergei Golubchik's avatar
      5.3 merge · 672b2938
      Sergei Golubchik authored
      client/mysqltest.cc:
        make --error to work for --change_user errors
      672b2938
    • Sergei Golubchik's avatar
      5.2 merge · de10e214
      Sergei Golubchik authored
      de10e214
    • Sergei Golubchik's avatar
      MDEV-4040 Replace deprecated SET OPTION syntax in mysqldump · 9142c50b
      Sergei Golubchik authored
      mysqldump.c: s/SET OPTION/SET/
      (OPTION was, hm, optional since 3.21, so there's no need to use SET OPTION even
      in the old compatibility modes)
      9142c50b
    • Sergei Golubchik's avatar
      MDEV-3909 remote user enumeration · fa7d0c4f
      Sergei Golubchik authored
      instead of returning Access denied on the incorrect user name,
      emulate the complete failed logic procedure, possibly with
      the change plugin packet.
      fa7d0c4f
  11. 24 Jan, 2013 2 commits
  12. 23 Jan, 2013 2 commits
  13. 22 Jan, 2013 1 commit
  14. 21 Jan, 2013 3 commits
    • Igor Babaev's avatar
      Merge 5.1->5.2 · 8127e631
      Igor Babaev authored
      8127e631
    • Igor Babaev's avatar
      Merge. · 82fe8a4e
      Igor Babaev authored
      82fe8a4e
    • Igor Babaev's avatar
      Fixed bug mdev-4063 (bug #56927). · fade3647
      Igor Babaev authored
      This bug could result in returning 0 for the expressions of the form 
      <aggregate_function>(distinct field) when the system variable  
      max_heap_table_size was set to a small enough number.
      It happened because the method Unique::walk() did not support
      the case when more than one pass was needed to merge the trees
      of distinct values saved in an external file.
      
      Backported a fix in grant_lowercase.test from mariadb 5.5.
      fade3647