-
unknown authored
into psergey-rh8.(none):/home/psergey/mysql-5.0-imerge-unique mysql-test/r/index_merge_innodb.result: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_update.cc: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
29a669e6