1. 08 Mar, 2005 15 commits
  2. 07 Mar, 2005 23 commits
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0 · a93b0b59
      unknown authored
      into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0.7498
      
      
      a93b0b59
    • unknown's avatar
      Fix for bug#8978 : Crash on 'select format ...' · fd35e787
      unknown authored
      fd35e787
    • unknown's avatar
      Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · da244cc9
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      da244cc9
    • unknown's avatar
      Avoid empty build (failure) mails on Solaris (backport from 4.1). · bda53f8c
      unknown authored
      
      Build-tools/Do-compile:
        Backport of a change Lenz did in 4.1 (without it, Solaris sends empty mails):
        
        Improved the abort subroutine to not rely on an external "tail" command (the
        default /usr/bin/tail on Solaris does not understand the "-n" notation).
        Get rid of a "useless use of cat" case in the process.
      bda53f8c
    • unknown's avatar
      Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · 15120892
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      15120892
    • unknown's avatar
      Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 · 16da840b
      unknown authored
      into sinisa.nasamreza.org:/mnt/work/mysql-4.1
      
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/r/mysqldump.result:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      16da840b
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9396ef5b
      unknown authored
      into hundin.mysql.fi:/home/marko/mysql-4.1
      
      
      9396ef5b
    • unknown's avatar
      Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · 9fa4492a
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      9fa4492a
    • unknown's avatar
      trx0trx.c: · 309b4721
      unknown authored
        Print a hex dump of the trx_t object if trx->n_mysql_tables_in_use != 0 at trx_free()
      
      
      innobase/trx/trx0trx.c:
        Print a hex dump of the trx_t object if trx->n_mysql_tables_in_use != 0 at trx_free()
      309b4721
    • unknown's avatar
      mysql-test-run.sh: · 39fb340d
      unknown authored
        added skip-ndbcluster switch
      
      
      mysql-test/mysql-test-run.sh:
        added skip-ndbcluster switch
      39fb340d
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7e3eef4e
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      7e3eef4e
    • unknown's avatar
      Fixed crash if max_connections is exceeded. BUG#8996 · ba05aef9
      unknown authored
      
      sql/mysqld.cc:
        mark the thread as killed in close_connection
      sql/protocol.cc:
        don't bother remembering warnings if the thread is dying
      ba05aef9
    • unknown's avatar
    • unknown's avatar
      Merge grichter@bk-internal.mysql.com:/home/bk/mysql-4.1 · c02df655
      unknown authored
      into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-4.1
      
      
      c02df655
    • unknown's avatar
      Various fixes for Windows 2003 Platform SDK SP1 beta · a2bad73f
      unknown authored
      
      VC++Files/client/mysqladmin_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/client/mysqldump_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/client/mysqlimport_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/client/mysqlshow_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/client/mysqltest_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/comp_err/comp_err_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/isamchk/isamchk_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/libmysql/libmysql_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/libmysqld/libmysqld_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/libmysqltest/myTest_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/my_print_defaults/my_print_defaults_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/myisamchk/myisamchk_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/myisamlog/myisamlog_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/myisampack/myisampack_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/mysql-test/mysql_test_run_new_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/mysql_ia64.dsw:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
        Changed project order (dependency doesn't work with platform SDK)
      VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/mysqlcheck/mysqlcheck_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/mysqlmanager/MySqlManager_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/mysqlshutdown/mysqlshutdown_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/mysqlwatch/mysqlwatch_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/pack_isam/pack_isam_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/perror/perror_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/replace/replace_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/sql/mysqld_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/sql/mysqldmax_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/strings/strings_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/test1/test1_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/tests/mysql_client_test_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      VC++Files/thr_test/thr_test_ia64.dsp:
        Fixes for Platform SDK SP1 beta1 (Window IA64)
      a2bad73f
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · 38789100
      unknown authored
      into mysql.com:/M41/mysql-4.1
      
      
      38789100
    • unknown's avatar
      InnoDB: Portability fixes for warnings reported on IA-64 Windows · 9c6cc47f
      unknown authored
      
      innobase/buf/buf0lru.c:
        Portability fix: Use %p for printing pointers
      innobase/dict/dict0dict.c:
        Properly cast the arguments of toupper()
      innobase/eval/eval0proc.c:
        Declare loop_var_value with a matching data type.
      innobase/include/mem0mem.ic:
        Remove implicit type conversion
      innobase/include/page0page.ic:
        Portability fix: Use %p for printing pointers
      innobase/include/pars0pars.h:
        Remove implicit type conversion
      innobase/include/pars0sym.h:
        Remove implicit type conversion
      innobase/mem/mem0dbg.c:
        Portability fix: Use %p for printing pointers
      innobase/os/os0file.c:
        Add DWORD casts for Windows
      innobase/os/os0sync.c:
        Add DWORD casts for Windows
      innobase/os/os0thread.c:
        Add DWORD casts for Windows
      innobase/rem/rem0cmp.c:
        Make implicit type conversions explicit
      innobase/row/row0mysql.c:
        Make implicit type conversions explicit
      innobase/row/row0sel.c:
        Portability fix: Use %p for printing pointers
      innobase/trx/trx0sys.c:
        Declare trx_sys_mysql_bin_log_pos_high and
        trx_sys_mysql_bin_log_pos_low with a matching data type
      innobase/ut/ut0ut.c:
        Make implicit type conversion explicit
      9c6cc47f
    • unknown's avatar
      Review fixes for Bug #8753 Invalid schema · e23e81f7
      unknown authored
      object version after dropping index
      
      
      e23e81f7
    • unknown's avatar
      Manual merge. · 3efe8a84
      unknown authored
      3efe8a84
    • unknown's avatar
      Merge 4.0.24 compile changes into the 4.1 tree. · c8399bb6
      unknown authored
      
      mysys/my_bitmap.c:
        Resolved merge conflict (identical change in 4.0 and 4.1).
      c8399bb6
    • unknown's avatar
      Manual merge of the 4.0.24 compile changes into the 4.1 tree. · 25ca5723
      unknown authored
      
      include/my_sys.h:
        Auto merged
      mysys/hash.c:
        Manually merged: 'static' for all, 'inline' for most platforms.
      25ca5723
    • unknown's avatar
    • unknown's avatar
      fixed conversion errors (Windows IA64 build) · 52d19cbd
      unknown authored
      52d19cbd
  3. 06 Mar, 2005 2 commits