mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 21:42:35 +01:00
5a78cd7a72
into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new mysql-test/mysql-test-run.pl: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/grant2.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/t/grant2.test: Auto merged mysql-test/t/skip_grants.test: Auto merged mysql-test/t/sp.test: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/field_conv.cc: Auto merged sql/item.h: Auto merged sql/item_timefunc.cc: Auto merged sql/sql_udf.cc: Auto merged VC++Files/mysql.sln: Manual merge (use local). configure.in: Manual merge. sql/table.cc: Manual merge. |
||
---|---|---|
.. | ||
old | ||
gen_lex_hash.dsp | ||
gen_lex_hash.vcproj | ||
message.mc | ||
mysqld.dsp | ||
mysqld.dsw | ||
mysqld.vcproj | ||
mysqld_ia64.dsp | ||
mysqldmax.dsp | ||
mysqldmax_ia64.dsp |