1. 15 Aug, 2002 2 commits
  2. 14 Aug, 2002 2 commits
  3. 13 Aug, 2002 9 commits
  4. 12 Aug, 2002 22 commits
    • unknown's avatar
      merge (+ multi-table fix) · c4486b68
      unknown authored
      c4486b68
    • unknown's avatar
      merge with 3.23.52 · 27da7974
      unknown authored
      
      BitKeeper/etc/config:
        Auto merged
      Docs/manual.texi:
        Auto merged
      innobase/trx/trx0trx.c:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      27da7974
    • unknown's avatar
      Changed SQL variable delay_key_write to an enum · c9b3bcb2
      unknown authored
      able delay_key_write as default (as it was in 4.0.2)
      
      
      Docs/manual.texi:
        Updated information about variable DELAY_KEY_WRITE.
      mysql-test/r/type_decimal.result:
        Updated results
      mysql-test/r/variables.result:
        Updated results
      mysql-test/t/type_decimal.test:
        Fixed test to not cause purify error in mathlib during purify.
      mysql-test/t/variables.test:
        Test new usage of DELAY_KEY_WRITE
      sql/ha_innodb.cc:
        Merge with 3.23 code
      sql/mysql_priv.h:
        Changed SQL variable delay_key_write to an enum
      sql/mysqld.cc:
        Changed SQL variable delay_key_write to an enum.
        Enable delay_key_write as default (as it was in 4.0.2)
      sql/set_var.cc:
        Changed SQL variable delay_key_write to an enum
      sql/set_var.h:
        Changed SQL variable delay_key_write to an enum
      sql/sql_class.h:
        Changed SQL variable delay_key_write to an enum
      sql/sql_yacc.yy:
        Changed SQL variable delay_key_write to an enum
      c9b3bcb2
    • unknown's avatar
      os0thread.h, os0thread.c: · b0e2ef2d
      unknown authored
        Fix a critical portability bug introduced in the Windows version
      
      
      innobase/os/os0thread.c:
        Fix a critical portability bug introduced in the Windows version
      innobase/include/os0thread.h:
        Fix a critical portability bug introduced in the Windows version
      b0e2ef2d
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 · e26a2457
      unknown authored
      into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
      
      e26a2457
    • unknown's avatar
      manual.texi small change note mods · 8c286105
      unknown authored
      
      Docs/manual.texi:
        small change note mods
      8c286105
    • unknown's avatar
      manual.texi addition to mysql_real_escape_string() description. · 400eb781
      unknown authored
      
      Docs/manual.texi:
        addition to mysql_real_escape_string() description.
      400eb781
    • unknown's avatar
      Merge · c566828e
      unknown authored
      
      Docs/manual.texi:
        SCCS merged
      c566828e
    • unknown's avatar
      ha_innobase.h, ha_innobase.cc: · 9e31addd
      unknown authored
        Put a note that the InnoDB HANDLER code is not used until 4.1, and appears for documentational purposes only
      
      
      sql/ha_innobase.cc:
        Put a note that the InnoDB HANDLER code is not used until 4.1, and appears for documentational purposes only
      sql/ha_innobase.h:
        Put a note that the InnoDB HANDLER code is not used until 4.1, and appears for documentational purposes only
      9e31addd
    • unknown's avatar
      put InnoDB HANDLER patch back again :)) · 5dfb8b7c
      unknown authored
      5dfb8b7c
    • unknown's avatar
      "ungone" files, that were some time ago erroneously (?) marked as "gone" · fb2fd930
      unknown authored
      now it should be safe to do 'bk rmgone' to make the tree ~25M less :)
      
      fb2fd930
    • unknown's avatar
      79888c8f
    • unknown's avatar
      Update docs because of stable tree revert. · 502c5fe5
      unknown authored
      502c5fe5
    • unknown's avatar
      ha_innobase.cc: · 5038b222
      unknown authored
        Cleanup of latest rewrite of innobase_mysql_print_thd; from now on changing this code is forbidden unless a written permission is received from Heikki 3 days in advance
      
      
      sql/ha_innobase.cc:
        Cleanup of latest rewrite of innobase_mysql_print_thd; from now on changing this code is forbidden unless a written permission is received from Heikki 3 days in advance
      5038b222
    • unknown's avatar
      Various little docs fixups. · fa76d2cf
      unknown authored
      
      BitKeeper/etc/config:
        Make my life easier on bk clone/pull.
      BitKeeper/triggers/post-commit:
        Little fixes in commit script (from 4.0 script).
        Added docs-commit@ notification for 3.23 (so we can more easily keep an eye on it).
      Docs/manual.texi:
        Change/addition for Sinisa.
        Clarification of BDB changelog entry.
      fa76d2cf
    • unknown's avatar
      manual.texi add change note for QUOTE(). · 745b23d9
      unknown authored
      manual.texi	Add entry for QUOTE() function.
      
      
      Docs/manual.texi:
        add change note for QUOTE().
      745b23d9
    • unknown's avatar
      Fixes after last merge · c489b938
      unknown authored
      
      mysql-test/r/func_if.result:
        Fixed results after merge
      sql/ha_innodb.cc:
        fixed typo after merge
      c489b938
    • unknown's avatar
      Fix after merge · f4b6d2b0
      unknown authored
      
      sql/mysqld.cc:
        Removed not necessary DBUG line
      f4b6d2b0
    • unknown's avatar
      merge with 3.23.52 · 23d2203f
      unknown authored
      
      BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
        Auto merged
      Docs/manual.texi:
        Auto merged
      include/my_no_pthread.h:
        Auto merged
      innobase/include/univ.i:
        Auto merged
      innobase/lock/lock0lock.c:
        Auto merged
      innobase/os/os0thread.c:
        Auto merged
      innobase/srv/srv0srv.c:
        Auto merged
      innobase/trx/trx0trx.c:
        Auto merged
      innobase/ut/ut0ut.c:
        Auto merged
      mysql-test/r/bigint.result:
        Auto merged
      mysql-test/t/bigint.test:
        Auto merged
      mysys/my_init.c:
        Auto merged
      mysys/my_net.c:
        Auto merged
      mysys/mysys_priv.h:
        Auto merged
      mysys/thr_rwlock.c:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      include/my_sys.h:
        merge with 3.23
      libmysql/Makefile.shared:
        merge with 3.23
      mysql-test/mysql-test-run.sh:
        merge with 3.23
      mysql-test/r/func_if.result:
        merge with 3.23
      mysys/Makefile.am:
        merge with 3.23
      mysys/my_gethostbyname.c:
        merge with 3.23
      sql/ha_innodb.cc:
        merge with 3.23
      sql/item_cmpfunc.cc:
        merge with 3.23
      sql/mysqld.cc:
        merge with 3.23
      sql/sql_show.cc:
        merge with 3.23
      23d2203f
    • unknown's avatar
      merge · 69c6dff7
      unknown authored
      
      sql/ha_innobase.cc:
        merge (kept my changes to ha_innobase.cc to not use sprintf())
      69c6dff7
    • unknown's avatar
      Changed IF(expr, column, NULL) to take type from column · 92e5f607
      unknown authored
      Fixed some windows portability problems and removed some compiler warnings
       Cleaned up QUOTE() function and fixed bug in \0 and \Z handling.
      
      
      Docs/manual.texi:
        Changelog
        Added information about new IF() behaviour.
      libmysql/libmysql.def:
        Removed mysql_ssl_clear
      myisam/mi_dynrec.c:
        Minor cleanup
      mysql-test/r/func_str.result:
        Added more tests for QUOTE
      mysql-test/t/func_str.test:
        Added more tests for QUOTE
      mysys/mf_iocache.c:
        Removed compiler warnings
      sql/ha_innodb.cc:
        Added missing null to generated string.
      sql/item_cmpfunc.cc:
        Changed IF(expr, column, NULL) to take type from column
      sql/item_strfunc.cc:
        Cleaned up QUOTE() function and fixed bug in \0 and \Z handling.
      sql/log.cc:
        Minor cleanup
      sql/mysql_priv.h:
        Fixed problem with opt_enable_named_pipe
      sql/mysqld.cc:
        Fixed problem with opt_enable_named_pipe
        Fixed some syntax errors in windows code
      sql/set_var.cc:
        Removed compiler warnings
      sql/slave.cc:
        Removed compiler warnings
      sql/sql_show.cc:
        Removed compiler warnings
      92e5f607
    • unknown's avatar
      Fixed problem with BIGINT and shutdown on AIX · bf30b263
      unknown authored
      Moved IF(test,column,NULL) code to 4.0
      Changed mysys_priv.h to include my_pthread.h or my_no_pthread.h.
      Removed some CR's in os2 files.
      
      
      Docs/manual.texi:
        Changelog
      include/global.h:
        Fix for BIGINT problem on AIX
      include/my_no_pthread.h:
        Fixed typo
      libmysql/Makefile.shared:
        Fix for BIGINT problem on AIX
      mysql-test/mysql-test-run.sh:
        Fix to find xterm on AIX 4.3
      mysql-test/r/bigint.result:
        Fix for BIGINT problem on AIX
      mysql-test/r/func_if.result:
        Change results for IF() after reverting change.
      mysql-test/t/bigint.test:
        Fix for BIGINT problem on AIX
      mysys/Makefile.am:
        Fix for BIGINT problem on AIX
      mysys/my_gethostbyname.c:
        Cleanup
      mysys/my_init.c:
        Cleanup
      mysys/my_net.c:
        Cleanup
      mysys/my_os2cond.c:
        Space & CRLF cleanup
      mysys/my_os2dirsrch.c:
        Space & CRLF cleanup
      mysys/my_os2dirsrch.h:
        Space & CRLF cleanup
      mysys/my_os2dlfcn.c:
        Space & CRLF cleanup
      mysys/my_os2file64.c:
        Space & CRLF cleanup
      mysys/my_os2mutex.c:
        Space & CRLF cleanup
      mysys/my_os2thread.c:
        Space & CRLF cleanup
      mysys/my_os2tls.c:
        Space & CRLF cleanup
      mysys/mysys_priv.h:
        cleanup
      mysys/thr_rwlock.c:
        cleanup
      sql/ha_innobase.cc:
        Removed usage of sprintf()
        Fixed missing end \0 which caused control characters to appear in SHOW INNODB STATUS
      sql/item_cmpfunc.cc:
        Reverted change for IF()
      sql/mysqld.cc:
        Fix for shutdown on AIX
      bf30b263
  5. 11 Aug, 2002 2 commits
    • unknown's avatar
      trx0trx.h, trx0trx.c, ha_innobase.cc, ha_innobase.h: · 7ad3d0d2
      unknown authored
        Add tentative code which can be used in HANDLER implementation for InnoDB
      
      
      sql/ha_innobase.h:
        Add tentative code which can be used in HANDLER implementation for InnoDB
      sql/ha_innobase.cc:
        Add tentative code which can be used in HANDLER implementation for InnoDB
      innobase/trx/trx0trx.c:
        Add tentative code which can be used in HANDLER implementation for InnoDB
      innobase/include/trx0trx.h:
        Add tentative code which can be used in HANDLER implementation for InnoDB
      7ad3d0d2
    • unknown's avatar
      ha_innobase.cc, ut0ut.c, univ.i, ut0ut.h: · 12c89220
      unknown authored
        Redefine sprintf as ut_sprintf inside InnoDB code; some old Unixes may have a pointer as the return type of sprintf
      lock0lock.c:
        Add safety against buffer overruns in latest deadlock info
      srv0srv.c:
        Add safety against buffer overruns in SHOW INNODB STATUS
      os0thread.h, os0thread.c:
        Fix a portability bug introduced in Windows when we changed os_thread_id_t to be the same as os_thread_t
      
      
      innobase/os/os0thread.c:
        Fix a portability bug introduced in Windows when we changed os_thread_id_t to be the same as os_thread_t
      innobase/include/os0thread.h:
        Fix a portability bug introduced in Windows when we changed os_thread_id_t to be the same as os_thread_t
      innobase/srv/srv0srv.c:
        Add safety against buffer overruns in SHOW INNODB STATUS
      innobase/lock/lock0lock.c:
        Add safety against buffer overruns in latest deadlock info
      innobase/include/ut0ut.h:
        Redefine sprintf as ut_sprintf inside InnoDB code; some old Unixes may have a pointer as the return type of sprintf
      innobase/include/univ.i:
        Redefine sprintf as ut_sprintf inside InnoDB code; some old Unixes may have a pointer as the return type of sprintf
      innobase/ut/ut0ut.c:
        Redefine sprintf as ut_sprintf inside InnoDB code; some old Unixes may have a pointer as the return type of sprintf
      sql/ha_innobase.cc:
        Redefine sprintf as ut_sprintf inside InnoDB code; some old Unixes may have a pointer as the return type of sprintf
      12c89220
  6. 10 Aug, 2002 3 commits