1. 05 Oct, 2004 4 commits
  2. 04 Oct, 2004 23 commits
  3. 03 Oct, 2004 6 commits
    • unknown's avatar
      make sure old mysqld's are shutdown · b16d37db
      unknown authored
      b16d37db
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 512fea98
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
      
      512fea98
    • unknown's avatar
      merge error · 81ed8f59
      unknown authored
      81ed8f59
    • unknown's avatar
      merge error · 00f3e2ee
      unknown authored
      00f3e2ee
    • unknown's avatar
      Merge · 6b1895b8
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/ha_ndbcluster.h:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      mysql-test/mysql-test-run.sh:
        SCCS merged
      sql/ha_ndbcluster.cc:
        SCCS merged
      6b1895b8
    • unknown's avatar
      mysqldump.c: · 995ca181
      unknown authored
        typos in comment.
      
      
      client/mysqldump.c:
        typos in comment.
      995ca181
  4. 01 Oct, 2004 7 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3a15d088
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      3a15d088
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 966b8c9d
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      966b8c9d
    • unknown's avatar
      Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1 · 64ab4d91
      unknown authored
      into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.1
      
      64ab4d91
    • unknown's avatar
      grant.test, grant.result, sql_acl.cc: · e3540d5e
      unknown authored
        BUG #5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass.
      
      
      sql/sql_acl.cc:
        BUG #5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass.
      mysql-test/r/grant.result:
        BUG #5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass.
      mysql-test/t/grant.test:
        BUG #5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass.
      e3540d5e
    • unknown's avatar
      ha_innodb.cc: · f9b16928
      unknown authored
        A partial bugfix to a multibyte charset / column prefix index bug: my_charpos() does not handle right some cases, we try to mask the bug for ASCII chars < 128 in the UTF-8 charset
      
      
      sql/ha_innodb.cc:
        A partial bugfix to a multibyte charset / column prefix index bug: my_charpos() does not handle right some cases, we try to mask the bug for ASCII chars < 128 in the UTF-8 charset
      f9b16928
    • unknown's avatar
      fsp0fsp.h: · f9ebdd03
      unknown authored
        Remove accidentally pushed fsp debug code
      
      
      innobase/include/fsp0fsp.h:
        Remove accidentally pushed fsp debug code
      f9ebdd03
    • unknown's avatar
      Merge heikki@build.mysql.com:/home/bk/mysql-4.1 · 790e0729
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-4.1
      
      
      sql/ha_innodb.cc:
        Auto merged
      790e0729