mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 14:02:32 +01:00
99b9f7a45b
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-merged client/mysqldump.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/r/rpl_ddl.result: Auto merged mysql-test/r/rpl_sp.result: Auto merged mysql-test/r/rpl_trigger.result: Auto merged mysql-test/r/sp-security.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/sql_mode.result: Auto merged mysql-test/t/rpl_trigger.test: Auto merged mysql-test/t/skip_grants.test: Auto merged mysql-test/t/sp-security.test: Auto merged sql/mysql_priv.h: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_view.cc: Auto merged mysql-test/lib/mtr_cases.pl: Manually merged. sql/sp.cc: Manually merged. sql/sql_yacc.yy: Manually merged. |
||
---|---|---|
.. | ||
bug16266.000001 | ||
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 | ||
trunc_binlog.000001 | ||
vchar.frm | ||
warnings_loaddata.dat | ||
words.dat | ||
words2.dat |