Commit e8f1a99a authored by unknown's avatar unknown
Browse files

Merge andrepl.(none):/home/elkin/MySQL/TEAM/BARE/5.1 

into  andrepl.(none):/home/elkin/MySQL/TEAM/FIXES/5.1/20919_temp_nlog


mysql-test/t/rpl_openssl.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
parents 20c59f9c 950f95e3

There are no changes