unknown 03c110ea21 Merge stella.local:/home2/mydev/mysql-5.1-amain ...

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/r/ctype_big5.result:
  Auto merged
mysql-test/r/ctype_euckr.result:
  Auto merged
mysql-test/r/ctype_gb2312.result:
  Auto merged
mysql-test/r/ctype_gbk.result:
  Auto merged
mysql-test/r/ctype_uca.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/rpl_rli.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/lib/mtr_report.pl:
  SCCS merged

2008-03-26 10:27:00 +01:00

..

r

Merge stella.local:/home2/mydev/mysql-5.1-amain

2008-03-26 10:27:00 +01:00

std_data

Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1

2008-02-07 12:38:13 +01:00

t

Problem: Pushbuild errors because sql_mode is unsafe but test thinks it is

2008-03-10 15:26:21 +01:00

combinations

Eliminating compiler warnings.

2008-03-25 15:20:42 +01:00