• unknown's avatar
    Merge xiphis.org:/home/antony/work2/mysql-5.0-engines · 131f9a71
    unknown authored
    into  xiphis.org:/home/antony/work2/mysql-5.0-merge
    
    
    mysql-test/r/create.result:
      Auto merged
    mysql-test/r/federated.result:
      Auto merged
    mysql-test/r/insert_select.result:
      Auto merged
    mysql-test/r/ps_2myisam.result:
      Auto merged
    mysql-test/r/ps_3innodb.result:
      Auto merged
    mysql-test/r/ps_4heap.result:
      Auto merged
    mysql-test/r/ps_5merge.result:
      Auto merged
    mysql-test/r/ps_6bdb.result:
      Auto merged
    mysql-test/r/ps_7ndb.result:
      Auto merged
    mysql-test/r/strict.result:
      Auto merged
    mysql-test/r/view.result:
      Auto merged
    mysql-test/r/warnings.result:
      Auto merged
    sql/share/errmsg.txt:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_insert.cc:
      Auto merged
    131f9a71
view.result 83.5 KB