• unknown's avatar
    Merge with 4.0 · 526b25e2
    unknown authored
    
    BitKeeper/etc/logging_ok:
      auto-union
    BitKeeper/deleted/.del-libmysql.def~f5dffcb3ed925d28:
      Auto merged
    BitKeeper/deleted/.del-post-incoming~9f2168f531f09f3b:
      Auto merged
    BitKeeper/deleted/.del-post-outgoing~1dd3d8f0f6e8f3cd:
      Auto merged
    VC++Files/innobase/innobase.dsp:
      Auto merged
    VC++Files/strings/MASM6x/strings.dsp:
      Auto merged
    client/mysqldump.c:
      Auto merged
    innobase/sync/sync0sync.c:
      Auto merged
    myisam/mi_check.c:
      Auto merged
    mysql-test/t/union.test:
      Auto merged
    mysql-test/t/update.test:
      Auto merged
    mysys/mf_iocache.c:
      Auto merged
    sql/nt_servc.cc:
      Auto merged
    mysql-test/r/system_mysql_db.result:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    526b25e2
sql_parse.cc 140 KB