mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 14:02:32 +01:00
16d46c9cba
into neptunus.(none):/home/msvensson/mysql/mysql-5.1 BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8: Auto merged BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4: Auto merged client/mysql.cc: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6: Auto merged BitKeeper/deleted/.del-NOTES~e926d3e6929ac052: Auto merged client/mysqltest.c: Auto merged include/mysql.h: Auto merged libmysql/libmysql.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/std_data/cacert.pem: Auto merged mysql-test/std_data/client-cert.pem: Auto merged mysql-test/std_data/client-key.pem: Auto merged mysql-test/std_data/server-cert.pem: Auto merged mysql-test/std_data/server-key.pem: Auto merged mysql-test/t/information_schema.test: Auto merged sql/item_func.cc: Auto merged sql-common/client.c: Auto merged sql/mysql_priv.h: Auto merged sql/sql_acl.cc: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp: Auto merged vio/vio.c: Auto merged client/client_priv.h: Merge 5.0 -> 5.1 include/violite.h: Merge 5.0 -> 5.1 mysql-test/Makefile.am: Merge 5.0 -> 5.1 mysql-test/t/disabled.def: Merge 5.0 -> 5.1 sql/mysqld.cc: Merge 5.0 -> 5.1 vio/viossl.c: Merge 5.0 -> 5.1 vio/viosslfactories.c: Merge 5.0 -> 5.1 |
||
---|---|---|
.. | ||
ndb_backup50 | ||
ndb_backup51 | ||
bug16266.000001 | ||
cacert.pem | ||
client-cert.pem | ||
client-key.pem | ||
des_key_file | ||
init_file.dat | ||
loaddata1.dat | ||
loaddata2.dat | ||
loaddata3.dat | ||
loaddata4.dat | ||
loaddata5.dat | ||
loaddata_dq.dat | ||
loaddata_pair.dat | ||
master-bin.000001 | ||
Moscow_leap | ||
ndb_config_mycnf1.cnf | ||
ndb_config_mycnf2.cnf | ||
rpl_loaddata.dat | ||
rpl_loaddata2.dat | ||
rpl_timezone.dat | ||
rpl_timezone2.dat | ||
server-cert.pem | ||
server-key.pem | ||
trunc_binlog.000001 | ||
untrusted-cacert.pem | ||
vchar.frm | ||
warnings_loaddata.dat | ||
words.dat | ||
words2.dat |