summaryrefslogtreecommitdiff
path: root/mysql-test/r
Commit message (Collapse)AuthorAgeFilesLines
* Mergeunknown2003-03-155-23/+47
|\ | | | | | | | | | | | | | | | | | | | | sql/item_subselect.cc: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/subselect.result: SCCS merged mysql-test/t/subselect.test: SCCS merged
| * Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1unknown2003-03-151-0/+10
| |\ | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1
| | * Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1unknown2003-03-151-0/+10
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1 mysql-test/r/subselect.result: Auto merged sql/item_subselect.cc: Auto merged
| | | * fix of illegal usage aggregate functionsunknown2003-02-151-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/subselect.result: test of illegal aggregate functions mysql-test/t/subselect.test: test of illegal aggregate functions
| * | | Merge bk-internal:/home/bk/mysql-4.1/unknown2003-03-141-22/+23
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1 sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged strings/ctype-bin.c: Auto merged
| | * | make the test more obviousunknown2003-03-061-23/+23
| | | |
| | * | trim spaces from CHAR() BINARY consistentlyunknown2003-03-061-0/+1
| | | |
| * | | fixed uncachable union (bug #150)unknown2003-03-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/union.result: sect of uncachable union mysql-test/t/union.test: sect of uncachable union sql/sql_lex.h: fixed uncachable union
| * | | Case insensitivrly has been added in charset and collation names.unknown2003-03-131-0/+4
| | | |
| * | | Conflicts relsolvingunknown2003-03-111-1/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/rpl_rotate_logs.test: Auto merged sql/lex.h: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.h: Auto merged sql/sql_repl.cc: Auto merged sql/sql_repl.h: Auto merged
| | * | | Added 'PURGE LOGS BEFORE' commandunknown2003-03-111-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added expire-logs-days option mysql-test/r/rpl_rotate_logs.result: Added test for 'PURGE LOGS BEFORE' mysql-test/t/rpl_rotate_logs.test: Added test for 'PURGE LOGS BEFORE' sql/log.cc: For 'Purge logs before' command sql/mysqld.cc: Added 'expire-logs-days' option sql/set_var.cc: Added 'expire-logs-days' option sql/sql_class.h: For 'Purge logs before' command sql/sql_parse.cc: Added 'expire-logs-days' option sql/sql_yacc.yy: For 'Purge logs before' command
* | | | | Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1unknown2003-03-113-0/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/work-in-4.1 sql/item_cmpfunc.cc: Auto merged
| * | | | Fix for a bug with ROW(..) <=> ROW(...)unknown2003-03-101-0/+6
| | | | |
| * | | | Adding tests for the fixed ORDER BY 0 bugunknown2003-03-102-0/+4
| | | | |
* | | | | fixed cached constsnt determination (bug #142 related)unknown2003-03-111-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/subselect.result: test of constant redecing mysql-test/t/subselect.test: test of constant redecing sql/item_cmpfunc.cc: fixed cached constsnt determination
* | | | | fixed cleanup bugunknown2003-03-101-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/subselect.result: test of cleanup bug mysql-test/t/subselect.test: test of cleanup bug sql/sql_select.cc: fixed cleanup
* | | | | Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1unknown2003-03-101-0/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/work-in-4.1 sql/item.h: Auto merged sql/item_subselect.cc: Auto merged
| * | | | fixed crash on non-well-constructed referenceunknown2003-03-101-0/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | mysql-test/r/subselect.result: test of IN with error mysql-test/t/subselect.test: test of IN with error
* | | | Merge sinisa@work.mysql.com:/home/bk/mysql-4.1unknown2003-03-071-0/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1 sql/mysql_priv.h: Auto merged sql/sql_yacc.yy: Auto merged
| * | | | New syntax to change client collation:unknown2003-03-071-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SET COLLATION latin1 SET COLLATION 'latin1' SET COLLATION DEFAULT
* | | | | An interim code cleanup.unknown2003-03-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Major re-write of code yet has to be done, to circumvent assigning of UNIT to current select and to deal better with offset, limit. mysql-test/r/union.result: A fix of merge fix
* | | | | merge fixesunknown2003-03-061-0/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item_subselect.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_union.cc: Auto merged sql/sql_update.cc: Auto merged
| * | | | three bug fixes and major code cleanupunknown2003-03-061-0/+4
| | | | |
* | | | | Added IsClosed() tests for MultiLineString objects.unknown2003-03-061-0/+15
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Added Centroid(), Area() tests for MultiPolygon objects.
* | | | SET NAMES has been extended to support optional collation:unknown2003-03-051-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SET NAMES <charset name> [COLLATE <collation name>]
* | | | SELECT BINARY expr unknown2003-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is now synonim for SELECT expr COLLATE <expr_charset>_bin
* | | | Fix for SHOW, it didn't display CHARACTER SET and COLLATE clauseunknown2003-03-041-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | for binary collations
* | | | COLLATE testsunknown2003-03-021-0/+486
| | | |
* | | | Test case for spatial objects.unknown2003-03-011-0/+310
| | | |
* | | | func_group.result:unknown2003-02-281-3/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new tests for better coverage of min/max optimization code. func_group.test: Added new tests for better coverage of min/max optimization code. opt_sum.cc: Fixed wrong previous manual merge. Fixed bugs concerning fields used in min/max functions for which there are conditions of the form field=const. sql/opt_sum.cc: Fixed wrong previous manual merge. Fixed bugs concerning fields used in min/max functions for which there are conditions of the form field=const. mysql-test/t/func_group.test: Added new test for better coverage of min/max optimization code. mysql-test/r/func_group.result: Added new tests for better coverage of min/max optimization code.
* | | | Merge ibabaev@work.mysql.com:/home/bk/mysql-4.1unknown2003-02-271-6/+250
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/igor/dev/mysql-4.1
| * | | | func_group.result, func_group.test:unknown2003-02-271-6/+250
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tests for extended max/min optimization opt_sum.cc: Extended min/max optimization sql/opt_sum.cc: Extended min/max optimization mysql-test/t/func_group.test: Added tests for extended max/min optimization mysql-test/r/func_group.result: Added tests for extended max/min optimization
* | | | | ctype_many.test:unknown2003-02-271-64/+64
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Insert constants with an explicit character set ctype_many.result: Fix according test change mysql-test/r/ctype_many.result: Fix according test change mysql-test/t/ctype_many.test: Insert constants with an explicit character set
* | | | Merge with 4.0unknown2003-02-271-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/bigint.result: Auto merged mysql-test/t/bigint.test: Auto merged sql/ha_innodb.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_load.cc: Auto merged sql/item.h: merge (use local copy) sql/sql_show.cc: merge
| * | | | Integer values between 9223372036854775807 and 9999999999999999999 are nowunknown2003-02-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | regarded as unsigned longlongss, not as floats. This make these values work similar to values between 10000000000000000000 and 18446744073709551615. mysql-test/r/bigint.result: Fixed results for bigints mysql-test/t/bigint.test: Fixed results for bigints sql/item.h: Mark unsigned big ints as unsigned sql/sql_lex.cc: Returns numbers between 9223372036854775807 and 9999999999999999999 as unsigned 64 bit numbers
* | | | | Portability fixesunknown2003-02-271-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't define crc32 if we are not linking with gzip cmd-line-utils/libedit/libedit_term.h: Rename: cmd-line-utils/libedit/term.h -> cmd-line-utils/libedit/libedit_term.h BitKeeper/etc/ignore: added scripts/make_win_src_distribution client/connect_test.c: Removed wrong include file (my_global.h should never be included by an external client) client/insert_test.c: Removed wrong include file (my_global.h should never be included by an external client) client/select_test.c: Removed wrong include file (my_global.h should never be included by an external client) cmd-line-utils/libedit/Makefile.am: Portability fixes (for HPUX11 and AIX) cmd-line-utils/libedit/el.h: Portability fixes (for HPUX11 and AIX) cmd-line-utils/libedit/key.h: Portability fixes (for HPUX11 and AIX) cmd-line-utils/libedit/makelist: Portability fixes (for HPUX11 and AIX) cmd-line-utils/libedit/read.c: Portability fixes (for HPUX11 and AIX) cmd-line-utils/libedit/readline.c: Portability fixes (for HPUX11 and AIX) cmd-line-utils/libedit/readline/readline.h: Systems that has sys/cdefs may not have __BEGIN_DECLS cmd-line-utils/libedit/sig.c: sig_t is not portable cmd-line-utils/libedit/sig.h: sig_t is not portable cmd-line-utils/libedit/term.c: Portablity fixes Fixed core dump when using a terminal without arrow key definitions heap/_check.c: Portability fix heap/hp_hash.c: Portability fix heap/hp_rkey.c: Portability fix include/my_global.h: Portability fixes for HPUX11 libmysql/libmysql.c: Removed wrong cast mysql-test/r/union.result: New union tests mysql-test/t/union.test: New union tests sql/gen_lex_hash.cc: Fixed portability bug. sql/gstream.h: Portablity fix sql/item_create.cc: Don't define crc32 if we are not linking with gzip sql/item_create.h: Don't define crc32 if we are not linking with gzip sql/item_func.cc: Don't define crc32 if we are not linking with gzip sql/item_func.h: Don't define crc32 if we are not linking with gzip sql/lex.h: Don't define crc32 if we are not linking with gzip sql/sql_show.cc: Name can't be NULL
* | | | | Merge with 4.0.11unknown2003-02-265-5/+31
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BUILD/FINISH.sh: Auto merged client/mysqldump.c: Auto merged include/my_base.h: Auto merged include/my_pthread.h: Auto merged innobase/row/row0sel.c: Auto merged innobase/ut/ut0mem.c: Auto merged myisam/myisamchk.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/bigint.result: Auto merged mysql-test/r/handler.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/innodb_handler.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/t/bigint.test: Auto merged mysql-test/t/handler.test: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/innodb_handler.test: Auto merged mysql-test/t/query_cache.test: Auto merged sql/mysqld.cc: Auto merged sql/opt_sum.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged sql/share/czech/errmsg.txt: Auto merged sql/share/danish/errmsg.txt: Auto merged sql/share/dutch/errmsg.txt: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/estonian/errmsg.txt: Auto merged sql/share/french/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/share/italian/errmsg.txt: Auto merged sql/share/japanese/errmsg.txt: Auto merged sql/share/korean/errmsg.txt: Auto merged sql/share/norwegian-ny/errmsg.txt: Auto merged sql/share/norwegian/errmsg.txt: Auto merged sql/share/polish/errmsg.txt: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/russian/errmsg.txt: Auto merged sql/share/slovak/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/share/swedish/errmsg.txt: Auto merged sql/share/ukrainian/errmsg.txt: Auto merged sql/table.h: Auto merged
| * | | | Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0unknown2003-02-261-0/+3
| |\ \ \ \
| | * | | | Safety fix (caused a core dump on slave during shutdown when shutting down ↵unknown2003-02-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replication on some OS) mysql-test/t/rpl_rotate_logs-slave-master-info.opt: Rename: mysql-test/t/rpl_rotate_logs.slave-mi -> mysql-test/t/rpl_rotate_logs-slave-master-info.opt mysql-test/t/rpl000015-slave-master-info.opt: Rename: mysql-test/t/rpl000015.slave-mi -> mysql-test/t/rpl000015-slave-master-info.opt mysql-test/r/bigint.result: New bigint test mysql-test/t/bigint.test: New bigint test netware/mysql_test_run.c: slave-master-info.opt -> .slave-mi
| * | | | | fix a bug in the testunknown2003-02-251-2/+4
| |/ / / /
| * | | | test updatedunknown2003-02-241-4/+5
| | | | |
| * | | | tests updatedunknown2003-02-221-1/+4
| | | | |
| * | | | Applied Sinisa's patch:unknown2003-02-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "A fix for non-releasing locks for multi table updates and multi table deletes with InnoDB tables."
| * | | | Merge abelkin@work.mysql.com:/home/bk/mysql-4.0unknown2003-02-175-25/+32
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/mysql-4.0
| * | | | | fixed invalidation of query cache on LOAD DATAunknown2003-02-141-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/query_cache.result: test of LOAD DATA mysql-test/t/query_cache.test: test of LOAD DATA
* | | | | | Merge vkishkin@work.mysql.com:/home/bk/mysql-4.1unknown2003-02-241-0/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/wax/mysql-4n sql/mysqld.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_yacc.yy: Auto merged
| * | | | | add option default-week-format and variable default_week_format unknown2003-02-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (SCRUM) mysql-test/r/func_time.result: result of test default_week_format mysql-test/t/func_time.test: test of default_week_format sql/mysqld.cc: add option default-week-format sql/set_var.cc: add system variable default_week_format sql/sql_class.h: add default_week_format into structure system_variables sql/sql_yacc.yy: change lex of week() with one parameter
* | | | | | merge fixunknown2003-02-227-25/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysql.cc: Auto merged libmysql/libmysql.c: Auto merged sql/sql_yacc.yy: Auto merged
| * | | | | | Test's result update because std_data/words.dat has been lengthened by 500 ↵unknown2003-02-213-12/+14
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bytes. Increased some tests' robustness a bit : - Added RESET MASTER to all tests who do SHOW BINLOG EVENTS, to make them independent from previous tests. - Added save_master_pos to these tests to wait for the slave to start before purging its binary logs. mysql-test/r/rpl_log.result: Updated SHOW BINLOG EVENTS's positions as Monty lengthened std_data/words.dat by 500 bytes. mysql-test/r/rpl_temporary.result: Added RESET MASTER to make positions shown by SHOW BINLOG EVENTS independent of any previous test. mysql-test/r/rpl_user_variables.result: Added RESET MASTER to make positions shown by SHOW BINLOG EVENTS independent of any previous test. mysql-test/t/rpl_log.test: Added save_master_pos to wait for the slave to have started before purging its binary logs. Otherwise, we could purge before the slave finishes starting, and then the slave could log events implicitly provoked by previous tests. mysql-test/t/rpl_temporary.test: Added RESET MASTER to make positions shown by SHOW BINLOG EVENTS independent of any previous test. mysql-test/t/rpl_user_variables.test: Added RESET MASTER to make positions shown by SHOW BINLOG EVENTS independent of any previous test. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | | | Merge with 4.0.11 tree to get latest bug fixesunknown2003-02-174-13/+20
| |\ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysql.cc: Auto merged client/mysqldump.c: Auto merged configure.in: Auto merged include/my_pthread.h: Auto merged include/mysql.h: Auto merged libmysql/libmysql.c: Auto merged libmysqld/libmysqld.c: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/rpl000001.result: Auto merged mysql-test/r/rpl000004.result: Auto merged mysql-test/r/type_blob.result: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/rpl000001.test: Auto merged mysys/my_init.c: Auto merged scripts/mysqld_safe.sh: Auto merged sql/item_cmpfunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_table.cc: Auto merged sql/structs.h: Auto merged Makefile.am: Merge with 4.0.11 mysql-test/mysql-test-run.sh: Merge with 4.0.11 mysql-test/r/rpl_log.result: Use local version (needs to be updated) mysql-test/t/type_blob.test: Merge with 4.0.11 sql/mysqld.cc: Merge with 4.0.11 sql/protocol.cc: Use local version
View Lorry Controller Status