1. 02 Dec, 2004 18 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · fc9d5dee
      unknown authored
      into build.mysql.com:/users/tsmith/m/41/b
      
      
      client/mysqldump.c:
        Auto merged
      fc9d5dee
    • unknown's avatar
      myisam/mi_packrec.c · 66c3afa3
      unknown authored
          more robust checks (catch more corruptions)
      
      
      myisam/mi_packrec.c:
        more robust checks (catch more corruptions)
      66c3afa3
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · ab762690
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      ab762690
    • unknown's avatar
      merge (new code fixed the ALTER TABLE problem) · 374252c6
      unknown authored
      374252c6
    • unknown's avatar
      merged on pull · 35f9ecc1
      unknown authored
      
      mysql-test/r/rpl_start_stop_slave.result:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      mysql-test/r/type_enum.result:
        merged test cases
      mysql-test/t/type_enum.test:
        merged test cases
      35f9ecc1
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 646deed9
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.clean
      
      
      646deed9
    • unknown's avatar
      Cleanups during review stage · 93cf297f
      unknown authored
      Added auto-correct of field length for enum/set tables for ALTER TABLE
      This is becasue of a bug in previous MySQL 4.1 versions where the length for enum/set was set incorrectly after ALTER TABLE
      
      
      mysql-test/r/rpl_start_stop_slave.result:
        Fixed wrong test
      mysql-test/r/type_enum.result:
        Added test for wrong enum/set length after alter table
      mysql-test/t/ps.test:
        removed empty line
      mysql-test/t/type_enum.test:
        Added test for wrong enum/set length after alter table
      sql/field.cc:
        Added auto-correct of field length for enum/set tables.
        This is becasue of a bug in previous MySQL 4.1 versions where the length for enum/set was set incorrectly after ALTER TABLE
      sql/item_cmpfunc.cc:
        Simple optimization
      sql/mysql_priv.h:
        Made local function global
      sql/set_var.cc:
        Simple cleanup
      sql/sql_table.cc:
        Simple cleanups & optimizations
      93cf297f
    • unknown's avatar
      Fixes to make mysql-test-run --embedded-server working · d3c5c499
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        Tests that can't be fixed now showed in the ignore-list
      mysql-test/r/query_cache.result.es:
        test result renewed
      mysql-test/r/select.result.es:
        test result renewed
      mysql-test/r/type_blob.result.es:
        test result renewed
      mysql-test/r/type_float.result.es:
        test result renewed
      sql/sql_prepare.cc:
        time values sending fixed
      tests/client_test.c:
        that doesnt work in embedded server
      BitKeeper/etc/ignore:
        Added libmysqld/ha_archive.cc libmysqld/ha_example.cc libmysqld/ha_tina.cc to the ignore list
      d3c5c499
    • unknown's avatar
      Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 · f36f6364
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.clean
      
      
      f36f6364
    • unknown's avatar
      Fix for Bug#6377 "Password Generation Discrepancy" · 29b3ae4d
      unknown authored
      
      client/mysqladmin.cc:
        Fix for Bug#6377 "Password Generation Discrepancy":
        this is not a MySQL bug.
        The problem is that Windows command line client doesn't trim single quotes
        from arguments, as any UNIX shell does.
        The fix just checks for this condition and gives a warning if it is true.
      29b3ae4d
    • unknown's avatar
      A fix (bug #6878: Crash with engine=memory). · 33a4b35e
      unknown authored
      
      heap/hp_create.c:
        A fix (bug #6878: Crash with engine=memory).
        Record length should be >= sizeof(byte*).
      33a4b35e
    • unknown's avatar
      38487139
    • unknown's avatar
      A fix (bug #6878: Crash with engine=memory). · a845e882
      unknown authored
      
      heap/hp_open.c:
        A fix (bug #6878: Crash with engine=memory).
        Record length should be >= sizeof(byte*).
      a845e882
    • unknown's avatar
      Fixes (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv · 491a3d90
      unknown authored
             bug #6933: error in the tests/grant.pl test).
      
      
      mysql-test/r/grant.result:
        A fix (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv).
      mysql-test/t/grant.test:
        A fix (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv).
      sql/sql_acl.cc:
        A fix (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv).
        The problem is that we use whole key length (including 'Column_name' keypart)                          
        during scanning the 'columns_priv' table in case of revoke_grant.
      tests/grant.pl:
        A fix (bug #6933: error in the tests/grant.pl test).
      491a3d90
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6f20687e
      unknown authored
      into mysql.com:/usr/home/bar/mysql-4.1-enum
      
      
      6f20687e
    • unknown's avatar
      mgmapi.cpp: · 39d62ccc
      unknown authored
        bug #6919
      
      
      ndb/src/mgmapi/mgmapi.cpp:
        bug #6919
      39d62ccc
    • unknown's avatar
      Bug #6379: ENUM values are incorrectly converted · 5167b5f0
      unknown authored
      - add_field_to_list() now uses <List>String
      instead of TYPELIB to be able to distinguish
      literals 'aaa' and hex literals 0xaabbcc.
      - move some code from add_field_to_list() where
        we don't know column charset yet, to 
        mysql_prepare_table(), where we do.
      
      
      5167b5f0
    • unknown's avatar
      Bug #6815 SHOW CREATE TABLE hangs after upgrading to 4.1 · ef13523d
      unknown authored
      A test doesn't seem to be possible.
      
      
      ef13523d
  2. 01 Dec, 2004 8 commits
    • unknown's avatar
      dd59a2d7
    • unknown's avatar
      configure.in: · befcff9b
      unknown authored
        Let MySQL check the existence of readdir_r with 3 arguments; Solaris seems to have just 2 args
        Check the existence of readdir_r and localtime_r; even though MySQL does check these too, we need our own check for Hot Backup code
      os0file.c:
        Use re-entrant readdir_r where available
      ut0ut.c:
        Make a function to use thread-safe localtime_r where available; that particular function was not called from anywhere, though
      
      
      innobase/ut/ut0ut.c:
        Make a function to use thread-safe localtime_r where available; the function was not called from anywhere, though
      innobase/os/os0file.c:
        Use re-entrant readdir_r where available
      innobase/configure.in:
        Let MySQL check the existence of readdir_r with 3 arguments; Solaris seems to have just 2 args
      befcff9b
    • unknown's avatar
      Move common trailing space checks into an include file. · 561ee8fd
      unknown authored
      Check UCS2 trailing spaces.
      
      
      mysql-test/r/ctype_ucs.result:
        Move common trailing space checks into an include file.
        Check UCS2 trailing spaces.
        Fix UCS2 to handle trailing spaces in PAD way.
      mysql-test/t/ctype_ucs.test:
        Move common trailing space checks into an include file.
        Check UCS2 trailing spaces.
        Fix UCS2 to handle trailing spaces in PAD way.
      mysql-test/t/endspace.test:
        Move common trailing space checks into an include file.
        Check UCS2 trailing spaces.
        Fix UCS2 to handle trailing spaces in PAD way.
      strings/ctype-ucs2.c:
        Move common trailing space checks into an include file.
        Check UCS2 trailing spaces.
        Fix UCS2 to handle trailing spaces in PAD way.
      561ee8fd
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2d2d61d1
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      2d2d61d1
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 28d18c00
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      28d18c00
    • unknown's avatar
      testcase for bug#6871, ndb, replace with collations · e4dbc32f
      unknown authored
      
      mysql-test/r/ndb_charset.result:
        testcase for bug#6871
      mysql-test/t/ndb_charset.test:
        testcase for bug#6871
      e4dbc32f
    • unknown's avatar
      bug#6871 - ndb · 62e7f1ca
      unknown authored
        replace with charsets
        check update of primary key wo/ normalizing
        
      
      
      ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        Make sure tXfrmFlag is false when checking for update of primary key
      62e7f1ca
    • unknown's avatar
      openssl_1.result, have_openssl_1.require, openssl_1.test: · 4386e0c3
      unknown authored
        Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)
      
      
      mysql-test/t/openssl_1.test:
        Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)
      mysql-test/r/have_openssl_1.require:
        Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)
      mysql-test/r/openssl_1.result:
        Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      4386e0c3
  3. 30 Nov, 2004 14 commits
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · 49156903
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-clean
      
      
      49156903
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 · 682a8fbb
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-clean
      
      
      mysql-test/r/flush_block_commit.result:
        Auto merged
      mysql-test/t/flush_block_commit.test:
        Auto merged
      sql/lock.cc:
        Auto merged
      682a8fbb
    • unknown's avatar
      two-line fix for BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next... · 352ad815
      unknown authored
      two-line fix for BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next FLUSH...LOCK hang forever"
      (originally reported as "second run of innobackup hangs forever and can even hang server").
      Plus testcase for the bugfix and comments about global read locks.
      
      
      mysql-test/r/flush_block_commit.result:
        result update
      mysql-test/t/flush_block_commit.test:
        testing bugfix (originally: second run of innobackup hangs)
      sql/lock.cc:
        When we are in start_waiting_global_read_lock(), if we ourselves have
        the global read lock, there is nothing to start. This makes a pair with how 
        wait_if_global_read_lock() behaves when we ourselves have the global read lock.
        Previously, start_waiting_global_read_lock() decremented protect... whereas wait_if_global_read_lock()
        hadn't incremented it => very wrong => hangs.
        Descriptive comments on how global read lock works.
      352ad815
    • unknown's avatar
      mysqld_safe.sh: · 0a6699d6
      unknown authored
        Fix calls to my_print_defaults.  Some how, --loose-verbose had been added before --no-defaults/defaults-file, which must be the first option.  
        NOTE: this may make some installations behave differently, if they depend on this broken behavior.
      
      
      scripts/mysqld_safe.sh:
        Fix calls to my_print_defaults.  Some how, --loose-verbose had been added before --no-defaults/defaults-file, which must be the first option.  
        NOTE: this may make some installations behave differently, if they depend on this broken behavior.
      0a6699d6
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · 12420401
      unknown authored
      into hundin.mysql.fi:/home/marko/k/mysql-4.1
      
      
      innobase/include/lock0lock.h:
        Auto merged
      12420401
    • unknown's avatar
      lock0lock.h: · 1983ff72
      unknown authored
        Rename lock_table_exclusive to lock_is_table_exclusive
        (somehow this change was omitted from last changeset)
      
      
      innobase/include/lock0lock.h:
        Rename lock_table_exclusive to lock_is_table_exclusive
        (somehow this change was omitted from last changeset)
      1983ff72
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 4579806f
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      4579806f
    • unknown's avatar
      fixed so that warning on missing support for engine only printed once even if... · ac207293
      unknown authored
      fixed so that warning on missing support for engine only printed once even if option given multiple times
      
      
      
      ac207293
    • unknown's avatar
      typo fixed · 928d2a8b
      unknown authored
      928d2a8b
    • unknown's avatar
      fixed error in test result · be733ad1
      unknown authored
          added extra calls to retrieve connectstring used
          reengineered connect somewhat to make retries etc explicit
      
      
      mysql-test/r/ndb_index_unique.result:
        fixed error in test result
      ndb/include/mgmapi/mgmapi.h:
        added extra calls to retrieve connectstring used
      ndb/include/mgmcommon/ConfigRetriever.hpp:
        added extra calls to retrieve connectstring used
      ndb/include/ndbapi/ndb_cluster_connection.hpp:
        added extra calls to retrieve connectstring used
        reengineered connect somewhat to make retries etc explicit
      ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        added extra calls to retrieve connectstring used
      ndb/src/mgmapi/mgmapi.cpp:
        added extra calls to retrieve connectstring used
      ndb/src/mgmclient/CommandInterpreter.cpp:
        moved parse of quit to avoid connect before
      ndb/src/ndbapi/Ndbinit.cpp:
        reengineered connect somewhat to make retries etc explicit
      ndb/src/ndbapi/ndb_cluster_connection.cpp:
        added extra calls to retrieve connectstring used
        reengineered connect somewhat to make retries etc explicit
      ndb/tools/listTables.cpp:
        reengineered connect somewhat to make retries etc explicit
      sql/ha_ndbcluster.cc:
        added extra calls to retrieve connectstring used
        reengineered connect somewhat to make retries etc explicit
      be733ad1
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · 99e69f26
      unknown authored
      into hundin.mysql.fi:/home/marko/k/mysql-4.1
      
      
      innobase/lock/lock0lock.c:
        Auto merged
      99e69f26
    • unknown's avatar
      lock0lock.c: · 93d5f62e
      unknown authored
        If UNIV_DEBUG is defined, lock_get_type() was called before function definition: fix this
      
      
      innobase/lock/lock0lock.c:
        If UNIV_DEBUG is defined, lock_get_type() was called before function definition: fix this
      93d5f62e
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · 892cec85
      unknown authored
      into hundin.mysql.fi:/home/marko/k/mysql-4.1
      
      
      892cec85
    • unknown's avatar
      row0sel.c: · 668d61b9
      unknown authored
        Remove compiler warning as I had forgotten an include file
      
      
      innobase/row/row0sel.c:
        Remove compiler warning as I had forgotten an include file
      668d61b9