unknown 5aa81b561e Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime ...

into  mysql.com:/home/cps/mysql/devel/5.1-rename-bug


mysql-test/r/log_tables.result:
  Auto merged
mysql-test/t/log_tables.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
sql/log.cc:
  manual merge
sql/share/errmsg.txt:
  manual merge
sql/sql_table.cc:
  manual merge

2006-10-24 17:00:23 +04:00

..

charsets

Merge mysql.com:/usr/home/bar/mysql-5.0

2006-04-05 19:00:02 +05:00

.cvsignore

…

errmsg.txt

Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime

2006-10-24 17:00:23 +04:00

Makefile.am

Additional "make distcheck" changes specific to 5.0

2005-11-09 11:56:04 +02:00