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

	Commit message (Expand)	Author	Age	Files	Lines
*	Fix after manual merge.	unknown	2006-11-16	2	-32/+28
*	Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug17047	unknown	2006-11-16	4	-3/+73
\|\
\| *	Add 5.0 part of fix for bug 17047.	unknown	2006-11-16	2	-0/+27
\| *	Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug17047	unknown	2006-11-16	2	-1/+34
\| \|\
\| \| *	BUG#17047: CHAR() and IN() can return NULL without signaling NULL result	unknown	2006-11-16	2	-1/+29
* \| \|	Made the test deterministic, so they don't depend on the SF cache.	unknown	2006-11-15	4	-11/+18
* \| \|	Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime	unknown	2006-11-15	6	-0/+342
\|\ \ \
\| * \| \|	Bug#18239 (Possible to overload internal functions with stored functions)	unknown	2006-11-14	6	-0/+342
* \| \| \|	give a bit more time for the execution of the events	unknown	2006-11-13	1	-1/+1
* \| \| \|	Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg23651	unknown	2006-11-13	2	-0/+35
\|\ \ \ \
\| * \ \ \	Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime	unknown	2006-11-13	2	-0/+35
\| \|\ \ \ \
\| \| * \| \| \|	Fix for bug bug#23651 "Server crashes when trigger which uses	unknown	2006-11-13	2	-0/+35
\| * \| \| \| \|	Merge bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2006-11-12	1	-6/+14
\| \|\ \ \ \ \
* \| \ \ \ \ \	Merge bk-internal.mysql.com:/home/bk/mysql-5.1	unknown	2006-11-12	1	-6/+14
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0	unknown	2006-11-11	1	-6/+14
\| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \|	Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1	unknown	2006-11-11	1	-6/+14
\| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \|	mysql-test-run.pl:	unknown	2006-11-11	1	-6/+14
* \| \| \| \| \| \| \| \|	Merge bodhi.local:/opt/local/work/mysql-5.0-runtime	unknown	2006-11-11	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| / / / / / \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2006-11-11	1	-0/+3
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge alik.:/mnt/raid/alik/MySQL/devel/5.0	unknown	2006-11-07	119	-2248/+6770
\| \| \|\ \ \ \ \ \
* \| \| \ \ \ \ \ \	Merge trift2.:/MySQL/M50/push-5.0	unknown	2006-11-10	4	-21/+62
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge trift2.:/MySQL/M41/push-4.1	unknown	2006-11-10	4	-21/+62
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge trift2.:/MySQL/M41/bug17194-4.1	unknown	2006-11-10	1	-5/+12
\| \| \|\ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \|	mysql-test/install_test_db.sh	unknown	2006-11-09	1	-5/+12
\| \| * \| \| \| \| \| \| \|	Merge trift2.:/MySQL/M41/clone-4.1	unknown	2006-11-10	2	-12/+48
\| \| \|\ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \	Merge trift2.:/MySQL/M41/bug17194-4.1	unknown	2006-11-08	2	-12/+49
\| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| / \| \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	mysql-test/mysql-test-run.pl + mysql-test/mysql-test-run.sh	unknown	2006-11-01	2	-12/+49
\| \| * \| \| \| \| \| \| \|	Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2006-11-10	2	-3/+60
\| \| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \	Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2006-11-10	11	-33/+135
\| \| \|\ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \	Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1-runtime	unknown	2006-11-06	9	-32/+129
\| \| \| \|\ \ \ \ \ \ \ \ \
* \| \| \| \ \ \ \ \ \ \ \ \	Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50	unknown	2006-11-10	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2006-11-10	2	-3/+59
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic	unknown	2006-11-10	1	-2/+5
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \ \ \ \ \	Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1	unknown	2006-11-10	3	-5/+65
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0	unknown	2006-11-10	2	-3/+60
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1	unknown	2006-11-10	2	-3/+60
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / / / / / / / \| \| \|/\| \| \| \| \| / / / / / / / / \| \| \| \| \|_\|_\|_\|/ / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \| \|	add --report-features to mysql-test-run.pl	unknown	2006-11-10	2	-3/+60
\| \| \| \| \|/ / / / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge mysql.com:/Users/kent/mysql/bk/lic/my51-lic	unknown	2006-11-10	1	-2/+5
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \	Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic	unknown	2006-11-10	1	-2/+5
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / / /
\| \| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge mysql.com:/Users/kent/mysql/bk/lic/my41-lic	unknown	2006-11-10	1	-2/+5
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| / / / / \| \| \| \| \|_\|_\|_\|_\|_\|_\|/ / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \| \| \|	mysql-test-run.sh:	unknown	2006-11-10	1	-2/+5
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50	unknown	2006-11-09	1	-16/+18
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g50	unknown	2006-11-09	3	-16/+962
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \	Merge bk-internal:/home/bk/mysql-5.0-maint	unknown	2006-11-08	1	-16/+18
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \ \ \ \	Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint	unknown	2006-11-08	1	-13/+15
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Update of --mem flag after comments	unknown	2006-11-08	1	-9/+13
\| \| \| \| * \| \| \| \| \| \| \| \| \| \| \| \|	No need to pass an additional arg to to mtr_add_arg when there is no % sign	unknown	2006-11-08	1	-4/+2
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint	unknown	2006-11-08	1	-3/+3
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / / / / / / /
\| \| \| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Pass location of charsets dir to mysqltest to avoid using the charsetdir loca...	unknown	2006-11-08	1	-0/+3
\| \| \| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Don't run mysqltest with both --silent and --verbose	unknown	2006-11-08	1	-3/+0