1. 26 Aug, 2004 30 commits
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · 78b4ddbe
      unknown authored
      into mysql.com:/M41/mysql-4.1
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      78b4ddbe
    • unknown's avatar
      - typo fix - make sure to include an existing file in the source · 4b47cc97
      unknown authored
         distribution...
      
      
      4b47cc97
    • unknown's avatar
      after merge · 82257f94
      unknown authored
      
      sql/item_row.cc:
        ds20 compat fix
      82257f94
    • unknown's avatar
      Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0 · 94a39ec6
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      94a39ec6
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 90301a06
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      client/mysql.cc:
        Auto merged
      90301a06
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0/ · ad3fed2e
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.0
      
      
      ad3fed2e
    • unknown's avatar
      If the system has 64 bit "long", then "long long" does not add new · 1275b4c5
      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.
      
      
      include/m_string.h:
        Extend the "fake" approach from 'strtoull()' onto 'strtoll()'.
      strings/strto.c:
        Ensure that calling file has included necessary headers,
        as these are needed at the upper level already.
      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.
      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.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      1275b4c5
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 717fc0b0
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      libmysql/libmysql.c:
        Auto merged
      mysql-test/r/endspace.result:
        Auto merged
      strings/ctype-bin.c:
        Auto merged
      strings/ctype-mb.c:
        Auto merged
      717fc0b0
    • unknown's avatar
      Portability fixes · 44b2807e
      unknown authored
      Fixed bug in end space handle for WHERE text_column="constant"
      
      
      heap/hp_hash.c:
        Optimzations (no change of logic)
      libmysql/libmysql.c:
        Added missing casts (portability fix)
      myisam/mi_key.c:
        Changed macro to take arguments and not depend on local variables
        Simple indentation fixes ?
      mysql-test/r/connect.result:
        Added test for setting empty password
      mysql-test/r/create_select_tmp.result:
        TYPE -> ENGINE
      mysql-test/r/ctype_utf8.result:
        Combine drop's
      mysql-test/r/endspace.result:
        Added more tests to test end space behaviour
      mysql-test/r/having.result:
        Added missing DROP TABLE
      mysql-test/r/type_blob.result:
        Added more tests to ensure that fix for BLOB usage is correct
      mysql-test/r/type_timestamp.result:
        Add test from 4.0
      mysql-test/t/connect.test:
        Added test for setting empty password
      mysql-test/t/create_select_tmp.test:
        TYPE -> ENGINE
      mysql-test/t/ctype_utf8.test:
        Combine drop's
      mysql-test/t/endspace.test:
        Added more tests to test end space behaviour
      mysql-test/t/having.test:
        Added missing DROP TABLE
      mysql-test/t/type_blob.test:
        Added more tests to ensure that fix for BLOB usage is correct
      mysql-test/t/type_timestamp.test:
        Add test from 4.0
      sql/field.cc:
        Removed not used variable
        Portability fix (cast)
        Simplified Field_str::double()
        Simple indentation cleanups
      sql/field.h:
        Removed not needed class variable
      sql/item_cmpfunc.cc:
        Indentation fix
      sql/item_strfunc.cc:
        Use on stack variable for Item_str_func::val() instead of str_value.
        This makes it safe to use str_value inside the Item's val function.
        Cleaned up LEFT() usage, thanks to the above change
      sql/item_sum.cc:
        Indentation cleanups
      sql/protocol.cc:
        Added missing cast
      sql/sql_acl.cc:
        Indentatin cleanups.
        Added missing cast
        Simple optimization of get_sort()
      sql/sql_select.cc:
        Don't use 'ref' to search on text field that is not of type BINARY (use 'range' instead).
        The reson is that for 'ref' we use 'index_next_same' to read the next possible row. 
        For text fields, rows in a ref may not come in order, like for 'x', 'x\t' 'x ' (stored in this order) which causes a search for 'column='x ' to fail
      sql/tztime.cc:
        Simple cleanup
      strings/ctype-bin.c:
        Comment fixes
      strings/ctype-mb.c:
        Changed variable names for arguments
      44b2807e
    • unknown's avatar
      Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.0 · 5dbfa9db
      unknown authored
      into hegel.txg.br:/home/miguel/bk/mysql-4.0
      
      
      5dbfa9db
    • unknown's avatar
      Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0 · 5c30236a
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      5c30236a
    • unknown's avatar
      remove warning · e1885326
      unknown authored
      e1885326
    • unknown's avatar
      merged · e8d41a5b
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      VC++Files/sql/mysqld.dsp:
        Auto merged
      client/mysql.cc:
        Auto merged
      client/mysqladmin.c:
        Auto merged
      BitKeeper/deleted/.del-mysql_install.c~8c089740d79a92:
        Auto merged
      client/mysqlbinlog.cc:
        Auto merged
      client/mysqlcheck.c:
        Auto merged
      client/mysqldump.c:
        Auto merged
      client/mysqlimport.c:
        Auto merged
      client/mysqlmanager-pwgen.c:
        Auto merged
      client/mysqlshow.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      extra/my_print_defaults.c:
        Auto merged
      extra/perror.c:
        Auto merged
      extra/resolve_stack_dump.c:
        Auto merged
      extra/resolveip.c:
        Auto merged
      include/my_getopt.h:
        Auto merged
      innobase/buf/buf0rea.c:
        Auto merged
      isam/isamchk.c:
        Auto merged
      isam/pack_isam.c:
        Auto merged
      libmysqld/Makefile.am:
        Auto merged
      myisam/mi_test1.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      myisam/myisampack.c:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      sql/gen_lex_hash.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      tools/mysqlmanager.c:
        Auto merged
      e8d41a5b
    • unknown's avatar
      Fixed a bug in mysql.cc. Overriding password prompting · c75e4dfe
      unknown authored
      by giving password as an argument later did not work.
      
      
      c75e4dfe
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · fccc404a
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5219
      
      
      fccc404a
    • unknown's avatar
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · ad3e480c
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my41
      
      
      ad3e480c
    • unknown's avatar
      FileLogHandler.cpp, ndb_global.h: · 536ce708
      unknown authored
        sco and others: use PATH_MAX always
      
      
      ndb/include/ndb_global.h:
        sco and others: use PATH_MAX always
      ndb/src/common/logger/FileLogHandler.cpp:
        sco and others: use PATH_MAX always
      536ce708
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0eab587e
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5219
      
      
      0eab587e
    • unknown's avatar
      45f49c60
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · ad1f3bb1
      unknown authored
      into build.mysql.com:/users/rburnett/mysql-4.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/mysql_priv.h:
        Auto merged
      ad1f3bb1
    • unknown's avatar
      42771f98
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · 76ec2622
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my41
      
      
      76ec2622
    • unknown's avatar
      sco compile fix: MAXPATHLEN · 08595c46
      unknown authored
      08595c46
    • unknown's avatar
      Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0 · 337f02b7
      unknown authored
      into mysql.com:/space/my/mysql-4.0
      
      
      337f02b7
    • unknown's avatar
      - Updated RPM spec file: MySQL-Max now requires MySQL-server instead · 0830992f
      unknown authored
         of MySQL (BUG#3860)
      
      
      0830992f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · fe9b9d57
      unknown authored
      into mysql.com:/home/my/mysql-4.0
      
      
      fe9b9d57
    • unknown's avatar
      Fix ndb home path · c1825f20
      unknown authored
      c1825f20
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0 · a0dd3a30
      unknown authored
      into mysql.com:/M40/mysql-4.0
      
      
      a0dd3a30
    • unknown's avatar
      ctype-latin1.c: · b6425bc2
      unknown authored
        Revert this change, it was done in a mistake.
      
      
      strings/ctype-latin1.c:
        Revert this change, it was done in a mistake.
      b6425bc2
  2. 25 Aug, 2004 10 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
      mysql.h: · 3818b0d3
      unknown authored
        Fix a misleading plural that should be singular.
        Fix other typos while I'm at it.
      
      
      include/mysql.h:
        Fix a misleading plural that should be singular.
        Fix other typos while I'm at it.
      3818b0d3
    • 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
      Cleanup. · 7dfdfa9f
      unknown authored
      7dfdfa9f
    • 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
      mysql.cc: · b20d1ce4
      unknown authored
        Bug#3453: MySQL output formatting in multibyte character sets
      
      
      client/mysql.cc:
        Bug#3453: MySQL output formatting in multibyte character sets
      b20d1ce4
    • unknown's avatar
    • unknown's avatar
      utr11-dump.c: · 51fd9ed4
      unknown authored
        new file
      
      
      51fd9ed4
    • 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