unknown f5340f8c7d Merge bodhi.local:/opt/local/work/mysql-5.0-root ...

into  bodhi.local:/opt/local/work/mysql-5.0-runtime


sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_update.cc:
  Manual merge.

2006-07-07 22:09:43 +04:00

45 KiB

Raw Blame History

View Raw