mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 15:24:16 +01:00
49e1bba346
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1 extra/perror.c: Auto merged include/my_global.h: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged BitKeeper/deleted/.del-var~62c955ccf2da1a21: Auto merged mysql-test/t/disabled.def: Auto merged sql/field.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.hpp: Auto merged storage/ndb/src/mgmsrv/main.cpp: Auto merged |
||
---|---|---|
.. | ||
yassl | ||
.cvsignore | ||
charset2html.c | ||
comp_err.c | ||
Makefile.am | ||
my_print_defaults.c | ||
mysql_waitpid.c | ||
perror.c | ||
replace.c | ||
resolve_stack_dump.c | ||
resolveip.c |