delta/mariadb-git.git - github.com: MariaDB/server.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Change find_type family to accept const TYPELIB*.	unknown	2007-03-27	1	-1/+1
\| \| \| \| \| \|	include/mysql_h.ic: Change find_type family to accept const TYPELIB*. This sort of change can not break the ABI.
*	Merge polly.local:/tmp/maint/bug24117/my51-bug24117	unknown	2006-12-19	1	-8/+11
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into polly.local:/home/kaa/src/maint/mysql-5.1-maint include/mysql_h.ic: Auto merged
\| *	Added copy_typelib() declaration to make ABI compatibility test happy	unknown	2006-12-19	1	-8/+11
\| \|
* \|	Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/50	unknown	2006-12-08	1	-0/+1
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/51 include/mysql.h: Auto merged include/mysql_h.ic: Auto merged mysql-test/r/func_in.result: Auto merged mysql-test/t/func_in.test: Auto merged sql/opt_range.cc: Auto merged sql/sql_class.h: Auto merged Makefile.am: Manual merge
\| *	Having MYSQL_VERSION_ID defined correctly made this KILL_QUERY enum item ↵	unknown	2006-12-07	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	visible. This is a forwards-incompatible change.
* \|	Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint	unknown	2006-11-03	1	-51/+46
\|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint client/mysql.cc: Auto merged mysql-test/lib/mtr_misc.pl: Auto merged mysql-test/r/innodb_mysql.result: Auto merged mysql-test/r/mysql.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/ctype_utf8.test: Auto merged mysql-test/t/im_daemon_life_cycle.imtest: Auto merged mysql-test/t/mysql.test: Auto merged mysql-test/t/ps.test: Auto merged mysql-test/t/sp-error.test: Auto merged include/mysql_h.ic: Auto merged mysql-test/include/mix1.inc: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/view.test: Auto merged mysys/my_lock.c: Auto merged sql/handler.cc: Auto merged sql/item_func.cc: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sp.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_union.cc: Auto merged sql/sql_view.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/mysql-test-run.pl: Use remote include/Makefile.am: Manual merge
*	Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint	unknown	2006-11-01	1	-206/+258
\| \| \| \| \| \| \| \| \| \| \|	into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint include/mysql_h.ic: C Use local include/Makefile.am: Manual merge
*	Update the rules for abi_check	unknown	2006-10-27	1	-0/+914
	include/Makefile.am: Move m_ctype.h from BUILT_SOURCES, it's in vcs Update the rule for abi_check include/mysql_h.ic: Update the refernce and rename it to mysql_h.ic