mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
baddc8bdca
into chilla.local:/home/mydev/mysql-5.1-axmrg client/mysql.cc: Auto merged include/my_global.h: Auto merged include/thr_alarm.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/r/symlink.result: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/ps.test: Auto merged mysql-test/t/symlink.test: Auto merged mysys/default.c: Auto merged mysys/my_pthread.c: Auto merged mysys/my_thr_init.c: Auto merged mysys/thr_alarm.c: Auto merged sql/field_conv.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item_func.cc: Auto merged vio/viosslfactories.c: Auto merged BitKeeper/deleted/.del-mysqld.cc.rej: Delete: sql/mysqld.cc.rej BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb: Auto merged BitKeeper/deleted/.del-my_manage.c~4de50e721d227d19: Auto merged BitKeeper/deleted/.del-my_manage.h~9d2cbc1e8bc894f: Auto merged BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4: Null merged BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547: Null merged BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad: Auto merged BitKeeper/deleted/.del-mysql_test_run_new.dsp~9d8078f3f02fcc8e: Auto merged BitKeeper/deleted/.del-mysql_test_run_new.vcproj~1ddaed30361efefe: Auto merged BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp~e7ee71ec8d2995e3: Auto merged BUILD/SETUP.sh: Manual merged Makefile.am: Manual merged configure.in: Manual merged include/my_pthread.h: Manual merged mysql-test/Makefile.am: Manual merged sql/mysqld.cc: Manual merged support-files/mysql.spec.sh: Manual merged |
||
|---|---|---|
| .. | ||
| .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-amd64-valgrind-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 | ||
| SETUP.sh.rej | ||