1. 29 Nov, 2005 3 commits
  2. 28 Nov, 2005 7 commits
  3. 26 Nov, 2005 3 commits
    • unknown's avatar
      mysql-test-run.pl: · 2b5de6c2
      unknown authored
        Added search for 'my_print_defaults' when running from source tree on Windows
      trigger-grant.test, trigger-compat.test:
        Removed --text from grep, not portable
      
      
      mysql-test/t/trigger-compat.test:
        Removed --text from grep, not portable
      mysql-test/t/trigger-grant.test:
        Removed --text from grep, not portable
      mysql-test/mysql-test-run.pl:
        Added search for 'my_print_defaults' when running from source tree on Windows
      2b5de6c2
    • unknown's avatar
      Many files: · e7be7902
      unknown authored
        Enable build on Windows
      
      
      VC++Files/mysql.sln:
        Enable build on Windows
      VC++Files/libmysqld/libmysqld.vcproj:
        Enable build on Windows
      VC++Files/myisam_ftdump/myisam_ftdump.vcproj:
        Enable build on Windows
      VC++Files/myisamchk/myisamchk.vcproj:
        Enable build on Windows
      VC++Files/myisamlog/myisamlog.vcproj:
        Enable build on Windows
      VC++Files/myisampack/myisampack.vcproj:
        Enable build on Windows
      VC++Files/mysqldemb/mysqldemb.vcproj:
        Enable build on Windows
      VC++Files/mysqlserver/mysqlserver.vcproj:
        Enable build on Windows
      VC++Files/sql/mysqld.vcproj:
        Enable build on Windows
      VC++Files/storage/bdb/bdb.vcproj:
        Enable build on Windows
      VC++Files/storage/myisam/myisam.vcproj:
        Enable build on Windows
      VC++Files/storage/myisammrg/myisammrg.vcproj:
        Enable build on Windows
      VC++Files/strings/strings.vcproj:
        Enable build on Windows
      e7be7902
    • unknown's avatar
      Makefile.am: · 1494cc2a
      unknown authored
        Distribute "handlerton-win.cc"
      mysqld.cc:
        Corrected word lenght for some innobase
        configuration variables
      Makefile.am:
        Added Visual Studio 7 project file to EXTRA_DIST
      ha_partition.cc, sql_partition.cc:
        Changed include to use "..." for Windows
      handlerton-win.cc:
        Handle engine include/exclude with defines for Windows
        new file
      
      
      sql/handlerton-win.cc:
        Handle engine include/exclude with defines for Windows
      sql/sql_partition.cc:
        Changed include to use "..." for Windows
      sql/ha_partition.cc:
        Changed include to use "..." for Windows
      extra/yassl/Makefile.am:
        Added Visual Studio 7 project file to EXTRA_DIST
      extra/yassl/taocrypt/Makefile.am:
        Added Visual Studio 7 project file to EXTRA_DIST
      sql/mysqld.cc:
        Corrected word lenght for some innobase
        configuration variables
      sql/Makefile.am:
        Distribute "handlerton-win.cc"
      1494cc2a
  4. 25 Nov, 2005 6 commits
  5. 24 Nov, 2005 18 commits
    • unknown's avatar
    • unknown's avatar
      Merge lgrimmer@bk-internal:/home/bk/mysql-5.1-new · b6992624
      unknown authored
      into  mysql.com:/space/my/mysql-5.1
      
      b6992624
    • unknown's avatar
      - fixed a compile error in mysys/mf_tempdir.c by adding a missing comma · 02b516a0
      unknown authored
         (only showed up in a non-debug build)
      
      
      mysys/mf_tempdir.c:
         - fixed a compile error by adding a missing comma (only showed up in a non-debug
           build)
      02b516a0
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · ad7c2a64
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      mysql-test/t/disabled.def:
        SCCS merged
      ad7c2a64
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 24b7a7a2
      unknown authored
      into  mysql.com:/my/mysql-5.1
      
      24b7a7a2
    • unknown's avatar
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 49fd5546
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      49fd5546
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 80cfee65
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      sql/field.cc:
        Auto merged
      80cfee65
    • unknown's avatar
      added missing drop view at end of test · e19f8a1a
      unknown authored
      e19f8a1a
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-5.1 · 1944d425
      unknown authored
      into  mysql.com:/home/my/mysql-5.1-TDC
      
      
      sql/handler.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      1944d425
    • unknown's avatar
      Clear variable · a9a4d1ff
      unknown authored
      
      mysql-test/r/view_grant.result:
        Drop things that may be left from old runs
      mysql-test/t/view_grant.test:
        Drop things that may be left from old runs
      a9a4d1ff
    • unknown's avatar
      Merge monty@192.168.0.9:/my/mysql-5.1 · e29c1d01
      unknown authored
      into  mysql.com:/my/mysql-5.1
      
      e29c1d01
    • unknown's avatar
      Added bitmap_buffer_size() · dfe61091
      unknown authored
      Removed valgrind warnings when using not aligned bitmap buffer size
      Added setting of thread_stack
      
      
      include/my_bitmap.h:
        Added bitmap_buffer_size()
      sql/handler.cc:
        use bitmap_buffer_size()
      sql/opt_range.cc:
        use bitmap_buffer_size()
      sql/sql_insert.cc:
        Use bitmap_buffer_size()
      sql/sql_parse.cc:
        Added setting of thread_stack when taking thread from thread cache
      sql/sql_plugin.cc:
        Set thread_stack
      dfe61091
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-5.1 · dfc8f877
      unknown authored
      into  mysql.com:/home/my/mysql-5.1-TDC
      
      
      sql/ha_federated.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/examples/ha_tina.cc:
        Auto merged
      sql/examples/ha_tina.h:
        Auto merged
      sql/unireg.h:
        Auto merged
      dfc8f877
    • unknown's avatar
      Merge monty@192.168.0.9:/my/mysql-5.1 · ccbdca81
      unknown authored
      into  mysql.com:/my/mysql-5.1
      
      
      sql/field.cc:
        Auto merged
      ccbdca81
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-5.0 · 011ceff8
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      BitKeeper/etc/ignore:
        auto-union
      include/my_global.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/grant.result:
        Auto merged
      sql/ha_federated.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/examples/ha_tina.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_udf.cc:
        Auto merged
      sql/tztime.cc:
        Auto merged
      sql/unireg.h:
        Auto merged
      sql/examples/ha_tina.cc:
        manual merge
      sql/share/errmsg.txt:
        manual merge
      011ceff8
    • unknown's avatar
      Don't use PATH_MAX for FN_REFLEN as this uses too much stack space · 6eed9d51
      unknown authored
      Larger stack size neaded for open table on x86 64 bit
      Fix failing test cases
      Deleted symlink from bk
      
      
      BitKeeper/etc/ignore:
        added libmysqld/ha_blackhole.cc
      BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
        Delete: libmysqld/ha_blackhole.cc
      include/my_global.h:
        Don't use PATH_MAX for FN_REFLEN as this uses too much stack space.
        (With a PATH_MAX of 4096, we use 80K for opening a table as there is several objects of size FN_REFLEN on stack)
      mysql-test/r/federated.result:
        Update results after error message changes
      mysql-test/r/grant.result:
        Update results after error message changes
      mysql-test/r/grant2.result:
        Update results after error message changes
      sql/ha_federated.cc:
        Fix error messages to be more consistent
      sql/mysql_priv.h:
        Stack size to have when opening a table
        (This was needed on x86 64 bit Linux)
      sql/share/errmsg.txt:
        Remove quotes around error string for federated as two quotes in the output looks strange
      sql/sql_base.cc:
        More correct stack size
      sql/sql_parse.cc:
        Set thread_stack before store_globals()
      sql/unireg.h:
        More correct MAX_DBKEY_LENGTH
      6eed9d51
  6. 23 Nov, 2005 3 commits
    • unknown's avatar
      Merge alstroganov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1f0de14c
      unknown authored
      into  regul.home.lan:/mnt/md/bk/mysql-5.0
      
      1f0de14c
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-5.1 · 079d47f8
      unknown authored
      into  mysql.com:/home/my/mysql-5.1-TDC
      
      
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_federated.cc:
        Auto merged
      sql/ha_federated.h:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/key.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/parse_file.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/structs.h:
        Auto merged
      sql/field.cc:
        Merge with global tree
      sql/sql_base.cc:
        Merge with global tree
      sql/table.cc:
        Merge with global tree
      079d47f8
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 8d839ebe
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      sql/field.cc:
        Auto merged
      8d839ebe