mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 23:34:34 +01:00
ae26d2aa5a
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new mysql-test/mysql-test-run.pl: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/grant.result: Auto merged mysql-test/r/heap_btree.result: Auto merged mysql-test/r/information_schema_db.result: Auto merged mysql-test/r/lock_multi.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/view_grant.result: Auto merged mysql-test/t/lock_multi.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/view_grant.test: Auto merged mysys/default.c: Auto merged server-tools/instance-manager/guardian.cc: Auto merged sql/field.h: Auto merged sql/item.h: Auto merged sql/item_subselect.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/lock.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_update.cc: Auto merged sql/table.cc: Auto merged storage/heap/hp_write.c: Auto merged storage/ndb/src/ndbapi/DictCache.cpp: Auto merged storage/ndb/src/ndbapi/DictCache.hpp: Auto merged client/mysqlbinlog.cc: Manual merge from 5.0 client/mysqldump.c: Manual merge from 5.0 configure.in: Manual merge from 5.0 mysql-test/r/mysqldump.result: Manual merge from 5.0 mysql-test/t/mysqldump.test: Manual merge from 5.0 mysql-test/t/rpl_insert_id.test: Manual merge from 5.0 server-tools/instance-manager/manager.cc: Manual merge from 5.0 sql/field.cc: Manual merge from 5.0 sql/ha_ndbcluster.cc: Manual merge from 5.0 sql/mysqld.cc: Manual merge from 5.0 sql/sql_base.cc: Manual merge from 5.0 sql/sql_lex.cc: Manual merge from 5.0 sql/sql_select.cc: Manual merge from 5.0 sql/sql_table.cc: Manual merge from 5.0 |
||
---|---|---|
.. | ||
ndb_backup50 | ||
ndb_backup51 | ||
bug15328.cnf | ||
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 |