1. 20 Sep, 2005 6 commits
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · d800227f
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      d800227f
    • unknown's avatar
      ndb - post merge fixes · 16328ca2
      unknown authored
      
      ndb/include/ndbapi/NdbTransaction.hpp:
        post merge fixes
      ndb/src/ndbapi/Ndblist.cpp:
        post merge fixes
      sql/ha_ndbcluster.cc:
        post merge fixes
      16328ca2
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 130e902c
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/include/ndbapi/NdbBlob.hpp:
        Auto merged
      ndb/include/ndbapi/NdbOperation.hpp:
        Auto merged
      ndb/include/ndbapi/NdbRecAttr.hpp:
        Auto merged
      ndb/src/ndbapi/NdbApiSignal.cpp:
        Auto merged
      ndb/src/ndbapi/NdbApiSignal.hpp:
        Auto merged
      ndb/src/ndbapi/NdbBlob.cpp:
        Auto merged
      ndb/src/ndbapi/NdbRecAttr.cpp:
        Auto merged
      ndb/src/ndbapi/Ndbif.cpp:
        Auto merged
      ndb/src/ndbapi/Ndbinit.cpp:
        Auto merged
      ndb/test/include/NDBT_Test.hpp:
        Auto merged
      ndb/test/ndbapi/bank/BankLoad.cpp:
        Auto merged
      ndb/test/ndbapi/testOIBasic.cpp:
        Auto merged
      ndb/test/src/NdbBackup.cpp:
        Auto merged
      ndb/test/src/NdbRestarts.cpp:
        Auto merged
      ndb/tools/restore/Restore.cpp:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      ndb/include/ndbapi/Ndb.hpp:
        merge
      ndb/include/ndbapi/NdbIndexOperation.hpp:
        merge
      ndb/include/ndbapi/NdbIndexScanOperation.hpp:
        merge
      ndb/include/ndbapi/NdbTransaction.hpp:
        merge
      ndb/src/ndbapi/NdbImpl.hpp:
        merge
      ndb/src/ndbapi/Ndblist.cpp:
        merge
      ndb/test/src/HugoCalculator.cpp:
        merge
      ndb/test/src/NDBT_Test.cpp:
        merge
      sql/ha_ndbcluster.cc:
        merge
      sql/mysqld.cc:
        merge
      sql/sql_lex.h:
        merge
      sql/sql_parse.cc:
        merge
      130e902c
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8e2d318b
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      8e2d318b
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 614fb882
      unknown authored
      into  zim.(none):/home/brian/mysql/mysql-5.0
      
      
      614fb882
    • unknown's avatar
      Cleanups for storage engine patch. Changed two test results to now reflect the... · 91fbe52b
      unknown authored
      Cleanups for storage engine patch. Changed two test results to now reflect the changes in storage engines and a couple of comment changes in the code. 
      
      
      mysql-test/r/ps_1general.result:
        Redoing test output with straightened up output for storage engine names.
      mysql-test/r/variables.result:
        Fixed test case.
      sql/handler.cc:
        Couple of format cleanups and a change in a comment.
      91fbe52b
  2. 19 Sep, 2005 18 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 joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · ec45c88d
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      ec45c88d
    • 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
      ndb - imlp. show engine ndb status; · b390a1a4
      unknown authored
        that dump free list allocation per connection
      
      
      sql/ha_ndbcluster.cc:
        imlp. show engine ndb status;
          that dump free list allocation per connection
      sql/ha_ndbcluster.h:
        imlp. show engine ndb status;
          that dump free list allocation per connection
      sql/mysqld.cc:
        imlp. show engine ndb status;
          that dump free list allocation per connection
      sql/sql_lex.h:
        imlp. show engine ndb status;
          that dump free list allocation per connection
      sql/sql_parse.cc:
        imlp. show engine ndb status;
          that dump free list allocation per connection
      sql/sql_yacc.yy:
        imlp. show engine ndb status;
          that dump free list allocation per connection
      b390a1a4
    • 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
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 90e60608
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
      
      
      ndb/src/ndbapi/Ndbinit.cpp:
        Auto merged
      90e60608
    • 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 3 commits
  5. 16 Sep, 2005 8 commits
    • unknown's avatar
      Added testcase for BUG#13118 · 7e138425
      unknown authored
      7e138425
    • unknown's avatar
      mysql-test-run.pl: · d6afdcb7
      unknown authored
        Enabled --valgrind to work (bug#13280)
      
      
      mysql-test/mysql-test-run.pl:
        Enabled --valgrind to work (bug#13280)
      d6afdcb7
    • unknown's avatar
      Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 · cc270d2f
      unknown authored
      into  127.(none):/home/osku/mysql/5.0/clean
      
      
      cc270d2f
    • unknown's avatar
      Fix for bug#5508 after Sanja's review · bf58b698
      unknown authored
      
      mysql-test/r/view.result:
        test results for rename table view1 to view2
      mysql-test/t/view.test:
        tests for rename table view1 to view2
      sql/share/errmsg.txt:
        added new errormessage (schema change not allowed in rename table view)
      sql/sql_rename.cc:
        added support for renaming views
      sql/sql_view.cc:
        added new function mysql_rename_view
      sql/sql_view.h:
        added prototype mysql_rename_view
      bf58b698
    • unknown's avatar
    • unknown's avatar
      ndb · d0eb3e28
      unknown authored
        remove extra ";" from test programs
      
      
      ndb/test/include/NDBT_Test.hpp:
        Remove extra ";"
      ndb/test/ndbapi/bank/BankLoad.cpp:
        Remove extra ";"
      ndb/test/ndbapi/testOIBasic.cpp:
        Remove extra ";"
      ndb/test/src/HugoCalculator.cpp:
        Remove extra ";"
      ndb/test/src/NDBT_Test.cpp:
        Remove extra ";"
      ndb/test/src/NdbBackup.cpp:
        Remove extra ";"
      ndb/test/src/NdbRestarts.cpp:
        Remove extra ";"
      d0eb3e28
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7f6146f7
      unknown authored
      into moonbone.local:/work/12291-bug-5.0-mysql
      
      
      7f6146f7
    • unknown's avatar
      ndb · 97956339
      unknown authored
        impl support for querying resource usage in ndb api
        to help track down mem leaks
      
      
      ndb/include/ndbapi/Ndb.hpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/include/ndbapi/NdbBlob.hpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/include/ndbapi/NdbConnection.hpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/include/ndbapi/NdbIndexOperation.hpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/include/ndbapi/NdbIndexScanOperation.hpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/include/ndbapi/NdbOperation.hpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/include/ndbapi/NdbRecAttr.hpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/src/ndbapi/NdbApiSignal.cpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/src/ndbapi/NdbApiSignal.hpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/src/ndbapi/NdbBlob.cpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/src/ndbapi/NdbImpl.hpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/src/ndbapi/NdbRecAttr.cpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/src/ndbapi/NdbUtil.cpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/src/ndbapi/NdbUtil.hpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/src/ndbapi/Ndbif.cpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/src/ndbapi/Ndbinit.cpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/src/ndbapi/Ndblist.cpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/tools/restore/Restore.cpp:
        Impl. reporting of free list usage
        Put free list into handler class
      97956339