1. 15 Dec, 2009 6 commits
    • Georgi Kodinov's avatar
      Bug #48709: Assertion failed in sql_select.cc:11782: · 188c6f8c
      Georgi Kodinov authored
       int join_read_key(JOIN_TAB*)
      
      The eq_ref access method TABLE_REF (accessed through 
      JOIN_TAB) to save state and to track if this is the 
      first row it finds or not.
      This state was not reset on subquery re-execution
      causing an assert.
      
      Fixed by resetting the state before the subquery 
      re-execution.
      188c6f8c
    • Mattias Jonsson's avatar
      merge · dd5550d3
      Mattias Jonsson authored
      dd5550d3
    • Alexander Barkov's avatar
      Bug#49134 5.1 server segfaults with 2byte collation file · cff23162
      Alexander Barkov authored
      Problem: add_collation did not check that cs->number is smaller
      than the number of elements in the array all_charsets[],
      so server could crash when loading an Index.xml file with
      a collation ID greater the number of elements 
      (for example when downgrading from 5.5).
      
      Fix: adding a condition to check that cs->number is not out of valid range.
      cff23162
    • Jon Olav Hauglid's avatar
      Bug #48995 abort missing DBUG_RETURN or .. in function "check_key_in_view" · 4578a5c6
      Jon Olav Hauglid authored
      check_key_in_view() had one code branch which returned with "return TRUE"
      rather than "DBUG_RETURN(TRUE)". Only affected debug builds.
      
      No test case added.
      4578a5c6
    • He Zhenxing's avatar
      bug#49536 - deadlock on rotate_and_purge when using expire_logs_days · fb7214ae
      He Zhenxing authored
      Problem is that purge_logs implementation in ndb (ndbcluster_binlog_index_purge_file)
      calls mysql_parse (with (thd->options & OPTION_BIN_LOG) === 0)) 
      but MYSQL_BIN_LOG first takes LOCK_log and then checks thd->options
      
      Solution in this patch, changes so that rotate_and_purge does not hold
      LOCK_log when calling purge_logs_before_date. I think this is safe
      as other "purge"-function(s) is called wo/ holding LOCK_log, e.g purge_master_logs
      fb7214ae
    • unknown's avatar
      Bug #34628 LOAD DATA CONCURRENT INFILE drops CONCURRENT in binary log · e813587b
      unknown authored
      'LOAD DATA CONCURRENT [LOCAL] INFILE ...' statment only is binlogged as
      'LOAD DATA [LOCAL] INFILE ...' in SBR and MBR.  As a result, if replication is on, 
      queries on slaves will be blocked by the replication SQL thread.
      
      This patch write code to write 'CONCURRENT' into the log event if 'CONCURRENT' option
      is in the original statement in SBR and MBR. 
      e813587b
  2. 14 Dec, 2009 9 commits
  3. 13 Dec, 2009 3 commits
    • unknown's avatar
      This is a patch for Bug#48500 · 71c54b8c
      unknown authored
      5.0 buffer overflow for ER_UPDATE_INFO, or truncated info message in 5.1
            
      5.0.86 has a buffer overflow/crash, and 5.1.40 has a truncated message.
            
      errmsg.txt contains this:
            
      ER_UPDATE_INFO
      rum "Linii identificate (matched): %ld  Schimbate: %ld  Atentionari 
      (warnings): %ld"
      When that is sprintf'd into a buffer of STRING_BUFFER_USUAL_SIZE size,
      a buffer overflow can happen.
            
      The solution to this is to use MYSQL_ERRMSG_SIZE for the buffer size, 
      instead of STRING_BUFFER_USUAL_SIZE. This will allow longer strings. 
      To avoid potential crashes, we will also use my_snprintf instead of
      sprintf.
      
      sql/sql_update.cc:
        sing MYSQL_ERRMSG_SIZE instead of STRING_BUFFER_USUAL_SIZE.
        Using my_snprintf instead of sprintf.
      71c54b8c
    • Alexey Kopytov's avatar
      Automerge · d65fdb31
      Alexey Kopytov authored
      d65fdb31
    • Alexey Kopytov's avatar
      Bug #42849: innodb crash with varying time_zone on partitioned · c08e6c88
      Alexey Kopytov authored
                  timestamp primary key 
       
      Since TIMESTAMP values are adjusted by the current time zone  
      settings in both numeric and string contexts, using any 
      expressions involving TIMESTAMP values as a  
      (sub)partitioning function leads to undeterministic behavior of  
      partitioned tables. The effect may vary depending on a storage  
      engine, it can be either incorrect data being retrieved or  
      stored, or an assertion failure. The root cause of this is the  
      fact that the calculated partition ID may differ from a  
      previously calculated ID for the same data due to timezone  
      adjustments of the partitioning expression value. 
       
      Fixed by disabling any expressions involving TIMESTAMP values  
      to be used in partitioning functions with the follwing two 
      exceptions: 
       
      1. Creating or altering into a partitioned table that violates 
      the above rule is not allowed, but opening existing such tables 
      results in a warning rather than an error so that such tables 
      could be fixed. 
       
      2. UNIX_TIMESTAMP() is the only way to get a 
      timezone-independent value from a TIMESTAMP column, because it 
      returns the internal representation (a time_t value) of a 
      TIMESTAMP argument verbatim. So UNIX_TIMESTAMP(timestamp_column)
      is allowed and should be used to fix existing tables if one 
      wants to use TIMESTAMP columns with partitioning.
      
      mysql-test/r/partition_bug18198.result:
        Corrected the error.
      mysql-test/r/partition_error.result:
        Corrected error texts.
        Added test cases for bug #42849.
      mysql-test/t/partition_bug18198.test:
        Corrected error code.
      mysql-test/t/partition_error.test:
        Corrected error codes.
        Added test cases for bug #42849.
      sql/item.h:
        Added is_timezone_dependent_processor() to Item.
      sql/item_func.h:
        Added has_timestamp_args() and the implementation of
        is_timezone_dependent_processor() for Item_func.
      sql/item_timefunc.h:
        Added is_timezone_dependent_processor() to 
        Item_func_unix_timestamp.
      sql/share/errmsg.txt:
        Renamed ER_CONST_EXPR_IN_PARTITION_FUNC_ERROR to
        ER_WRONG_EXPR_IN_PARTITION_FUNC_ERROR to better reflect the
        meaning. Adjusted the error message.
      sql/sql_partition.cc:
        Modified fix_fields_part_func() to walk through partitioning
        expression tree with is_timezone_dependent_processor() and issue
        a warning/error if it depends on the timezone settings.
        
        Changed fix_fields_part_func() to a static function since it is
        not used anywhere except sql_partition.cc
      sql/sql_partition.h:
        Removed the unneeded declaration of fix_fields_part_func()
        since it is now a static function.
      sql/sql_yacc.yy:
        ER_CONST_EXPR_IN_PARTITION_FUNC_ERROR ->
        ER_WRONG_EXPR_IN_PARTITION_FUNC_ERROR.
      c08e6c88
  4. 12 Dec, 2009 1 commit
    • Staale Smedseng's avatar
      Bug #45058 init_available_charsets uses double checked locking · 8969530c
      Staale Smedseng authored
            
      As documented in the bug report, the double checked locking
      pattern has inherent issues, and cannot guarantee correct
      initialization.
      
      This patch replaces the logic in init_available_charsets()
      with the use of pthread_once(3). A wrapper function,
      my_pthread_once(), is introduced and is used in lieu of direct
      calls to init_available_charsets(). Related defines
      MY_PTHREAD_ONCE_* are also introduced.
      
      For the Windows platform, the implementation in lp:sysbench is
      ported. For single-thread use, a simple define calls the
      function and sets the pthread_once control variable.
      
      Charset initialization is modified to use my_pthread_once().
      
      include/my_no_pthread.h:
        Dummy my_pthread_once() for single thread use.
      include/my_pthread.h:
        Declaration for new function my_pthread_once().
      mysys/charset.c:
        Logic in init_available_charsets() is simplified. 
        Using my_pthread_once() for all calls to this func.
      mysys/my_winthread.c:
        Windows implementation of my_pthread_once().
      8969530c
  5. 11 Dec, 2009 13 commits
    • Kent Boortz's avatar
      Null merge of change in 5.0 to use -D_WIN32_WINNT=0x0500, Windows 2000 · 0654e74a
      Kent Boortz authored
      compatibility, not to change the -D_WIN32_WINNT=0x0501 in 5.1, XP
      compatibility.
      0654e74a
    • Kent Boortz's avatar
      Define _WIN32_WINNT to the minimum supported Windows version, 0x0500 i.e · 794e2063
      Kent Boortz authored
      Windows 2000.
            
            Visual Studio 2003 and 2005 require
              _WIN32_WINNT >= 0x0500 (Win2000)  for TryEnterCriticalSection.
      794e2063
    • Georgi Kodinov's avatar
      merge · 35adb5cf
      Georgi Kodinov authored
      35adb5cf
    • Georgi Kodinov's avatar
      merge · ca2d2267
      Georgi Kodinov authored
      ca2d2267
    • Georgi Kodinov's avatar
      merge · 492ff989
      Georgi Kodinov authored
      492ff989
    • Georgi Kodinov's avatar
      merge · a72c4259
      Georgi Kodinov authored
      a72c4259
    • Georgi Kodinov's avatar
      merge of bug #49250 to 5.1-bugteam · 97620e3b
      Georgi Kodinov authored
      97620e3b
    • Evgeny Potemkin's avatar
      Auto-merged fix for bug#49489. · 684c7aba
      Evgeny Potemkin authored
      684c7aba
    • V Narayanan's avatar
      merging with mysql-5.1-bugteam · 360b2ff4
      V Narayanan authored
      360b2ff4
    • V Narayanan's avatar
      Bug#49521 SHOW CREATE TABLE on IBMDB2I tables has incorrect fk constraint format · 3fded1b6
      V Narayanan authored
      The fix inserts newline and comma characters as appropriate
      into the constraint reporting code to match the formatting
      required by SHOW CREATE TABLE. Additionally, a erroneously
      duplicated copy of check_if_incompatible_data() was removed
      from db2i_constraints.cc since the correct version is already
      in ha_ibmdb2i.cc.
      
      storage/ibmdb2i/db2i_constraints.cc:
        Bug#49521 SHOW CREATE TABLE on IBMDB2I tables has incorrect fk constraint format
        
        - Insert newline and comma characters into the constraint reporting
          code to match the formatting required by SHOW CREATE TABLE.
        
        - Remove an erroneous copy of check_if_incompatible_data() from
          db2i_constraints.cc.
      3fded1b6
    • V Narayanan's avatar
      Bug#49329 example (and other) engines use wrong collation for open tables hash · e3c1ee24
      V Narayanan authored
      This fix changes the character set used within the
      IBMDB2I handler to hash table names to information
      about open tables. Previously, tables with names
      that differed only in letter case would hash to the
      same data structure. This caused incorrect behavior
      or errors when two such tables were in use simultaneously.
      
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_49329.result:
        Bug#49329 example (and other) engines use wrong collation for open tables hash
        
        Result file for the test case.
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_49329.test:
        Bug#49329 example (and other) engines use wrong collation for open tables hash
        
        Test case for the bug fix.
      storage/ibmdb2i/ha_ibmdb2i.cc:
        Bug#49329 example (and other) engines use wrong collation for open tables hash
        
        change the character set used within the IBMDB2I
        handler to hash table names to information about
        open tables.
      e3c1ee24
    • unknown's avatar
      Bug #48742 Replication: incorrect help text for --init-slave · ba71a9e5
      unknown authored
            
      The help text for --init-slave=name:
      "Command(s) that are executed when a slave connects to this master".
      This text indicate that the --init-slave option is set on a  master 
      server, and the master server passes the option's argument to slave 
      which connects to it. This is wrong. Actually the --init-slave option 
      just can be set on a slave server, and then the slave server executes 
      the argument each time the SQL thread starts.
      
      Correct the help text for --init-slave option as following:
      "Command(s) that are executed by a slave server each time the SQL thread starts."
      
      
      sql/mysqld.cc:
        Correct the help text for --init-slave option.
      ba71a9e5
    • unknown's avatar
      Bug #48742 Replication: incorrect help text for --init-slave · 18d09c01
      unknown authored
      The help text for --init-slave=name:
      "Command(s) that are executed when a slave connects to this master".
      This text indicate that the --init-slave option is set on a  master 
      server, and the master server passes the option's argument to slave 
      which connects to it. This is wrong. Actually the --init-slave option 
      just can be set on a slave server, and then the slave server executes 
      the argument each time the SQL thread starts.
      
      Correct the help text for --init-slave option as following:
      "Command(s) that are executed by a slave server each time the SQL thread starts."
      
      
      sql/mysqld.cc:
        Correct the help text for --init-slave option.
      18d09c01
  6. 10 Dec, 2009 8 commits
    • Georgi Kodinov's avatar
      merge · 7b174dca
      Georgi Kodinov authored
      7b174dca
    • Georgi Kodinov's avatar
      Bug #49250 : spatial btree index corruption and crash · 30e51fe8
      Georgi Kodinov authored
      SPATIAL and FULLTEXT indexes don't support algorithm
      selection. 
      Disabled by creating a special grammar rule for these
      in the parser.
      Added some encasulation of duplicate parser code.
      30e51fe8
    • Ramil Kalimullin's avatar
      Auto-merge. · e1d4ad39
      Ramil Kalimullin authored
      e1d4ad39
    • Ramil Kalimullin's avatar
      Manual merge. · c888a4a2
      Ramil Kalimullin authored
      c888a4a2
    • Gleb Shchepa's avatar
      Bug #49480: WHERE using YEAR columns returns unexpected results · 32463833
      Gleb Shchepa authored
      A few problems were found in the fix for bug 43668:
      1) Comparison of the YEAR column with NULL always returned TRUE;
      2) Comparison of the YEAR column with constants always returned
         unpredictable result;
      3) Unnecessary conversion warnings when comparing a non-integer
         constant with a NULL value in the YEAR column;
      
      The problems described above have been resolved with an
      exception: zero (i.e. invalid) YEAR column value comparison
      with 00 or 2000 still fail (it is not a regression and it was
      not a regression), so MIN/MAX on YEAR column containing zero
      value still fail.
      
      
      mysql-test/r/type_year.result:
        Test case for bug #49480.
      mysql-test/t/type_year.test:
        Test case for bug #49480.
      sql/item_cmpfunc.cc:
        - The get_year_value() function has been modified to make its
          return value compatible with the get_datetime_value() return
          value (i.e. to convert numeric values into the YYYY0000000000
          (YYYY-00-00 00:00:00) form.
        
        - The Arg_comparator::set_cmp_func method has been modified to
          use the get_year_value function if get_datetime_value() is not
          applicable.
          From now only 2 cases have a special processing there:
          * both comparing items have MYSQL_TYPE_YEAR field type
                  or
          * one item have is MYSQL_TYPE_YEAR and other one is
            is_datetime()-compliant.
        
        - New helper function try_year_cmp_func() has been
          added for the better code readability to call from
          Arg_comparator::set_cmp_func().
        
        - The Arg_comparator::compare_year method has been removed
          since get_year_value() is compatible with the old
          Arg_comparator::compare_datetime method that doesn't have
          problems #1-#3 (see whole patch entry commentary).
      sql/item_cmpfunc.h:
        - New helper function try_year_cmp_func() has been
          added for the better code readability to call from
          Arg_comparator::set_cmp_func().
        
        - Unnecessary Arg_comparator::year_as_datetime and
          Arg_comparator::compare_year() declarations have been
          removed.
      32463833
    • Ramil Kalimullin's avatar
      Auto-merge. · 36e019c9
      Ramil Kalimullin authored
      36e019c9
    • He Zhenxing's avatar
      Auto merge · 34c08c15
      He Zhenxing authored
      34c08c15
    • He Zhenxing's avatar
      Merge from 5.0-bugteam · f8d16332
      He Zhenxing authored
      f8d16332