mirror of
https://github.com/MariaDB/server.git
synced 2025-02-02 12:01:42 +01:00
eff9369d10
into mysql.com:/home/dlenev/src/mysql-5.1-merges mysql-test/r/view.result: Auto merged mysql-test/t/view.test: Auto merged sql/sql_select.cc: Auto merged sql/share/errmsg.txt: Auto merged sql/sql_show.cc: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged storage/ndb/tools/ndb_size.pl: Auto merged mysql-test/r/information_schema.result: Manual merge. mysql-test/t/information_schema.test: Manual merge. sql/sql_trigger.cc: Manual merge. |
||
---|---|---|
.. | ||
old_dirs | ||
restore | ||
clean-links.sh | ||
delete_all.cpp | ||
desc.cpp | ||
drop_index.cpp | ||
drop_tab.cpp | ||
listTables.cpp | ||
make-errors.pl | ||
make-links.sh | ||
Makefile.am | ||
ndb_condig.cpp | ||
ndb_size.pl | ||
ndb_size.tmpl | ||
ndb_test_platform.cpp | ||
ndbsql.cpp | ||
rgrep | ||
select_all.cpp | ||
select_count.cpp | ||
waiter.cpp |