1. 01 Mar, 2010 7 commits
  2. 26 Feb, 2010 17 commits
    • Georgi Kodinov's avatar
      merge 5.0-bugteam -> 5.1-bugteam · 5927a233
      Georgi Kodinov authored
      5927a233
    • Georgi Kodinov's avatar
      merge · 4c3005c7
      Georgi Kodinov authored
      4c3005c7
    • Alexey Kopytov's avatar
      Null merge of the InnoDB snapshot from mysql-5.1-bugteam · eaeef7c6
      Alexey Kopytov authored
      to mysql-trunk-merge.
      eaeef7c6
    • Alexey Kopytov's avatar
      Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. · 8266ebbe
      Alexey Kopytov authored
      Conflicts:
      
      Text conflict in scripts/Makefile.am
      Text conflict in sql/share/Makefile.am
      8266ebbe
    • Georgi Kodinov's avatar
      Bug #51468: mysqld_multi is broken in 5.1.44 · cc188fb9
      Georgi Kodinov authored
      Fixed a syntax error in mysqld_multi.sh
      cc188fb9
    • Sergey Vojtovich's avatar
      Merge innodb-5.1-ss6765 to 5.1-bugteam. · f476f83b
      Sergey Vojtovich authored
      f476f83b
    • Sergey Glukhov's avatar
      automerge · 80303d7e
      Sergey Glukhov authored
      80303d7e
    • Sergey Glukhov's avatar
      Bug#50995 Having clause on subquery result produces incorrect results. · 7fd2461c
      Sergey Glukhov authored
      The problem is that cond->fix_fields(thd, 0) breaks
      condition(cuts off 'having'). The reason of that is
      that NULL valued Item pointer is present in the
      middle of Item list and it breaks the Item processing
      loop.
      
      
      mysql-test/r/having.result:
        test case
      mysql-test/t/having.test:
        test case
      sql/item_cmpfunc.h:
        added ASSERT to make sure that we do not add NULL valued Item pointer
      sql/sql_select.cc:
        skip adding an item to condition if Item pointer is NULL.
        skip adding a list to condition if this list is empty.
      7fd2461c
    • Evgeny Potemkin's avatar
      Auto-merged fox for the bug#50843. · 97e5e12a
      Evgeny Potemkin authored
      97e5e12a
    • Evgeny Potemkin's avatar
      Bug#50843: Filesort used instead of clustered index led to · 09d5f8b7
      Evgeny Potemkin authored
      performance degradation.
      
      Filesort + join cache combination is preferred to full index scan because it
      is usually faster. But it's not the case when the index is clustered one.
      
      Now test_if_skip_sort_order function prefers filesort only if index isn't
      clustered.
      
      mysql-test/r/innodb_mysql.result:
        Added a test case for the bug#50843.
      mysql-test/t/innodb_mysql.test:
        Added a test case for the bug#50843.
      sql/sql_select.cc:
        Bug#50843: Filesort used instead of clustered index led to
        performance degradation.
        Now test_if_skip_sort_order function prefers filesort only if index isn't
        clustered.
      09d5f8b7
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot, fixes BUG#50691 · 27384521
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6669 | jyang | 2010-02-11 12:24:19 +0200 (Thu, 11 Feb 2010) | 7 lines
      branches/5.1: Fix bug #50691, AIX implementation of readdir_r
      causes InnoDB errors. readdir_r() returns an non-NULL value
      in the case of reaching the end of a directory. It should
      not be treated as an error return.
      
      rb://238 approved by Marko
      27384521
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot, fixes BUG#38901 · 572a1bf2
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6613 | inaam | 2010-02-09 20:23:09 +0200 (Tue, 09 Feb 2010) | 11 lines
      branches/5.1: Fix Bug #38901
      InnoDB logs error repeatedly when trying to load page into buffer pool
      
      In buf_page_get_gen() if we are unable to read a page (because of
      corruption or some other reason) we keep on retrying. This fills up
      error log with millions of entries in no time and we'd eventually run
      out of disk space. This patch limits the number of attempts that we
      make (currently set to 100) and after that we abort with a message.
      
      rb://241 Approved by: Heikki
      572a1bf2
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot, fixes BUG#49001 · ca05a2cf
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6545 | jyang | 2010-02-03 03:57:32 +0200 (Wed, 03 Feb 2010) | 8 lines
      branches/5.1: Fix bug #49001, "SHOW INNODB STATUS deadlock info
      incorrect when deadlock detection aborts". Print the correct
      lock owner when recursive function lock_deadlock_recursive()
      exceeds its maximum depth LOCK_MAX_DEPTH_IN_DEADLOCK_CHECK.
      
      rb://217, approved by Marko.
      ca05a2cf
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · c1974784
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6538 | sunny | 2010-01-30 00:43:06 +0200 (Sat, 30 Jan 2010) | 6 lines
      branches/5.1: Check *first_value every time against the column max
      value and  set *first_value to next autoinc if it's > col max value.
      ie.  not rely on what is passed in from MySQL.
      
      [49497] Error 1467 (ER_AUTOINC_READ_FAILED) on inserting a negative value
      rb://236
      c1974784
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 36fc6536
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6537 | sunny | 2010-01-30 00:35:00 +0200 (Sat, 30 Jan 2010) | 2 lines
      branches/5.1: Undo r6536.
      36fc6536
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 1c7350df
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6536 | sunny | 2010-01-30 00:13:42 +0200 (Sat, 30 Jan 2010) | 6 lines
      branches/5.1: Check *first_value everytime against the column max
      value and  set *first_value to next autoinc if it's > col max value.
      ie.  not rely on what is passed in from MySQL.
      
      [49497] Error 1467 (ER_AUTOINC_READ_FAILED) on inserting a negative value
      rb://236
      1c7350df
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 78a5c0ca
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6535 | sunny | 2010-01-30 00:08:40 +0200 (Sat, 30 Jan 2010) | 11 lines
      branches/5.1: Undo the change from r6424. We need to return DB_SUCCESS even
      if we were unable to initialize the tabe autoinc value. This is required for
      the open to succeed. The only condition we currently treat as a hard error
      is if the autoinc field instance passed in by MySQL is NULL.
      
      Previously if the table autoinc value was 0 and the next value was requested
      we had an assertion that would fail. Change that assertion and treat a value
      of 0 to mean that the autoinc system is unavailable. Generation of next
      value will now return failure.
      
      rb://237
      78a5c0ca
  3. 25 Feb, 2010 12 commits
    • Alexander Nozdrin's avatar
      Fix mysqld--help-notwin.result. · 096cabaf
      Alexander Nozdrin authored
      096cabaf
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-next-mr. · 56cc11b5
      Alexander Nozdrin authored
      56cc11b5
    • Alexander Nozdrin's avatar
      Fix default.conf. · 6b0f9a7d
      Alexander Nozdrin authored
      6b0f9a7d
    • Alexander Nozdrin's avatar
      Fix default.conf. · 3ee53edd
      Alexander Nozdrin authored
      3ee53edd
    • Gleb Shchepa's avatar
      Bug #45360: wrong results · ebaba11c
      Gleb Shchepa authored
      Propagation of a large unsigned numeric constant
      in the WHERE expression led to wrong result.
      
      For example,
      "WHERE a = CAST(0xFFFFFFFFFFFFFFFF AS USIGNED) AND FOO(a)",
      where a is an UNSIGNED BIGINT, and FOO() accepts strings,
      was transformed to "... AND FOO('-1')".
      
      That has been fixed.
      
      Also EXPLAIN EXTENDED printed incorrect numeric constants in
      transformed WHERE expressions like above. That has been
      fixed too.
      
      
      mysql-test/r/bigint.result:
        Added test case for bug #45360.
      mysql-test/t/bigint.test:
        Added test case for bug #45360.
      sql/item.cc:
        Bug #45360: wrong results
        
        As far as Item_int_with_ref (and underlaying Item_int)
        class accepts both signed and unsigned 64bit values,
        Item_int::val_str and Item_int::print methods have been
        modified to take into account unsigned_flag.
      ebaba11c
    • Vladislav Vaintroub's avatar
      Workaround crash with dtraced shared libraries under GCC 3.4.6 on 32 bit Solaris. · 684f4c3c
      Vladislav Vaintroub authored
      Crash happens in dlopen() code when trying to load the library. Crash does not happen when library is 
      not DTrace instrumented . Additionally, crash does not happen with default Solaris 10 GCC 3.4.3 and
      it does not happen if main executable is instrumented.
      
      So , just check for this specific situation (32 bit, GCC3.4.6 , Solaris) and disable Dtrace in shared libraries.
      We have only single plugin so far that is instrumented (ha_example)
      684f4c3c
    • Alexey Kopytov's avatar
      Automerge. · c50098c9
      Alexey Kopytov authored
      c50098c9
    • Christopher Powers's avatar
      Bug #48739 MySQL crashes on specific INTERVAL in select query · 271ac746
      Christopher Powers authored
            
      Fixed crash caused by x64 int/long incompatibility introduced
      in Bug #29125.
      
      
      sql/item_timefunc.cc:
        Fixed crash caused by int/long incompatibility on x64 systems.
                        
        Changed two "uint" casts and a "long" declartion to "int" in order to
        ensure that the integer sign is preserved.
                        
        See Bug #48739 for details.
      271ac746
    • Alexey Kopytov's avatar
      Bug #50335: Assertion `!(order->used & map)' in eq_ref_table · f380b946
      Alexey Kopytov authored
       
      The problem was in an incorrect debug assertion. The expression 
      used in the failing assertion states that when finding 
      references matching ORDER BY expressions, there can be only one 
      reference to a single table. But that does not make any sense, 
      all test cases for this bug are valid examples with multiple 
      identical WHERE expressions referencing the same table which
      are also present in the ORDER BY list. 
       
      Fixed by removing the failing assertion. We also have to take 
      care of the 'found' counter so that we count multiple 
      references only once. We rely on this fact later in 
      eq_ref_table(). 
      
      mysql-test/r/join.result:
        Added a test case for bug #50335.
      mysql-test/t/join.test:
        Added a test case for bug #50335.
      sql/sql_select.cc:
        Removing the assertion in eq_ref_table() as it does not make
        any sense. We also have to take care of the 'found' counter so 
        that we count multiple references only once. We rely on this 
        fact later in eq_ref_table().
      f380b946
    • Georgi Kodinov's avatar
      merge · 375ce0e5
      Georgi Kodinov authored
      375ce0e5
    • Georgi Kodinov's avatar
      1f17562f
    • Vladislav Vaintroub's avatar
      On Solaris, overwrite CMake's proposed thread library -lthread with -lpthread. · 0bc8d9a1
      Vladislav Vaintroub authored
      -lthread works fine in most cases, but at least with gcc 3.4.6 on x86, dlopen() crashes when libpthread is not used. 
      Note : the workaround existed prior and did not work  since CMAKE_THREADS_LIBS_INIT was already
       in cache.  Now, use SET(.. CACHE FORCE)  to overwrite the cached value.
      0bc8d9a1
  4. 24 Feb, 2010 4 commits
    • Vladislav Vaintroub's avatar
      merge · 2771f7b6
      Vladislav Vaintroub authored
      2771f7b6
    • Jonathan Perkin's avatar
      Some CMake packaging fixes: · 61ab61ec
      Jonathan Perkin authored
       - Remove INSTALL-BINARY from installed docs directory, we provide a copy
         in the root directory (but perhaps this should be revisited later).
      
       - Disable audit_null and daemon_example plugins.
      
       - Fix the docs directory.
      
       - Remove mysql-test/Makefile.in
      
       - Build and install mysql_tzinfo_to_sql
      
       - Remove share/charsets/languages.html
      61ab61ec
    • Vladislav Vaintroub's avatar
      #51466 : Source packages are broken with cmake in a cmake-agnostic environment · a2b69229
      Vladislav Vaintroub authored
      In the worst case possible scenario (no bzr, in-source build),
      make dist produced a package that compiled ok with autotools
      but failed to package because extra make_binary_distribution was
      found in source package and was not built. make_binary_distribution
      contained paths of the build machine.
      
      Fix:  exclude some scripts that are produced in cmake build. 
      Note that there is no good general fix for it in this specific scenario.
      it is advisable to build source packages out of source or in bzr repo.
      a2b69229
    • Vladislav Vaintroub's avatar
      Fix --with-ssl mappping (--with-ssl=dir should be "yes" or · 300622fd
      Vladislav Vaintroub authored
      actually "system"), --with-ssl should be "bundled".
      
      Fixes error on sol-gcc-x86, where build machine had  openssl but not
      the test box.
      300622fd