1. 17 Jan, 2005 3 commits
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/4.1-virgin · 0c0eabcf
      unknown authored
      into mysql.com:/home/timka/mysql/src/4.1-bug-7331
      
      
      sql/sql_select.cc:
        Auto merged
      0c0eabcf
    • unknown's avatar
      user_var.result, func_str.result, item_strfunc.cc: · febe8dd7
      unknown authored
        bug#7839 ncorrect collation for char(ascii('a'))
      
      
      sql/item_strfunc.cc:
        bug#7839 ncorrect collation for char(ascii('a'))
      mysql-test/r/func_str.result:
        bug#7839 ncorrect collation for char(ascii('a'))
      mysql-test/r/user_var.result:
        bug#7839 ncorrect collation for char(ascii('a'))
      febe8dd7
    • unknown's avatar
      libmysql.c: · fda0bfcd
      unknown authored
        bug#7891: mysql_character_set_name() returns collation
      
      
      libmysql/libmysql.c:
        bug#7891: mysql_character_set_name() returns collation
      fda0bfcd
  2. 16 Jan, 2005 5 commits
  3. 15 Jan, 2005 6 commits
  4. 14 Jan, 2005 17 commits
  5. 13 Jan, 2005 9 commits
    • unknown's avatar
      fix C++ comments in C file (fixed in 5.0 already) · 4e252340
      unknown authored
      
      strings/ctype-uca.c:
        fix C++ comments in C file
      4e252340
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c0a875ec
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      c0a875ec
    • unknown's avatar
      Fix bug in INSERT DELAYED with prepared statements · 4c43672a
      unknown authored
      The bug was that if you have two TL_WRITE_DELAYED at the same time,
      mi_lock_databases() could be done in the wrong order and we could write the wrong header to the MyISAM index file.
      
      
      sql/mysql_priv.h:
        Fix bug in insert delayed with prepared statements
      sql/sql_base.cc:
        Fix bug in insert delayed with prepared statements
      sql/sql_prepare.cc:
        Fix bug in insert delayed with prepared statements
        The bug was that if you have two TL_WRITE_DELAYED at the same time,
        mi_lock_databases() could be done in the wrong order and we could write the wrong header to the MyISAM index file.
      4c43672a
    • unknown's avatar
      Fix mysql_install_db to look for libexecdir relative to basedir when · 0898b40c
      unknown authored
      it has been specified. (Bug #7347)
      
      
      scripts/mysql_install_db.sh:
        When basedir is specified, look for libexecdir relative to that
      0898b40c
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · 2313956d
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      2313956d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 2d54c8cd
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      sql/sql_parse.cc:
        Auto merged
      2d54c8cd
    • unknown's avatar
      ha_innodb.cc: · e878173e
      unknown authored
        Merge from 4.0:     Fix a theoretical hang over the adaptive hash latch in InnoDB if one runs INSERT ... SELECT ... (binlog not enabled), or a multi-table UPDATE or DELETE, and only the read tables are InnoDB type, the rest are MyISAM; this also fixes bug #7879 for InnoDB type tables
      
      
      sql/ha_innodb.cc:
        Merge from 4.0:     Fix a theoretical hang over the adaptive hash latch in InnoDB if one runs INSERT ... SELECT ... (binlog not enabled), or a multi-table UPDATE or DELETE, and only the read tables are InnoDB type, the rest are MyISAM; this also fixes bug #7879 for InnoDB type tables
      e878173e
    • unknown's avatar
      Merge · ccc493e6
      unknown authored
      
      innobase/os/os0file.c:
        Auto merged
      sql/ha_innodb.cc:
        SCCS merged
      ccc493e6
    • unknown's avatar
      Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7235 · d2fb42b6
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      mysql-test/r/ctype_utf8.result:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      d2fb42b6