1. 20 Sep, 2005 2 commits
  2. 19 Sep, 2005 15 commits
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8607842e
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
      
      
      8607842e
    • unknown's avatar
      fix warnings · c8c29f2d
      unknown authored
      
      server-tools/instance-manager/buffer.cc:
        perform initialization of static consts in .cc file to respect VC6
      server-tools/instance-manager/buffer.h:
        fix compiler warning
      server-tools/instance-manager/commands.cc:
        fix compiler warning
      server-tools/instance-manager/user_map.cc:
        fix compiler warning
      c8c29f2d
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7a1cc524
      unknown authored
      into  zim.(none):/home/brian/mysql/mysql-5.0
      
      
      sql/ha_federated.cc:
        Auto merged
      7a1cc524
    • unknown's avatar
      Cleanup for handlerton structure to allow for loadable engine work. This is... · fa8fcecb
      unknown authored
      Cleanup for handlerton structure to allow for loadable engine work. This is the first in a series of patches. 
      
      
      sql/examples/ha_archive.cc:
        Now declared externally.
      sql/examples/ha_example.cc:
        Now declared externally
      sql/examples/ha_tina.cc:
        Now declared externally
      sql/ha_berkeley.cc:
        Now declared externally
      sql/ha_blackhole.cc:
        Now declared externally
      sql/ha_federated.cc:
        Now declared externally.
      sql/ha_heap.cc:
        Now declared externally.
      sql/ha_innodb.cc:
        Now declared externally.
      sql/ha_myisam.cc:
        Now declared externally
      sql/ha_myisammrg.cc:
        Now declared externally.
      sql/ha_ndbcluster.cc:
        Now declared externally.
      sql/handler.cc:
        Changes for eventual loadable engines. This will allow us to gain faster access to the handlerton (eventually this will just be a handlteron array).
      sql/handler.h:
        New alias structure and change to show_table_st to place handlerton in the structure.
      fa8fcecb
    • unknown's avatar
      Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 · da0f9ece
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
      
      
      client/mysqltest.c:
        Merged from 4.1.
      da0f9ece
    • unknown's avatar
      Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 · d9315344
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
      
      
      client/mysqltest.c:
        Merged from 4.0.
      d9315344
    • unknown's avatar
      Fixed Bug#13275 mysqltest empty file bug · a8980733
      unknown authored
      a8980733
    • unknown's avatar
      Corrected last fix for · 380db368
      unknown authored
        Bug #13152 bit fields and fields that follow become corrupted when dumped from NDB tables
      
      
      380db368
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · 730fc415
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      ndb/src/ndbapi/Ndbinit.cpp:
        Auto merged
      730fc415
    • unknown's avatar
      mysql-test-run.pl: · 5df7f93d
      unknown authored
        Added flag --valgrind-mysqltest
      
      
      mysql-test/mysql-test-run.pl:
        Added flag --valgrind-mysqltest
      5df7f93d
    • unknown's avatar
      bug#9282 - ndb · 7150244e
      unknown authored
        big delete from causing NdbObjectIdMap::expand at same time 
        as receiver thread perform getObjectId 
      
      
      ndb/src/ndbapi/Ndbinit.cpp:
        Protect NdbObjectIdMap::expand from getObjectId
      ndb/src/ndbapi/ObjectMap.hpp:
        Protect NdbObjectIdMap::expand from getObjectId
      7150244e
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · a615084f
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      a615084f
    • unknown's avatar
      ctype_utf8.result, ctype_utf8.test: · cb0a436c
      unknown authored
        Bug#10504: additional test
      
      
      mysql-test/t/ctype_utf8.test:
        Bug#10504: additional test
      mysql-test/r/ctype_utf8.result:
        Bug#10504: additional test
      cb0a436c
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · fde37327
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b10504
      
      
      fde37327
    • unknown's avatar
      Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 · 015d55b7
      unknown authored
      into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0-master
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      015d55b7
  3. 18 Sep, 2005 5 commits
  4. 17 Sep, 2005 1 commit
    • unknown's avatar
      Brian's "he is too lazy to commit this so Eric is going to have to do it"... · 0031af06
      unknown authored
      Brian's "he is too lazy to commit this so Eric is going to have to do it" environmental variable hack for prefix. This allows you to just set a prefix in your profile which will be used in all of your builds. AKA you can be even lazier(!) about calling BUILD scripts. Don't blame Eric, Brian borrowed his keyboard.
      
      
      BUILD/SETUP.sh:
        Added option to set environmental variable in case you are lazy about setting prefix (ala Brian)
      BUILD/autorun.sh:
        Change of syntax
      0031af06
  5. 16 Sep, 2005 10 commits
  6. 15 Sep, 2005 7 commits
    • unknown's avatar
      Fix bug #12291 Table wasn't reinited for index scan after sequential scan · 28028b5f
      unknown authored
      Optimizer did choose "Range checked for each record" for one of the tables.
      For first few loops over that table it choose sequential access, on later
      stage it choose to use index. Because table was previously initialized for 
      sequential access, it skips intitialization for index access, and when
      server tries to retrieve data error occurs.
      
      QUICK_RANGE_SELECT::init() changes so if file already initialized for
      sequential access, it calls ha_rnd_end() and initializes file for index
      access.
      
      
      sql/opt_range.cc:
        Fix bug #12291 Table wasn't reinited for index scan after sequential scan
      mysql-test/t/select.test:
        Test case for bug #12291 Table wasn't reinited for index scan after sequential scan
      mysql-test/r/select.result:
        Test case for bug #12291 Table wasn't reinited for index scan after sequential scan
      28028b5f
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · dd37fca2
      unknown authored
      into moonbone.local:/work/12887-bug-5.0-mysql
      
      
      dd37fca2
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · dde66e48
      unknown authored
      into moonbone.local:/work/12887-bug-5.0-mysql
      
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/deleted/.del-isam.test~834fb0ee8196c445:
        Auto merged
      BitKeeper/deleted/.del-rpl_trunc_binlog.test~961b1f6ac73d37c8:
        Auto merged
      mysql-test/r/flush_block_commit.result:
        Auto merged
      mysql-test/r/flush_table.result:
        Auto merged
      mysql-test/r/lock_multi.result:
        Auto merged
      mysql-test/r/rpl_server_id1.result:
        Auto merged
      mysql-test/r/rpl_server_id2.result:
        Auto merged
      mysql-test/r/rpl_start_stop_slave.result:
        Auto merged
      mysql-test/t/bool.test:
        Auto merged
      mysql-test/t/cast.test:
        Auto merged
      mysql-test/t/create_select_tmp.test:
        Auto merged
      mysql-test/t/ctype_latin1_de.test:
        Auto merged
      mysql-test/t/flush_block_commit.test:
        Auto merged
      mysql-test/t/func_concat.test:
        Auto merged
      mysql-test/t/func_if.test:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      mysql-test/t/grant_cache.test:
        Auto merged
      mysql-test/t/innodb-deadlock.test:
        Auto merged
      mysql-test/t/innodb-lock.test:
        Auto merged
      mysql-test/t/loaddata.test:
        Auto merged
      mysql-test/t/lock_multi.test:
        Auto merged
      mysql-test/t/lowercase_table.test:
        Auto merged
      mysql-test/t/lowercase_table3.test:
        Auto merged
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Auto merged
      mysql-test/t/mysqlbinlog.test:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      mysql-test/t/rpl_EE_error.test:
        Auto merged
      mysql-test/t/rpl_change_master.test:
        Auto merged
      mysql-test/t/rpl_drop.test:
        Auto merged
      mysql-test/t/rpl_empty_master_crash.test:
        Auto merged
      mysql-test/t/rpl_error_ignored_table.test:
        Auto merged
      mysql-test/t/rpl_flush_log_loop.test:
        Auto merged
      mysql-test/t/rpl_get_lock.test:
        Auto merged
      mysql-test/t/rpl_heap.test:
        Auto merged
      mysql-test/t/rpl_insert_id.test:
        Auto merged
      mysql-test/t/rpl_loaddata.test:
        Auto merged
      mysql-test/t/rpl_loaddata_rule_m.test:
        Auto merged
      mysql-test/t/rpl_loaddata_rule_s.test:
        Auto merged
      mysql-test/t/rpl_loaddatalocal.test:
        Auto merged
      mysql-test/t/rpl_max_relay_size.test:
        Auto merged
      mysql-test/t/rpl_reset_slave.test:
        Auto merged
      mysql-test/t/rpl_server_id2.test:
        Auto merged
      mysql-test/t/system_mysql_db.test:
        Auto merged
      mysql-test/t/system_mysql_db_fix.test:
        Auto merged
      dde66e48
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · e9f6a0ff
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      e9f6a0ff
    • unknown's avatar
      bad merge fixed · c7d162a2
      unknown authored
      
      mysql-test/r/insert_select.result:
        duplicated test removed
      mysql-test/t/insert_select.test:
        duplicated test removed
      c7d162a2
    • unknown's avatar
      Merge moonbone.local:/work/12887-bug-4.1-mysql · 109d2cfa
      unknown authored
      into moonbone.local:/work/12887-bug-5.0-mysql
      
      
      vio/viosocket.c:
        Auto merged
      109d2cfa
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · 2a5505c7
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      2a5505c7