1. 26 Aug, 2004 33 commits
    • unknown's avatar
      Do-compile: · ca73f232
      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.
      ca73f232
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 56cfc57a
      unknown authored
      into mysql.com:/media/sda1/mysql/mysql-4.1-5126
      
      56cfc57a
    • unknown's avatar
      A short fix and test case for Bug#5126 · c52b07e2
      unknown authored
      "Mediumint and PS problem": just treat mediumint as long.
      
      
      libmysql/libmysql.c:
        A short fix for bug #5126 "Mediumint and PS problem": just
        treat mediumint as long, as it's sent just like long.
      tests/client_test.c:
        A test case for bug#5126
      c52b07e2
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5b373b26
      unknown authored
      into mysql.com:/M41/mysql-4.1
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      5b373b26
    • unknown's avatar
      - typo fix - make sure to include an existing file in the source · 90340b05
      unknown authored
         distribution...
      
      90340b05
    • unknown's avatar
      after merge · 0952c705
      unknown authored
      
      sql/item_row.cc:
        ds20 compat fix
      0952c705
    • unknown's avatar
      Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0 · 2cdbfbb4
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      2cdbfbb4
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · fd8120ac
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      client/mysql.cc:
        Auto merged
      fd8120ac
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0/ · 3362039a
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.0
      
      3362039a
    • unknown's avatar
      If the system has 64 bit "long", then "long long" does not add new · 334a5ad4
      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
      334a5ad4
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · fa4bafa4
      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
      fa4bafa4
    • unknown's avatar
      Portability fixes · f78bbc8c
      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
      f78bbc8c
    • unknown's avatar
      Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.0 · 8d887160
      unknown authored
      into hegel.txg.br:/home/miguel/bk/mysql-4.0
      
      8d887160
    • unknown's avatar
      Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0 · 4bdbe751
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      4bdbe751
    • unknown's avatar
      remove warning · b4f69dce
      unknown authored
      b4f69dce
    • unknown's avatar
      merged · e949b47f
      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
      e949b47f
    • unknown's avatar
      Fixed a bug in mysql.cc. Overriding password prompting · e817a9c6
      unknown authored
      by giving password as an argument later did not work.
      
      e817a9c6
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7bc178c1
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5219
      
      7bc178c1
    • unknown's avatar
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · 25c6fb93
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my41
      
      25c6fb93
    • unknown's avatar
      FileLogHandler.cpp, ndb_global.h: · f5d87a08
      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
      f5d87a08
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · ba927f9c
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5219
      
      ba927f9c
    • unknown's avatar
      ebce10c3
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · f45d8076
      unknown authored
      into build.mysql.com:/users/rburnett/mysql-4.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/mysql_priv.h:
        Auto merged
      f45d8076
    • unknown's avatar
      aba96f83
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · dca371dc
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my41
      
      dca371dc
    • unknown's avatar
      sco compile fix: MAXPATHLEN · c18a6ba6
      unknown authored
      c18a6ba6
    • unknown's avatar
      Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0 · 35bf81e5
      unknown authored
      into mysql.com:/space/my/mysql-4.0
      
      35bf81e5
    • unknown's avatar
      - Updated RPM spec file: MySQL-Max now requires MySQL-server instead · 2e2dcf58
      unknown authored
         of MySQL (BUG#3860)
      
      2e2dcf58
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 5664f564
      unknown authored
      into mysql.com:/home/my/mysql-4.0
      
      5664f564
    • unknown's avatar
      Fix ndb home path · 3522126c
      unknown authored
      3522126c
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0 · 73526665
      unknown authored
      into mysql.com:/M40/mysql-4.0
      
      73526665
    • unknown's avatar
      ctype-latin1.c: · 8aee2005
      unknown authored
        Revert this change, it was done in a mistake.
      
      
      strings/ctype-latin1.c:
        Revert this change, it was done in a mistake.
      8aee2005
  2. 25 Aug, 2004 7 commits
    • unknown's avatar
      merge · 7c0a7b2d
      unknown authored
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      mysql-test/mysql-test-run.sh:
        merge (use new code)
      7c0a7b2d
    • unknown's avatar
      Remove default argument to mysql_truncate() · 7586eae8
      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()
      7586eae8
    • unknown's avatar
      mysql.h: · 54e7e92c
      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.
      54e7e92c
    • unknown's avatar
      Test case for Bug #4792 lower_case_table_names does not resolve db.tbl.column in SELECT list · 81798982
      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
      81798982
    • unknown's avatar
      Cleanup. · 34b3eb82
      unknown authored
      34b3eb82
    • unknown's avatar
      Bug #4792 lower_case_table_names does not resolve db.tbl.column in SELECT list · 32fd1ca1
      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
      32fd1ca1
    • unknown's avatar
      mysql.cc: · c0a0bc40
      unknown authored
        Bug#3453: MySQL output formatting in multibyte character sets
      
      
      client/mysql.cc:
        Bug#3453: MySQL output formatting in multibyte character sets
      c0a0bc40