mirror of
https://github.com/MariaDB/server.git
synced 2025-01-26 00:34:18 +01:00
a69a96e26a
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51 client/mysqltest.c: Auto merged include/my_pthread.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/sp.test: Auto merged mysys/my_wincond.c: Auto merged sql/event_queue.cc: Auto merged sql/field.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_trigger.cc: Auto merged client/mysql_upgrade.c: Manual merge; I chose to keep Magnus' changes because they make the code more simple; always use *only* the option file created by mysql_upgrade. mysql-test/extra/binlog_tests/ctype_cp932.test: Manual merge mysql-test/r/binlog_row_ctype_cp932.result: Manual merge mysql-test/r/binlog_stm_ctype_cp932.result: Manual merge mysql-test/r/mysqlbinlog.result: Manual merge mysql-test/r/rpl_switch_stm_row_mixed.result: Manual merge mysql-test/t/mysqlbinlog.test: Manual merge mysql-test/t/rpl_switch_stm_row_mixed.test: Manual merge |
||
|---|---|---|
| .. | ||
| atomic | ||
| mysql | ||
| .cvsignore | ||
| abi_check | ||
| base64.h | ||
| config-netware.h | ||
| config-win.h | ||
| decimal.h | ||
| errmsg.h | ||
| ft_global.h | ||
| hash.h | ||
| heap.h | ||
| help_end.h | ||
| help_start.h | ||
| keycache.h | ||
| m_ctype.h | ||
| m_string.h | ||
| Makefile.am | ||
| md5.h | ||
| my_aes.h | ||
| my_alarm.h | ||
| my_alloc.h | ||
| my_atomic.h | ||
| my_base.h | ||
| my_bitmap.h | ||
| my_dbug.h | ||
| my_dir.h | ||
| my_getopt.h | ||
| my_global.h | ||
| my_handler.h | ||
| my_libwrap.h | ||
| my_list.h | ||
| my_net.h | ||
| my_no_pthread.h | ||
| my_nosys.h | ||
| my_pthread.h | ||
| my_semaphore.h | ||
| my_sys.h | ||
| my_time.h | ||
| my_tree.h | ||
| my_trie.h | ||
| my_uctype.h | ||
| my_user.h | ||
| my_vle.h | ||
| my_xml.h | ||
| myisam.h | ||
| myisammrg.h | ||
| myisampack.h | ||
| mysql.h | ||
| mysql_com.h | ||
| mysql_embed.h | ||
| mysql_h.ic | ||
| mysql_time.h | ||
| mysql_version.h.in | ||
| mysys_err.h | ||
| queues.h | ||
| rijndael.h | ||
| sha1.h | ||
| sql_common.h | ||
| sslopt-case.h | ||
| sslopt-longopts.h | ||
| sslopt-vars.h | ||
| t_ctype.h | ||
| thr_alarm.h | ||
| thr_lock.h | ||
| typelib.h | ||
| violite.h | ||