1. 15 Jul, 2004 2 commits
  2. 14 Jul, 2004 2 commits
  3. 13 Jul, 2004 7 commits
  4. 12 Jul, 2004 1 commit
  5. 11 Jul, 2004 1 commit
    • unknown's avatar
      Merge · 25e2b777
      unknown authored
      
      sql/sql_show.cc:
        Auto merged
      sql/mysql_priv.h:
        SCCS merged
      25e2b777
  6. 10 Jul, 2004 3 commits
  7. 09 Jul, 2004 5 commits
    • unknown's avatar
      manual merge · f80365e3
      unknown authored
      charged sql/sql_db.cc only
      (
      changed length in mysql_create_db to path_len
      so as it was calculated in the first unpack_dirname
      in my previous fix for Bug #4378
      '"create database IF NOT EXISTS thing" returns an error'
      )
      
      
      sql/sql_db.cc:
        manual merge 
        (
        changed length in mysql_create_db to path_len
        so as it was calculated in the first unpack_dirname
        in my previous fix for Bug #4378
        '"create database IF NOT EXISTS thing" returns an error'
        )
      f80365e3
    • unknown's avatar
      added an optimization in mysql_create_db (sql_db.cc) · 3b9f58d8
      unknown authored
      as after effect of fix for Bug #4378 
      '"create database IF NOT EXISTS thing" returns an error' 
      
      (avoided an unpack_dirname and 
       changed strcat into strmake)
      
      
      sql/sql_db.cc:
        added an optimization in mysql_create_db 
        (avoided an unpack_dirname and 
         changed strcat into strmake)
      3b9f58d8
    • unknown's avatar
      mysqlhotcopy: · a85115a3
      unknown authored
        fix MYI copying with scp
        safer tempfile creation
      
      
      scripts/mysqlhotcopy.sh:
        fix MYI copying with scp
        safer tempfile creation
      a85115a3
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c8096bb1
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      c8096bb1
    • unknown's avatar
      Cleanup of db option cacheing · ad72843e
      unknown authored
      Some bug fixes to last pushed code
      
      
      mysql-test/mysql-test-run.sh:
        Fix for new valgrind (2.1.1)
      mysql-test/r/bdb.result:
        Updated results
      mysql-test/t/ps_1general.test:
        removed wrong error condition
      sql/ha_berkeley.cc:
        Fix for index_flags() in new code
      sql/item_strfunc.cc:
        Cleanup (fixed indentation, removed short variable names)
      sql/mysql_priv.h:
        Cleanup of db option cacheing
      sql/mysqld.cc:
        Cleanup of db option cacheing
      sql/sql_db.cc:
        Cleanup of db option cacheing
      sql/sql_parse.cc:
        Cleanup of db option cacheing
      sql/sql_table.cc:
        sprintf -> strxmov
      sql/table.cc:
        key_read should be tested on key parts, not the whole key
      ad72843e
  8. 08 Jul, 2004 18 commits
    • unknown's avatar
      Merge with 4.0 to get bug fixes · 91b109b7
      unknown authored
      
      Build-tools/Bootstrap:
        Auto merged
      Build-tools/Do-compile:
        Auto merged
      mysql-test/r/lowercase_table2.result:
        Auto merged
      mysql-test/r/system_mysql_db.result:
        Auto merged
      mysql-test/r/system_mysql_db_refs.result:
        Auto merged
      mysql-test/t/system_mysql_db_fix-master.opt:
        Auto merged
      mysql-test/t/system_mysql_db.test:
        Auto merged
      91b109b7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 1c1e0d36
      unknown authored
      into mysql.com:/home/my/mysql-4.0
      
      1c1e0d36
    • unknown's avatar
      Updated result sets (from 4.1) · e070c794
      unknown authored
      e070c794
    • unknown's avatar
      my_global.h: · 37be92e2
      unknown authored
        Define cxa_pure_virtual to print error message and DBUG_ASSERT:
        calls to pure virtual methods should not go unnoticed.
      
      
      include/my_global.h:
        Define cxa_pure_virtual to print error message and DBUG_ASSERT:
        calls to pure virtual methods should not go unnoticed.
      37be92e2
    • unknown's avatar
      Do-compile: · 5a8b757e
      unknown authored
        Call my_md5sum with path
      
      
      Build-tools/Do-compile:
        Call my_md5sum with path
      5a8b757e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 51e40aca
      unknown authored
      into here.mwagner.org:/Volumes/BK/mysql-4.0
      
      51e40aca
    • unknown's avatar
      Merge here.mwagner.org:/Volumes/BK/mysql-4.0 · 4a45ca91
      unknown authored
      into here.mwagner.org:/Volumes/BK/mysql-4.0-work
      
      4a45ca91
    • unknown's avatar
      Do-compile: · fe678d70
      unknown authored
        Added support for MD5 verification of file transfers
      
      
      Build-tools/Do-compile:
        Added support for MD5 verification of file transfers
      fe678d70
    • unknown's avatar
      fixed Bug #4378 "create database IF NOT EXISTS thing" returns an error · dcfa9f1b
      unknown authored
      
      sql/sql_db.cc:
        discarded final '\' in path for my_stat (for Win32)
        as the fix 
        for Bug #4378 "create database IF NOT EXISTS thing" returns an error
      dcfa9f1b
    • unknown's avatar
      Fixed Bug#4451. According to C/C++ standards, enums should not be used · 590afa80
      unknown authored
      out of their range.
      
      590afa80
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · b86ba364
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      sql/sql_db.cc:
        Auto merged
      b86ba364
    • unknown's avatar
      New handler::index_flags() definition to make it easy to check the full used... · 9236c380
      unknown authored
      New handler::index_flags() definition to make it easy to check the full used key and a specific key part.
      Added key part to optimize_range() to fix problems when using fields in key parts.
      
      
      
      sql/examples/ha_archive.h:
        New handler::index_flags() definition
      sql/examples/ha_example.h:
        New handler::index_flags() definition
      sql/field.cc:
        New optimize_range() definition
      sql/field.h:
        New optimize_range() definition
      sql/ha_berkeley.cc:
        New handler::index_flags() definition
      sql/ha_berkeley.h:
        New handler::index_flags() definition
      sql/ha_heap.h:
        New handler::index_flags() definition
      sql/ha_innodb.h:
        New handler::index_flags() definition
      sql/ha_isam.h:
        New handler::index_flags() definition
      sql/ha_isammrg.h:
        New handler::index_flags() definition
      sql/ha_myisam.h:
        New handler::index_flags() definition
      sql/ha_myisammrg.h:
        New handler::index_flags() definition
      sql/ha_ndbcluster.cc:
        New handler::index_flags() definition
      sql/ha_ndbcluster.h:
        New handler::index_flags() definition
      sql/handler.h:
        New handler::index_flags() definition
      sql/log.cc:
        Fixed compiler warnings
      sql/log_event.cc:
        Fixed compiler warnings (and renamed short variable name)
      sql/opt_range.cc:
        New handler::index_flags() definition
      sql/opt_sum.cc:
        New handler::index_flags() definition
      sql/set_var.cc:
        Removed compiler warnings
      sql/sql_db.cc:
        Removed compiler warnings
      sql/sql_select.cc:
        New handler::index_flags() definition
      sql/sql_show.cc:
        Removed compiler warnings
      sql/sql_update.cc:
        Removed compiler warnings
      sql/table.cc:
        New handler::index_flags() definition
      9236c380
    • unknown's avatar
      Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 53f91a1a
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
      
      53f91a1a
    • unknown's avatar
      Minor fix: V is primary level, not U. · ab88d794
      unknown authored
      ab88d794
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 52d02281
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work2-4.1
      
      52d02281
    • unknown's avatar
      WL#807 Optimize loading database options in load_db_opt · a79de7b2
      unknown authored
      also known as
      BUG#2326 Charset of table is determined by charset of db only if "USE db;"
      
      a79de7b2
    • unknown's avatar
      results fixed · 142904ae
      unknown authored
      142904ae
  9. 07 Jul, 2004 1 commit