1. 03 Jun, 2002 6 commits
  2. 02 Jun, 2002 3 commits
    • unknown's avatar
      merge with 3.23 · 7cb2e2d1
      unknown authored
      
      BitKeeper/deleted/.del-rpl_empty_master_crash.result:
        Delete: mysql-test/r/rpl_empty_master_crash.result
      BitKeeper/deleted/.del-rpl_empty_master_crash.test:
        Delete: mysql-test/t/rpl_empty_master_crash.test
      configure.in:
        Auto merged
      include/my_net.h:
        Auto merged
      include/my_pthread.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/t/func_math.test:
        Auto merged
      mysys/my_gethostbyname.c:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      7cb2e2d1
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · 0e5f0023
      unknown authored
      
      client/mysqltest.c:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      0e5f0023
    • unknown's avatar
      Fixed bug in wait_for_relay_log_space() · 499ebe54
      unknown authored
      Added checking of sem_init() in configure.
      
      
      client/mysqltest.c:
        Cleanup
      configure.in:
        Added checking of sem_init
      sql/hostname.cc:
        Portability fix
      sql/slave.cc:
        Fixed bug in wait_for_relay_log_space()
      499ebe54
  3. 01 Jun, 2002 2 commits
  4. 31 May, 2002 9 commits
    • unknown's avatar
      Merge nleippe@work.mysql.com:/home/bk/mysql · 32113efe
      unknown authored
      into nick.leippe.com:/home/nick/mysql/mysql
      
      
      32113efe
    • unknown's avatar
      fixed 'load table from master' hang when host is empty · 169a4d92
      unknown authored
      added respective test case
      
      
      sql/slave.cc:
        fixed load table from master hang when host is empty
      169a4d92
    • unknown's avatar
      Fixed a bug in my_getopt. · 2e86ba7e
      unknown authored
      
      mysys/my_getopt.c:
        Fixed two bugs in my_getopt:
        - Didn't exit with error if a short option was not recognized. Fixed.
        - If unrecognized short option was not the first one in the list,
          printed "unknown option" error for wrong option. Fixed.
      2e86ba7e
    • unknown's avatar
      Fixed a bug in mysql client. · b379016d
      unknown authored
      
      client/mysql.cc:
        Fixed a bug in option -N
      b379016d
    • unknown's avatar
      Portability fixes for SCO and HPUX · 0ceaf6d2
      unknown authored
      Change TRUNCATE(number) to truncate towards zero for negative numbers
      Fix NULL handling for DESCRIBE table_name
      
      
      Docs/manual.texi:
        Update of TRUNCATE() information
      configure.in:
        Fix for HPUX
      extra/resolveip.c:
        Fix for SCO
      include/my_net.h:
        Fix for HPUX
      libmysql/libmysql.c:
        Removed warning on HPUX 10.20
      mysql-test/r/func_math.result:
        Test of new TRUNCATE handling
      mysql-test/t/func_math.test:
        Test of new TRUNCATE handling
      mysys/my_gethostbyname.c:
        Portability fix
      sql/item_func.cc:
        Change TRUNCATE(number) to truncate towards zero for negative numbers
      sql/sql_show.cc:
        Fix NULL handling for DESCRIBE table_name
      0ceaf6d2
    • unknown's avatar
      Fixed a problem with --skip-networking. · 2c058d84
      unknown authored
      This fix should be merged into 4.0 and 4.1
      
      
      2c058d84
    • unknown's avatar
      Fixed a bug in mysql client. · 79efd9db
      unknown authored
      
      client/mysql.cc:
        Fixed a bug that caused segmentation fault in internal 'tee' command.
      79efd9db
    • unknown's avatar
      Added more complete master and slave configuration section · 95f2b1e6
      unknown authored
      
      support-files/my-huge.cnf.sh:
        added more complete sample master and slave configuration
      95f2b1e6
    • unknown's avatar
      Fixed bug: load table from master w/empty master would hang. · 0720fe59
      unknown authored
      Now it properly returns error.
      Added respective test case.
      
      
      sql/repl_failsafe.cc:
        fixed bug: load table from master w/ empty master would hang.
        Now it properly returns error.
      0720fe59
  5. 30 May, 2002 2 commits
  6. 29 May, 2002 10 commits
    • unknown's avatar
      96a1daa6
    • unknown's avatar
      Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 · 324cb57b
      unknown authored
      into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
      
      
      324cb57b
    • unknown's avatar
      Fixed a bug. · b7529249
      unknown authored
      
      sql/slave.h:
        Fixed a bug in option handling.
      sql/sql_repl.h:
        Fixed a bug in option handling.
      b7529249
    • unknown's avatar
      Some fixes for user resources management · aea0ae80
      unknown authored
      aea0ae80
    • unknown's avatar
      Fixed a bug in make test, non-debug version. · 75d312bc
      unknown authored
      
      sql/slave.cc:
        Released some variables in non-debug version. These are needed
        in mysqld.cc my_getopt struct, which defines some options,
        which are used by mysql_test in a non-debug version.
      sql/sql_repl.cc:
        Released some variables in non-debug version. These are needed
        in mysqld.cc my_getopt struct, which defines some options,
        which are used by mysql_test in a non-debug version.
      75d312bc
    • unknown's avatar
      Added useful exit error code for programs using my_getopt in case · a90b2f30
      unknown authored
      of an error in option handling. This can sometimes be useful in
      scripts.
      
      Changed some exit code names and corresponding numbers.
      
      Fixed a bug in mysqld.cc, in replication related options.
      
      Added a global flag in my_getopt, which can be set by any program
      that is using my_getopt, which tells whether the client should
      print the error message itself, or whether my_getopt should do it.
      The default is that my_getopt will print the error messages.
      
      
      client/mysql.cc:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      client/mysqladmin.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      client/mysqlbinlog.cc:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      client/mysqlcheck.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      client/mysqldump.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      client/mysqlimport.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      client/mysqlmanager-pwgen.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      client/mysqlmanagerc.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      client/mysqlshow.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      client/mysqltest.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      client/thread_test.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      extra/my_print_defaults.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      extra/mysql_install.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      extra/perror.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      extra/resolve_stack_dump.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      extra/resolveip.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      include/my_getopt.h:
        Added global (flag) variable which tells my_getopt whether to
        print errors or just silently exit with proper error code.
      include/mysys_err.h:
        Changed exit code names and corresponding numbers.
      isam/isamchk.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      isam/pack_isam.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      myisam/ft_dump.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      myisam/ft_eval.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      myisam/ft_test1.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      myisam/mi_test1.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      myisam/myisamchk.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      myisam/myisampack.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      mysys/my_getopt.c:
        Changed exit code names and corresponding numbers. Added a flag
        for checking whether my_getopt should print the error message,
        or whether it should be printed by the client itself.
      sql/gen_lex_hash.cc:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      sql/mysqld.cc:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
        
        Fixed a bug when compiling in non-debug mode, some replication
        related options were not enabled while they should be. This made
        'make test' to fail in rpl000010 when --with-debug was not used.
      tools/mysqlmanager.c:
        Added useful exit error code for programs using my_getopt in case
        of an error in option handling. This can sometimes be useful in
        scripts.
      a90b2f30
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · d5adf39c
      unknown authored
      
      Docs/manual.texi:
        Auto merged
      d5adf39c
    • unknown's avatar
      ha_innobase.cc: · 336d94bc
      unknown authored
        Fix an assertion failure in ha_innobase.cc about line 302 when a user has used user level locks and closes a connection; this was reported by Jeremy Zawodny
      
      
      sql/ha_innobase.cc:
        Fix an assertion failure in ha_innobase.cc about line 302 when a user has used user level locks and closes a connection; this was reported by Jeremy Zawodny
      336d94bc
    • unknown's avatar
      Style fixup. · bb4cf4c2
      unknown authored
      bb4cf4c2
    • unknown's avatar
      A few style/spelling fixups. · 3dcf2214
      unknown authored
      3dcf2214
  7. 28 May, 2002 8 commits