mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
61430c77a4
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51 BUILD/check-cpu: Auto merged configure.in: Auto merged include/my_global.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/type_enum.result: Auto merged mysql-test/r/udf.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/mysqladmin.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/type_enum.test: Auto merged mysql-test/t/view.test: Auto merged mysys/my_read.c: Auto merged scripts/make_binary_distribution.sh: Auto merged server-tools/instance-manager/Makefile.am: Auto merged sql/event_queue.cc: Auto merged sql/field.h: Auto merged sql/item_sum.h: Auto merged sql/log_event.cc: Auto merged sql/mysqld.cc: Auto merged sql/share/errmsg.txt: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/table.cc: Auto merged storage/federated/ha_federated.cc: Auto merged server-tools/instance-manager/instance.cc: Use remote (global 5.1 version) sql/unireg.cc: Use remote (5.1 global version) mysql-test/t/trigger.test: Manual merge server-tools/instance-manager/guardian.cc: Manual merge |
||
|---|---|---|
| .. | ||
| .cvsignore | ||
| autorun.sh | ||
| check-cpu | ||
| cleanup | ||
| compile-alpha | ||
| compile-alpha-ccc | ||
| compile-alpha-cxx | ||
| compile-alpha-debug | ||
| compile-amd64-debug-max | ||
| compile-amd64-debug-max-no-ndb | ||
| compile-amd64-max | ||
| compile-darwin-mwcc | ||
| compile-dist | ||
| compile-hpux11-parisc2-aCC | ||
| compile-ia64-debug-max | ||
| compile-irix-mips64-mipspro | ||
| compile-ndb-autotest | ||
| compile-pentium | ||
| compile-pentium-cybozu | ||
| compile-pentium-debug | ||
| compile-pentium-debug-max | ||
| compile-pentium-debug-max-no-embedded | ||
| compile-pentium-debug-max-no-ndb | ||
| compile-pentium-debug-openssl | ||
| compile-pentium-debug-yassl | ||
| compile-pentium-gcov | ||
| compile-pentium-gprof | ||
| compile-pentium-icc | ||
| compile-pentium-icc-valgrind-max | ||
| compile-pentium-icc-yassl | ||
| compile-pentium-max | ||
| compile-pentium-myodbc | ||
| compile-pentium-mysqlfs-debug | ||
| compile-pentium-pgcc | ||
| compile-pentium-valgrind-max | ||
| compile-pentium64 | ||
| compile-pentium64-debug | ||
| compile-pentium64-debug-max | ||
| compile-pentium64-valgrind-max | ||
| compile-ppc | ||
| compile-ppc-debug | ||
| compile-ppc-debug-max | ||
| compile-ppc-debug-max-no-ndb | ||
| compile-ppc-max | ||
| compile-solaris-sparc | ||
| compile-solaris-sparc-debug | ||
| compile-solaris-sparc-forte | ||
| compile-solaris-sparc-purify | ||
| FINISH.sh | ||
| Makefile.am | ||
| SETUP.sh | ||