1. 19 Sep, 2006 1 commit
    • unknown's avatar
      BUG#10974 - No error message if merge table based on union of innodb, memory · 23fefc88
      unknown authored
      Fixed confusing error message from the storage engine when
      it fails to open underlying table. The error message is issued
      when a table is _opened_ (not when it is created).
      
      
      myisammrg/myrg_open.c:
        Set my_errno to HA_ERR_WRONG_MRG_TABLE_DEF if attempt to open
        underlying table failed.
      mysql-test/r/merge.result:
        A test case for bug#10974.
      mysql-test/r/repair.result:
        Fixed a test case according to patch for bug#10974.
      mysql-test/t/merge.test:
        A test case for bug#10974.
      sql/share/english/errmsg.txt:
        Better error message if we fail to open underlying table.
      sql/table.cc:
        Report error from handler with print_error instead of frm_error. This
        fixes confusing error message from the handler. Actually this is
        backported from 5.0.
      23fefc88
  2. 18 Sep, 2006 2 commits
  3. 15 Sep, 2006 3 commits
  4. 14 Sep, 2006 3 commits
  5. 12 Sep, 2006 2 commits
    • unknown's avatar
      item_cmpfunc.cc: · f3e83870
      unknown authored
        Removed changes to the Item_func_between::fix_length_and_dec() made in the fix for bug#16377
      query_cache.result:
        Corrected a test case after removing a fix for bug#16377
      
      
      mysql-test/r/query_cache.result:
        Corrected a test case after removing a fix for bug#16377
      sql/item_cmpfunc.cc:
        Removed changes to the Item_func_between::fix_length_and_dec() made in the fix for bug#16377
      f3e83870
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 562763f1
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-bug14400
      
      
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      myisam/mi_rkey.c:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Manual merge
      562763f1
  6. 08 Sep, 2006 1 commit
    • unknown's avatar
      Bug#21555: incorrect behavior with INSERT ... ON DUPL KEY UPDATE and VALUES · 54caf667
      unknown authored
       VALUES() was considered a constant. This caused replacing 
       (or pre-calculating) it using uninitialized values before the actual
       execution takes place.
       Mark it as a non-constant (still not dependent of tables) to prevent
       the pre-calculation.
      
      
      mysql-test/r/insert_update.result:
        Bug#21555: incorrect behavior with INSERT ... ON DUPL KEY UPDATE and VALUES
         - test case.
         - EXPLAIN output changed due to VALUES() not being considered a constant 
           anymore
      mysql-test/t/insert_update.test:
        Bug#21555: incorrect behavior with INSERT ... ON DUPL KEY UPDATE and VALUES
         - test case.
      sql/item.h:
        Bug#21555: incorrect behavior with INSERT ... ON DUPL KEY UPDATE and VALUES
         - mark Item_insert_value as non-constant to prevent early calculation.
      54caf667
  7. 07 Sep, 2006 3 commits
    • unknown's avatar
      query_cache.result, func_time.test, type_date.result, func_time.result: · aa840645
      unknown authored
        Corrected test case after removal of fix for bug#16377         
      type_date.test:
        Corrected test case after removal of fix for bug#16377
      item_cmpfunc.cc:
        Removed changes to the agg_cmp_type() made in the for bug#16377
      
      
      mysql-test/t/type_date.test:
        Corrected test case after removal of fix for bug#16377
      mysql-test/t/func_time.test:
        Corrected test case after removal of fix for bug#16377
      mysql-test/r/type_date.result:
        Corrected test case after removal of fix for bug#16377
      mysql-test/r/query_cache.result:
        Corrected test case after removal of fix for bug#16377
      mysql-test/r/func_time.result:
        Corrected test case after removal of fix for bug#16377
      sql/item_cmpfunc.cc:
        Removed changes to the agg_cmp_type() made in the for bug#16377
      aa840645
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.0-bug14400 · 203d0999
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-bug14400
      
      
      myisam/mi_rkey.c:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Manual merge from 4.0
      mysql-test/r/myisam.result:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Manual merge from 4.0
      mysql-test/t/myisam.test:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Manual merge from 4.0
      203d0999
    • unknown's avatar
      Bug#14400 - Query joins wrong rows from table which is subject of · 71314617
      unknown authored
                  "concurrent insert"
      Additional fix for full keys and test case.
      
      
      myisam/mi_rkey.c:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Additional fix for full keys.
      mysql-test/r/myisam.result:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Additional results.
      mysql-test/t/myisam.test:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Additional test case.
      71314617
  8. 05 Sep, 2006 3 commits
  9. 04 Sep, 2006 4 commits
    • unknown's avatar
      Bug #21392: multi-table delete with alias table name fails with · 1431966d
      unknown authored
                  1003: Incorrect table name
      in multi-table DELETE the set of tables to delete from actually 
      references then tables in the other list, e.g:
      DELETE alias_of_t1 FROM t1 alias_of_t1 WHERE ....
      is a valid statement.
      So we must turn off table name syntactical validity check for alias_of_t1 
      because it's not a table name (even if it looks like one).
      In order to do that we add a special flag (TL_OPTION_ALIAS) to 
      disable the name checking for the aliases in multi-table DELETE.
      
      
      mysql-test/r/delete.result:
        Bug #21392: multi-table delete with alias table name fails with
                    1003: Incorrect table name
         - test case
      mysql-test/t/delete.test:
        Bug #21392: multi-table delete with alias table name fails with
                    1003: Incorrect table name
         - test case
      sql/mysql_priv.h:
        Bug #21392: multi-table delete with alias table name fails with
                    1003: Incorrect table name
         - add a special flag to disable the name checking for the aliases
           in multi-table DELETE
      sql/sql_parse.cc:
        Bug #21392: multi-table delete with alias table name fails with
                    1003: Incorrect table name
         - add a special flag to disable the name checking for the aliases
           in multi-table DELETE
      sql/sql_yacc.yy:
        Bug #21392: multi-table delete with alias table name fails with
                    1003: Incorrect table name
         - add a special flag to disable the name checking for the aliases
           in multi-table DELETE
      1431966d
    • unknown's avatar
      BUG#21787: COUNT(*) + ORDER BY + LIMIT returns wrong result · 10395408
      unknown authored
      Fix an error in the bug fix.
      
      
      sql/sql_select.cc:
        Use a local variable to iterate over group items, since
        'group' is used later in a condition.
      10395408
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 19dc0e41
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      
      sql/log.cc:
        Auto merged
      19dc0e41
    • unknown's avatar
      bug#21965 - replication · d2d605e4
      unknown authored
        fix deadlock if master switches log file in parallell with "show master logs"
        
      
      
      sql/log.cc:
        add raw_get_current_log which dont take log mutex
      sql/sql_class.h:
        add raw_get_current_log which dont take log mutex
      sql/sql_repl.cc:
        Fix lock order i.e first log_lock then index_lock
      d2d605e4
  10. 01 Sep, 2006 7 commits
  11. 31 Aug, 2006 3 commits
  12. 30 Aug, 2006 8 commits
    • unknown's avatar
      Merge maint2.mysql.com:/data/localhome/tsmith/bk/g41 · 0f342b6a
      unknown authored
      into  maint2.mysql.com:/data/localhome/tsmith/bk/41
      
      
      0f342b6a
    • unknown's avatar
      Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41 · f468d000
      unknown authored
      into  maint2.mysql.com:/data/localhome/tsmith/bk/41
      
      
      BUILD/SETUP.sh:
        Auto merged
      f468d000
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my40-bug04053 · 8fb0f8a2
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053
      
      
      mysys/my_read.c:
        Auto merged
      8fb0f8a2
    • unknown's avatar
      Bug#4053: too many of "error 1236: 'binlog truncated in the middle of \ · 626abc52
      unknown authored
      	event' from master"
      
      Since there is no repeatable test case, and this is obviously wrong, this is
      the most conservative change that might possibly work.  
      
      The syscall  read()  wasn't checked for a negative return value for an
      interrupted read.  The kernel  sys_read()  returns -EINTR, and the "library" 
      layer maps that to return value of -1 and sets  errno  to EINTR.  It's 
      impossible (on Linux) for  read()  to set errno EINTR without the return 
      value being -1 .
      
      So, if we're checking for EINTR behavior, we should not require that the
      return value be zero.
      
      
      mysys/my_read.c:
        The read() syscall should check for negative one, since that (usually) signals
        errors (like being interrupted) and zero (usually) signals end-of-file .
      626abc52
    • unknown's avatar
    • unknown's avatar
      portability fix in BUILD/* for solaris · 71583c89
      unknown authored
      71583c89
    • unknown's avatar
      Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/40 · 4321eb12
      unknown authored
      into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41
      
      
      BUILD/SETUP.sh:
        SCCS merged
      4321eb12
    • unknown's avatar
      Bug#20393 User name truncation in mysql client · ddb9f866
      unknown authored
      Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
      
      
      include/mysql_com.h:
        Bug#20393 User name truncation in mysql client
        Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
        added new constants NAME_BYTE_LEN, USERNAME_BYTE_LENGTH, SYSTEM_CHARSET_MBMAXLEN
      mysql-test/r/ctype_utf8.result:
        Bug#20393 User name truncation in mysql client
        Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
        test case
      mysql-test/t/ctype_utf8.test:
        Bug#20393 User name truncation in mysql client
        Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
        test case
      sql-common/client.c:
        Bug#20393 User name truncation in mysql client
        Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
        increased buffers for user name & db
      sql/sql_acl.cc:
        Bug#20393 User name truncation in mysql client
        Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
        check that user name is not longer than USERNAME_LENGTH symbols
      sql/sql_parse.cc:
        Bug#20393 User name truncation in mysql client
        Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
        increased buffers for user name & db
      sql/table.cc:
        Bug#20393 User name truncation in mysql client
        Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
        check that db name is not longer than NAME_LEN symbols
      ddb9f866