• unknown's avatar
    merged · 5d63584e
    unknown authored
    BitKeeper/etc/ignore:
      auto-union
    BitKeeper/etc/logging_ok:
      auto-union
    Docs/manual.texi:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/share/spanish/errmsg.txt:
      merged and translated the new 4.0 errors - had to type them in 
      anyway so figured I'd do it in Spanish - Jorge/Miguel - can you do QA
      on my translation?
    5d63584e
errmsg.txt 12.5 KB