1. 31 Aug, 2004 2 commits
    • unknown's avatar
      Do-compile: · 38105ee8
      unknown authored
        Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.
      
      
      Build-tools/Do-compile:
        Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.
      38105ee8
    • unknown's avatar
      Added global my_getopt_error_reporter function pointer which is · c9394a0f
      unknown authored
      used in the handle_options() function (instead of using additional 
      handle_option() parameter). The default value of the 
      my_getopt_error_reporter is default_reporter(). One can set it to
      other functions if case of need.
      
      
      client/mysql.cc:
        Removed extra handle_optins()'s parameter.
      client/mysqladmin.c:
        Removed extra handle_optins()'s parameter.
      client/mysqlbinlog.cc:
        Removed extra handle_optins()'s parameter.
      client/mysqlcheck.c:
        Removed extra handle_optins()'s parameter.
      client/mysqldump.c:
        Removed extra handle_optins()'s parameter.
      client/mysqlimport.c:
        Removed extra handle_optins()'s parameter.
      client/mysqlmanager-pwgen.c:
        Removed extra handle_optins()'s parameter.
      client/mysqlmanagerc.c:
        Removed extra handle_optins()'s parameter.
      client/mysqlshow.c:
        Removed extra handle_optins()'s parameter.
      client/mysqltest.c:
        Removed extra handle_optins()'s parameter.
      extra/my_print_defaults.c:
        Removed extra handle_optins()'s parameter.
      extra/mysql_install.c:
        Removed extra handle_optins()'s parameter.
      extra/mysql_waitpid.c:
        Removed extra handle_optins()'s parameter.
      extra/perror.c:
        Removed extra handle_optins()'s parameter.
      extra/resolve_stack_dump.c:
        Removed extra handle_optins()'s parameter.
      extra/resolveip.c:
        Removed extra handle_optins()'s parameter.
      include/my_getopt.h:
        Removed extra handle_optins()'s parameter.
      isam/isamchk.c:
        Removed extra handle_optins()'s parameter.
      isam/pack_isam.c:
        Removed extra handle_optins()'s parameter.
      myisam/mi_test1.c:
        Removed extra handle_optins()'s parameter.
      myisam/myisam_ftdump.c:
        Removed extra handle_optins()'s parameter.
      myisam/myisamchk.c:
        Removed extra handle_optins()'s parameter.
      myisam/myisampack.c:
        Removed extra handle_optins()'s parameter.
      sql/gen_lex_hash.cc:
        Removed extra handle_optins()'s parameter.
      sql/mysqld.cc:
        Removed extra handle_optins()'s parameter.
      tools/mysqlmanager.c:
        Removed extra handle_optins()'s parameter.
      c9394a0f
  2. 30 Aug, 2004 4 commits
    • unknown's avatar
      If the system has 64 bit "long", then "long long" does not add new · fb724e53
      unknown authored
      functionality. The existing code takes advantage of this when
      "typedef"ing 'longlong' in 'my_global.h'. This holds for Alpha CPUs.
      If the compiler then has prototypes for C99 functions 'strtoll()' and
      'strtoull()' but no implementation, the existing code in 'strtoull.c'
      collides with that prototype. These collisions are avoided now.
      (backport from 4.1)
      
      
      include/m_string.h:
        Extend the "fake" approach from 'strtoull()' onto 'strtoll()'
        (backport from 4.1).
      strings/strto.c:
        Ensure that calling file has included necessary headers,
        as these are needed at the upper level already
        (backport from 4.1).
      strings/strtol.c:
        Cleanup/alignment with the "long long" functions.
      strings/strtoll.c:
        When "long" is 64 bit already, system function 'strtol()' can be used.
        Header files 'my_global.h' and 'm_string.h' will manage that,
        if they are included early enough (backport from 4.1).
      strings/strtoul.c:
        Cleanup/alignment with the "long long" functions.
      strings/strtoull.c:
        When "long" is 64 bit already, system function 'strtoul()' can be used.
        Header files 'my_global.h' and 'm_string.h' will manage that,
        if they are included early enough (backport from 4.1).
      fb724e53
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0/ · 88fe390a
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.0
      
      
      88fe390a
    • unknown's avatar
      typo fixed · 4e2f80b4
      unknown authored
      4e2f80b4
    • unknown's avatar
      - removed mysql-test/t/flush_block_commit-master.opt as it collided · 0c549e36
      unknown authored
         with the sleep value we use for the test suite run during the
         release builds
      
      
      BitKeeper/deleted/.del-flush_block_commit-master.opt~3bcd295d5bf68796:
        Delete: mysql-test/t/flush_block_commit-master.opt
      0c549e36
  3. 29 Aug, 2004 3 commits
    • unknown's avatar
      log.cc: · 877503f5
      unknown authored
        Fixed missing * in comment in setup_windows_event_source
      
      
      sql/log.cc:
        Fixed missing * in comment in setup_windows_event_source
      877503f5
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 · d84b42b6
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.0
      
      
      sql/log.cc:
        Auto merged
      d84b42b6
    • unknown's avatar
      Fix for BUG#4500 "set character set replicates incorrectly" · 4014c093
      unknown authored
      We must not reset the charset in slave after each statement, otherwise the SET CHARACTER SET is cancelled immediately.
      Instead, we write a SET CHARACTER SET DEFAULT to the master's binlog when needed (like we already do for SET FOREIGN_KEY_CHECKS);
      such writing is not necessary in 4.1 (in 4.1 the bug does not exist, as the SET ONE_SHOT syntax is used).
      I have written a test and it works, but I'm not pushing the test as it requires building with all charsets.
      I have noticed differences between what is inserted in the master's table in 4.0 and 4.1, and alerted Bar.
      
      
      sql/log.cc:
        When SET CHARACTER SET has been used, we must reset the charset after the writing the statement, in the binlog.
        In 4.1, this resetting is already achieved by the SET ONE_SHOT syntax.
      sql/log_event.cc:
        In slave, we must not simply reset the charset after each statement: if we do this, the charset gets
        immediately after executing the SET CHARACTER SET! (BUG#4500).
      4014c093
  4. 28 Aug, 2004 1 commit
  5. 27 Aug, 2004 4 commits
    • unknown's avatar
      Code style fixes. · db15b919
      unknown authored
      Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options()
      
      
      mysql-test/r/lowercase_table.result:
        Changed foo database -> mysqltest
        More test cases
      mysql-test/t/lowercase_table.test:
        Changed foo database -> mysqltest
        More test cases
      mysys/my_getopt.c:
        Fix new code to use MySQL indentation style
      sql/log.cc:
        Change to use MySQL indentation style and naming conventions
        Remove usage of strlen() and strcat()
      sql/mysqld.cc:
        Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options()
      sql/sql_base.cc:
        Added comment
      sql/table.cc:
        Added #if MYSQL_VERSION_ID < 40100 to ensure code is merged correctly
      db15b919
    • unknown's avatar
      Compile all charset conversion tables if --with-extra-charsets=all · 434d385a
      unknown authored
      or --with-extra-charsets=complex is given.
      
      
      434d385a
    • unknown's avatar
      table.cc: · 14f96b2f
      unknown authored
        Bug #4558 Escape handling error for ENUM values in SJIS encoding
      
      
      sql/table.cc:
        Bug #4558 Escape handling error for ENUM values in SJIS encoding
      14f96b2f
    • unknown's avatar
      win1251.conf: · dd714c9a
      unknown authored
        Wrong UPPER/LOWER translation for Cyrillic letter tse was fixed.
        bug#5110
      
      
      sql/share/charsets/win1251.conf:
        Wrong UPPER/LOWER translation for Cyrillic letter tse was fixed.
        bug#5110
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      dd714c9a
  6. 26 Aug, 2004 11 commits
  7. 25 Aug, 2004 6 commits
    • unknown's avatar
      merge · 0572112d
      unknown authored
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      mysql-test/mysql-test-run.sh:
        merge (use new code)
      0572112d
    • unknown's avatar
      Remove default argument to mysql_truncate() · 8ed5952a
      unknown authored
      Update to new valgrind
      
      
      mysql-test/mysql-test-run.sh:
        Update for new valgrind
      sql/mysql_priv.h:
        Remove default argument to mysql_truncate()
      sql/sql_parse.cc:
        Remove default argument to mysql_truncate()
      8ed5952a
    • unknown's avatar
      Test case for Bug #4792 lower_case_table_names does not resolve db.tbl.column in SELECT list · 3b55c6f3
      unknown authored
      lowercase_table.result:
        New results for modified lowercase_table test
      lowercase_table.test:
        Added test case for all uppercase database when running under lower_case_table_names.  This really only failed under Windows.  Bug# 4792
      
      
      mysql-test/t/lowercase_table.test:
        Added test case for all uppercase database when running under lower_case_table_names.  This really only failed under Windows.  Bug# 4792
      mysql-test/r/lowercase_table.result:
        New results for modified lowercase_table test
      3b55c6f3
    • unknown's avatar
      Bug #4792 lower_case_table_names does not resolve db.tbl.column in SELECT list · ca59bf47
      unknown authored
      sql_base.cc:
        Added code to lowercase database name in insert_fields when lower_case_table_names=1. This fixes bug# 4792
      
      
      sql/sql_base.cc:
        Added code to lowercase database name in insert_fields when lower_case_table_names=1. This fixes bug# 4792
      ca59bf47
    • unknown's avatar
      Adding binary version information for debug/release version of libmysqld.dll · 335a791a
      unknown authored
      This was a customer request for to get the XP Logo Certification.
      
      Note for LenZ:
      Adding to the project libmysqld.dsp the file libmysqld.rc at compilation time will be created
      the libmysqld.res and this linked. For every release edit the libmysqld.rc
      version number.
      
      
      335a791a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · b15ee678
      unknown authored
      into build.mysql.com:/users/rburnett/mysql-4.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      client/mysql.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      b15ee678
  8. 24 Aug, 2004 6 commits
    • unknown's avatar
      buf0rea.c: · 73fe243d
      unknown authored
        Fix bug: if there was little file I/O in InnoDB, but the insert buffer was used, it could happen that 'Pending normal aio reads' was bigger than 0, but the I/O handler thread did not get waken up in 600 seconds. This resulted in a hang, and crashing of InnoDB.
      
      
      innobase/buf/buf0rea.c:
        Fix bug: if there was little file I/O in InnoDB, but the insert buffer was used, it could happen that 'Pending normal aio reads' was bigger than 0, but the I/O handler thread did not get waken up in 600 seconds. This resulted in a hang, and crashing of InnoDB.
      73fe243d
    • unknown's avatar
      All 'Makefile's must use '$(AR)' (not just 'ar') because the variable may contain options. · 47d87c63
      unknown authored
      
      libmysqld/Makefile.am:
        Always use 'make' variable '$(AR)' so that options (AIX 64 bit!) are included.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      47d87c63
    • unknown's avatar
      Fix warning VC++ and fix applied fisrt to source 4.1 · 9d1a9d72
      unknown authored
      
      mysys/my_lib.c:
        Same fix for bug #4737 that wrongly I did first on tree 4.1
      mysys/my_vsnprintf.c:
        Fix VC++ warning assuming that my_vsnprintf() is external
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      9d1a9d72
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0 · 6212c6e7
      unknown authored
      into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0
      
      
      6212c6e7
    • unknown's avatar
      Fix for bug #4340: find_in_set is case insensitive even on binary operators(2nd version) · b758a6d1
      unknown authored
      
      mysql-test/r/func_set.result:
        Fix for bug #4340: find_in_set is case insensitive even on binary operators
      mysql-test/t/func_set.test:
        Fix for bug #4340: find_in_set is case insensitive even on binary operators
      sql/item_func.cc:
        Fix for bug #4340: find_in_set is case insensitive even on binary operators
      b758a6d1
    • unknown's avatar
      - make sure to recreate all autoconf/automake-related files after · 8b11e715
      unknown authored
         modifying configure.in for the commercial tarballs
       - added my-innodb-heavy-4G.cnf to the distribution
      
      
      Build-tools/mysql-copyright:
         - make sure to recreate all autoconf/automake-related files after
           modifying configure.in
      support-files/Makefile.am:
         - added my-innodb-heavy-4G.cnf to the distribution
      8b11e715
  9. 23 Aug, 2004 3 commits