1. 18 Feb, 2005 8 commits
    • unknown's avatar
      BUG#8585 ndb_cache fails on aix52 · 8fe6e823
      unknown authored
      
      mysql-test/r/ndb_cache2.result:
        Decreased ndb_cache_check_time to avoid timing related problem on aix52-64bit and octane2
      mysql-test/t/ndb_cache2.test:
        Decreased ndb_cache_check_time to avoid timing related problem on aix52-64bit and octane2
      8fe6e823
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 2b1b463c
      unknown authored
      into neptunus.(none):/home/msvensson/mysql/mysql-5.0-8583
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      2b1b463c
    • unknown's avatar
      BUG#8583 ndb_...multi tests fail in 5.0.3 · 07e4dc1c
      unknown authored
       - the variable MASTER_MY_PORT1 was used from the script, but it was not set to the port where the second server was started
      
      
      mysql-test/mysql-test-run.sh:
        Export the variable MASTER_MY_PORT1 from the place where the second master is started
      07e4dc1c
    • unknown's avatar
      Merge: don't add this into configure in as it is already in · c2e18c50
      unknown authored
      config/ac-macros/character_sets.m4
      
      
      mysys/charset-def.c:
        Auto merged
      strings/ctype-uca.c:
        Auto merged
      c2e18c50
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1bdc7698
      unknown authored
      into mysql.com:/usr/home/bar/mysql-5.0.fresh
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      1bdc7698
    • unknown's avatar
      A way not to compile UCA collations · 29fb8728
      unknown authored
      29fb8728
    • unknown's avatar
      Clean up merge from 4.1, including making several enum fields · e122a103
      unknown authored
      in the grant tables case-insensitive and updating test results.
      
      
      scripts/mysql_create_system_tables.sh:
        Fix collation of procs_priv.proc_priv
      scripts/mysql_fix_privilege_tables.sql:
        Fix enum fields to have case-insensitive collation
      mysql-test/r/information_schema.result:
        Update results
      mysql-test/r/system_mysql_db.result:
        Update results
      mysql-test/r/lowercase_table_grant.result:
        Update results
      e122a103
    • unknown's avatar
      Merge · 90cc9c6b
      unknown authored
      
      BitKeeper/triggers/post-commit:
        Auto merged
      mysql-test/r/lowercase_table2.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/system_mysql_db.result:
        Update results
      scripts/mysql_create_system_tables.sh:
        Merge fix for Bug #7617, making enum fields in grant tables
        case-insensitive.
      scripts/mysql_fix_privilege_tables.sql:
        Merge fix for Bug #7617, and fix additional enum/set columns.
      sql/sql_acl.cc:
        Hand-merge due to whitespace change
      sql/sql_lex.cc:
        Hand-merge bug fix.
      90cc9c6b
  2. 17 Feb, 2005 32 commits