• unknown's avatar
    Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166 · 7a13f7f0
    unknown authored
    into  pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
    
    
    BitKeeper/etc/ignore:
      auto-union
    BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
      Auto merged
    BitKeeper/deleted/.del-mysql_create_system_tables.sh:
      Auto merged
    mysql-test/mysql-test-run.pl:
      Auto merged
    mysql-test/r/create.result:
      Auto merged
    mysql-test/r/join.result:
      Auto merged
    mysql-test/r/sp-security.result:
      Auto merged
    mysql-test/t/create.test:
      Auto merged
    mysql-test/t/grant2.test:
      Auto merged
    mysql-test/t/init_connect.test:
      Auto merged
    mysql-test/t/ndb_basic.test:
      Auto merged
    mysql-test/t/ndb_index_ordered.test:
      Auto merged
    mysql-test/t/ndb_multi.test:
      Auto merged
    scripts/Makefile.am:
      Auto merged
    BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7:
      Auto merged
    mysql-test/r/mysql_upgrade.result:
      SCCS merged
    mysql-test/t/lock_multi.test:
      Use local
    mysql-test/t/rpl_temporary.test:
      Use local
    mysql-test/Makefile.am:
      Manual merge
    scripts/mysql_fix_privilege_tables.sh:
      Manual merge
    scripts/mysql_fix_privilege_tables.sql.in:
      Manual merge
    scripts/mysql_install_db.sh:
      Manual merge
    7a13f7f0
ndb_basic.test 18 KB