1. 12 Aug, 2002 8 commits
    • unknown's avatar
      manual.texi addition to mysql_real_escape_string() description. · 1f57bc05
      unknown authored
      
      Docs/manual.texi:
        addition to mysql_real_escape_string() description.
      1f57bc05
    • unknown's avatar
      Merge · 7b4d3c77
      unknown authored
      
      Docs/manual.texi:
        SCCS merged
      7b4d3c77
    • unknown's avatar
      manual.texi add change note for QUOTE(). · b9e95d84
      unknown authored
      manual.texi	Add entry for QUOTE() function.
      
      
      Docs/manual.texi:
        add change note for QUOTE().
      b9e95d84
    • unknown's avatar
      Fixes after last merge · 689a4387
      unknown authored
      
      mysql-test/r/func_if.result:
        Fixed results after merge
      sql/ha_innodb.cc:
        fixed typo after merge
      689a4387
    • unknown's avatar
      merge with 3.23.52 · 514e6048
      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
      514e6048
    • unknown's avatar
      merge · 071994ba
      unknown authored
      
      sql/ha_innobase.cc:
        merge (kept my changes to ha_innobase.cc to not use sprintf())
      071994ba
    • unknown's avatar
      Changed IF(expr, column, NULL) to take type from column · 9b193015
      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
      9b193015
    • unknown's avatar
      Fixed problem with BIGINT and shutdown on AIX · b2e94613
      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
      b2e94613
  2. 11 Aug, 2002 2 commits
    • unknown's avatar
      trx0trx.h, trx0trx.c, ha_innobase.cc, ha_innobase.h: · 714f2b0f
      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
      714f2b0f
    • unknown's avatar
      ha_innobase.cc, ut0ut.c, univ.i, ut0ut.h: · 86dc608c
      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
      86dc608c
  3. 10 Aug, 2002 6 commits
  4. 09 Aug, 2002 21 commits
    • unknown's avatar
      After discussing it with Monty by phone once more: · c2b4a304
      unknown authored
       - Only define alloca as a compiler builtin, if we use GCC and there
         is no alloca.h installed
      
      
      include/my_sys.h:
         - Only define alloca as a compiler builtin, if we use GCC and there
           is no alloca.h installed
      c2b4a304
    • unknown's avatar
      46f5b267
    • unknown's avatar
      manual.texi BDB log files have 10 digit extension, not 6. · 714705d8
      unknown authored
      
      Docs/manual.texi:
        BDB log files have 10 digit extension, not 6.
      714705d8
    • unknown's avatar
      Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.0 · 9b1d739e
      unknown authored
      into ram.(none):/home/ram/work/mysql-4.0
      
      
      9b1d739e
    • unknown's avatar
      added NULLs check to the QUOTE() function · f86ed73a
      unknown authored
      f86ed73a
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · bfdf7986
      unknown authored
      
      sql/sql_yacc.yy:
        Auto merged
      bfdf7986
    • unknown's avatar
      Fix for SSL and new my_getopt · 6974c3d0
      unknown authored
      Fix for syntax error bug in SET TRANSACTION ISOLATION
      
      
      
      BitKeeper/deleted/.del-sslopt-case.h~224c80e75dad4997:
        Delete: include/sslopt-case.h
      client/mysql.cc:
        Fix for SSL and new my_getopt
      client/mysqladmin.c:
        Fix for SSL and new my_getopt
      client/mysqlcheck.c:
        Fix for SSL and new my_getopt
      client/mysqldump.c:
        Fix for SSL and new my_getopt
      client/mysqlimport.c:
        Fix for SSL and new my_getopt
      client/mysqlshow.c:
        Fix for SSL and new my_getopt
      include/Makefile.am:
        Fix for SSL and new my_getopt
      include/sslopt-longopts.h:
        Fix for SSL and new my_getopt
      libmysql/libmysql.c:
        Fix for SSL and new my_getopt
      mysql-test/r/innodb.result:
        Simple test of transaction isolations
      mysql-test/t/innodb.test:
        Simple test of transaction isolations
      sql/mini_client.cc:
        Merge of mysql_real_connect() with libmysql.c
      sql/mysqld.cc:
        Simple test of transaction isolations
        Remove use of current_thd in get_options()
      sql/slave.cc:
        Indentation cleanup
      sql/sql_yacc.yy:
        Fix for SET TRANSACTION ...
      6974c3d0
    • unknown's avatar
      Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 · 4b0ce2a1
      unknown authored
      into sinisa.nasamreza.org:/mnt/work/mysql-4.0
      
      
      4b0ce2a1
    • unknown's avatar
      reverting a fix · addf8304
      unknown authored
      
      sql/sql_acl.cc:
        I revert my last change, as this requires further elaboration.
        For the moment we should document it in the manual.
        
        If MySQL 4.0.2 or higher is used with pre-4.0.2 user privilege table, 
        then user with no global privs at all will have privileges to:
        
        * LOCK TABLES
        * CREATE TEMPORARY TABLES
        * run commsnd SHOW DATABASES
      addf8304
    • unknown's avatar
      Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.0 · ea984d02
      unknown authored
      into ram.(none):/home/ram/work/mysql-4.0
      
      
      ea984d02
    • unknown's avatar
      test case for the QUOTE() function · 726ca26b
      unknown authored
      726ca26b
    • unknown's avatar
      bk resolve · 38e811fd
      unknown authored
      38e811fd
    • unknown's avatar
      ha_innobase.cc, trx0trx.h, lock0lock.c, trx0trx.c: · b9b404b1
      unknown authored
        Add some more safety margin to buffer sizes in prints
      
      
      innobase/trx/trx0trx.c:
        Add some more safety margin to buffer sizes in prints
      innobase/lock/lock0lock.c:
        Add some more safety margin to buffer sizes in prints
      innobase/include/trx0trx.h:
        Add some more safety margin to buffer sizes in prints
      sql/ha_innobase.cc:
        Add some more safety margin to buffer sizes in prints
      b9b404b1
    • unknown's avatar
      ha_innobase.cc: · 6a246376
      unknown authored
        Found the bug in modified innobase_mysqld_print_thd; the person who modifies code should test that his change works
      
      
      sql/ha_innobase.cc:
        Found the bug in modified innobase_mysqld_print_thd; the person who modifies code should test that his change works
      6a246376
    • unknown's avatar
      fixed mi_comp_unique to use _mi_compare_text() · b84a4f2f
      unknown authored
      b84a4f2f
    • unknown's avatar
      Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.0 · 66eb6db7
      unknown authored
      into ram.(none):/home/ram/work/mysql-4.0
      
      
      sql/item_strfunc.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      66eb6db7
    • unknown's avatar
      QUOTE() func changes according to monty's suggestions · 8c1d8eb4
      unknown authored
      
      sql/item_strfunc.cc:
        added bitmap for QUOTE() func
      sql/item_strfunc.h:
        moved fix_length_and_dec code to .h file
      sql/sql_yacc.yy:
        removed QUOTE stuff
      8c1d8eb4
    • unknown's avatar
      Merge lgrimmer@work.mysql.com:/home/bk/mysql-4.0 · 5dc118f4
      unknown authored
      into mysql.com:/space/my/mysql-4.0
      
      
      5dc118f4
    • unknown's avatar
      - RPM spec file adjustments for the features of the Max binary (disabled · 1c92372d
      unknown authored
         OpenSSL, enabled RAID)
       - added compatibility link safe_mysqld -> mysqld_safe
      
      
      support-files/mysql.spec.sh:
         - Turn off OpenSSL in MySQL-Max for now until it works properly again
         - enable RAID for the Max binary instead
         - added compatibility link: safe_mysqld -> mysqld_safe to ease the
           transition from 3.23
      1c92372d
    • unknown's avatar
      decode_montyspeak(); · 035b78d1
      unknown authored
      
      sql/share/dutch/errmsg.txt:
        Fix wrongly placed comma.
      035b78d1
    • unknown's avatar
      ha_innobase.cc: · 6fd5f345
      unknown authored
        Revert changes to sprintf until we know why control characters scrambled the output
      
      
      sql/ha_innobase.cc:
        Revert changes to sprintf until we know why control characters scrambled the output
      6fd5f345
  5. 08 Aug, 2002 3 commits