mariadb/mysql-test/std_data
unknown ffcf1c372f Merge damien-katzs-computer.local:/Users/dkatz/mysql50
into  damien-katzs-computer.local:/Users/dkatz/mysql51


sql/mysql_priv.h:
  Auto merged
2007-07-19 13:36:37 -04:00
..
ndb_backup50
ndb_backup51
14897.frm
bad_gis_data.dat
bug15328.cnf
bug16266.000001
bug19371.frm
bug19371.MYD
bug19371.MYI
cacert.pem
client-cert.pem
client-key.pem
des_key_file
Index.xml
init_file.dat
loaddata1.dat
loaddata2.dat
loaddata3.dat
loaddata4.dat
loaddata5.dat
loaddata6.dat
loaddata_dq.dat
loaddata_pair.dat
master-bin.000001
Moscow_leap
ndb_config_mycnf1.cnf
ndb_config_mycnf2.cnf
old_table-323.frm
rpl_loaddata.dat
rpl_loaddata2.dat
rpl_timezone.dat
rpl_timezone2.dat
server-cert-des.pem
server-cert.pem
server-key-des.pem
server-key.pem
server8k-cert.pem Bug #29784 YaSSL assertion failure when reading 8k key. 2007-07-17 14:43:56 -04:00
server8k-key.pem Bug #29784 YaSSL assertion failure when reading 8k key. 2007-07-17 14:43:56 -04:00
trunc_binlog.000001
untrusted-cacert.pem
vchar.frm
warnings_loaddata.dat
words.dat
words2.dat