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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Portability fix to work around OS X -x86 toolchain bug with common ↵	unknown	2007-04-04	1	-1/+1
\| \| \| \| \| \| \|	(uninitialized data) symbols mysys/my_pthread.c: Initialize thd_lib_detected for portability (OS X -x86)
*	Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1	unknown	2007-04-04	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/51 mysql-test/r/information_schema.result: Auto merged mysql-test/t/sp.test: Auto merged sql/item_func.cc: Auto merged sql/mysqld.cc: Auto merged sql/sp.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_lex.h: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged
\| *	Merge bk-internal.mysql.com:/home/bk/mysql-5.1	unknown	2007-04-03	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into bodhi.local:/opt/local/work/mysql-5.1-runtime mysql-test/r/events_bugs.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/t/events.test: Auto merged sql/event_data_objects.cc: Auto merged sql/event_data_objects.h: Auto merged sql/event_db_repository.h: Auto merged sql/event_queue.cc: Auto merged sql/events.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item_func.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_servers.cc: Auto merged sql/sql_view.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.h: Auto merged sql/share/errmsg.txt: Auto merged mysql-test/r/events.result: Manual merge. sql/event_db_repository.cc: Manual merge. sql/sql_parse.cc: Manual merge.
\| \| *	Fix warnings.	unknown	2007-03-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	include/typelib.h: Fix a compile warning. char *x is actually updated if it's found in the typelib (a peculiar way to return canonical value in case of a partial match) mysys/typelib.c: Fix a warning. sql/item_func.cc: Fix a compile-time warning.
\| \| *	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 pilot.blaudden:/home/msvensson/mysql/mysql-5.1	unknown	2007-04-02	5	-85/+62
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint client/client_priv.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/r/rpl_deadlock_innodb.result: Auto merged mysql-test/r/rpl_flushlog_loop.result: Auto merged mysql-test/r/rpl_known_bugs_detection.result: Auto merged mysql-test/r/rpl_ndb_basic.result: Auto merged mysql-test/r/rpl_ndb_extraCol.result: Auto merged mysql-test/r/rpl_ndb_sync.result: Auto merged mysql-test/r/rpl_rbr_to_sbr.result: Auto merged mysql-test/r/rpl_row_inexist_tbl.result: Auto merged mysql-test/r/rpl_row_max_relay_size.result: Auto merged mysql-test/r/rpl_row_tabledefs_2myisam.result: Auto merged mysql-test/r/rpl_row_tabledefs_3innodb.result: Auto merged mysql-test/r/rpl_stm_max_relay_size.result: Auto merged mysql-test/r/rpl_stm_until.result: Auto merged mysql-test/r/sp-code.result: Auto merged mysql-test/r/type_datetime.result: Auto merged mysql-test/t/mysqlbinlog.test: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_sum.cc: Auto merged sql/lex.h: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/slave.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/r/gis.result: Merge 5.0->5.1 mysql-test/r/rpl_000015.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_change_master.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_loaddata.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_log_pos.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_ndb_log.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_rotate_logs.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_row_log.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_row_log_innodb.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_row_reset_slave.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_row_until.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_server_id1.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_server_id2.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_stm_log.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_stm_reset_slave.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/t/gis.test: Merge 5.0->5.1
\| * \|	Merge polly.local:/tmp/maint/bug26844/my51-bug26844	unknown	2007-03-28	2	-3/+3
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into polly.local:/home/kaa/src/maint/mysql-5.1-maint
\| \| * \	Merge polly.local:/tmp/maint/bug26844/my50-bug26844	unknown	2007-03-28	2	-3/+3
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into polly.local:/tmp/maint/bug26844/my51-bug26844 mysys/my_malloc.c: Auto merged mysys/safemalloc.c: Auto merged
\| \| \| * \|	Fix for bug #26844 "Memory allocation failures ignored by slave IO thread".	unknown	2007-03-26	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pass ME_NOREFRESH flag to an error handler in my_malloc() and _mymalloc() in case of memory allocation failure, so that it gets logged to the error log. mysys/my_malloc.c: Pass ME_NOREFRESH flag to an error handler in my_malloc() in case of memory allocation failure, so that it gets logged to the error log. mysys/safemalloc.c: Pass ME_NOREFRESH flag to an error handler in _mymalloc() in case of memory allocation failure, so that it gets logged to the error log.
\| * \| \| \|	Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint	unknown	2007-03-23	3	-82/+59
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint mysys/my_static.c: Auto merged mysys/mf_tempfile.c: Use remote
\| \| * \ \ \	Merge pilot.blaudden:/home/msvensson/mysql/bug26233/my50-bug26233	unknown	2007-03-23	3	-93/+61
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
\| \| \| * \| \| \|	Bug#26233 very suspect code in mf_tempfile.c, in function create_temp_file()	unknown	2007-03-23	3	-93/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Rework the windows implementation in 'create_temp_file' to be thread safe by using GetTempFileName instad of fiddling with "environ" mysys/mf_tempfile.c: - Update windows implementation of 'create_temp_file' to use GetTempFileName in favor of fiddeling with "environ" in an unsafe way - Remove the implementation that is supposed to be used if not windows, not mkstemp or tmpnam exists as it not longer compiles it can't be used anywhere. - Update function comment for 'create_temp_file' mysys/my_static.c: Remove unused variable mysys/my_static.h: Remove unused variable
* \| \| \| \| \| \|	Post merge fix	unknown	2007-03-30	1	-2/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge bk-internal.mysql.com:/home/bk/mysql-5.1	unknown	2007-03-30	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into chilla.local:/home/mydev/mysql-5.1-axmrg include/my_pthread.h: Auto merged include/thr_alarm.h: Auto merged mysys/my_pthread.c: Auto merged mysys/thr_alarm.c: Auto merged sql/mysqld.cc: Auto merged sql/stacktrace.c: Auto merged sql/stacktrace.h: Auto merged mysys/my_thr_init.c: Manual merge
\| * \| \| \| \| \| \|	mysys/my_thr_init.c : Avoid warnings of "unused variable" by extending a ↵	unknown	2007-03-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'#ifdef'. mysys/my_thr_init.c: Enclose a variable declaration in the same '#ifdef' that also controls all access to the variable. This avoids warnings of "unused variable".
\| * \| \| \| \| \| \|	restored run-time thread lib detection	unknown	2007-03-28	3	-27/+48
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sql/stacktrace.c: removed code duplication sql/stacktrace.h: removed code duplication
* \| \| \| \| \| \|	Merge mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.0-engines	unknown	2007-03-29	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.1-engines mysys/my_redel.c: Auto merged
\| * \ \ \ \ \ \	Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines	unknown	2007-03-29	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.0-engines
\| \| * \| \| \| \| \| \|	BUG#25521 - optimize table, delete, show table status leads to table	unknown	2007-03-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	losing it's .MYD When OPTIMIZE TABLE is completed it attempts to rename temporary file to original name. This step may fail on windows when a file is opened. As a result data file might be deleted and optimized copy of file (table_name.MYD) remains. This situation is handled properly by my_delete_allow_opened, so use it instead of my_delete when attempting to rename a file on windows. No suitable test case for this bug. mysys/my_redel.c: Attempting to delete an opened file and to immediately create a new one with the same name may result in my_redel failure on windows. It may fail because file is not deleted until it is closed. This situation is handled properly by my_delete_allow_opened, so use it instead of my_delete.
\| * \| \| \| \| \| \| \|	Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1	unknown	2007-03-23	1	-0/+4
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build mysys/thr_alarm.c: Auto merged sql/mysqld.cc: Auto merged
\| \| * \| \| \| \| \| \| \|	reverted linuxthreads thr_client_alarm fix (not future-proof)	unknown	2007-03-23	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed differently: wake up select_thread with THR_SERVER_ALARM instead mysys/thr_alarm.c: reverted linuxthreads thr_client_alarm fix (not future-proof)
\| * \| \| \| \| \| \| \| \|	Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1	unknown	2007-03-23	1	-4/+0
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build mysys/thr_alarm.c: Auto merged sql/mysqld.cc: SCCS merged
\| \| * \| \| \| \| \| \| \|	Merge bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2007-03-23	1	-4/+0
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1 mysys/thr_alarm.c: Auto merged sql/mysqld.cc: Auto merged
\| \| \| * \| \| \| \| \| \| \|	move thr_client_alarm initialization to mysqld.cc	unknown	2007-03-23	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(in thr_alarm.cc it happened too late). mysys/thr_alarm.c: move thr_client_alarm initialization to mysqld.cc (here it happened too late) sql/mysqld.cc: move thr_client_alarm initialization to mysqld.cc (in thr_alarm.cc it happened too late). moved thr_kill_signal initialization to init_signals()
\| * \| \| \| \| \| \| \| \| \|	Merge trift2.:/MySQL/M50/mysql-5.0	unknown	2007-03-23	1	-0/+2
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into trift2.:/MySQL/M50/push-5.0 mysql-test/mysql-test-run.pl: Auto merged
\| \| * \| \| \| \| \| \| \| \| \|	Makefile.am:	unknown	2007-03-22	1	-0/+2
\| \| \| \|_\|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't install benchmark executable CMakeLists.txt: Handle CMAKE_C_FLAGS_RELWITHDEBINFO and CMAKE_CXX_FLAGS_RELWITHDEBINFO extra/yassl/taocrypt/benchmark/Makefile.am: Don't install benchmark executable CMakeLists.txt: Handle CMAKE_C_FLAGS_RELWITHDEBINFO and CMAKE_CXX_FLAGS_RELWITHDEBINFO mysys/CMakeLists.txt: Handle CMAKE_C_FLAGS_RELWITHDEBINFO and CMAKE_CXX_FLAGS_RELWITHDEBINFO
* \| \| \| \| \| \| \| \| \| \|	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines	unknown	2007-03-28	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into chilla.local:/home/mydev/mysql-5.1-axmrg sql/mysql_priv.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_servers.h: Auto merged storage/federated/ha_federated.cc: Auto merged storage/heap/ha_heap.cc: Auto merged storage/myisam/ha_myisam.cc: Auto merged sql/sql_servers.cc: Manual merge
\| * \| \| \| \| \| \| \| \| \| \|	BUG#24566 - Incorrect key file for table ( the size of table is more than 2G)	unknown	2007-03-25	1	-4/+4
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Accessing a file that is bigger than 2G may report that read/write operation failed. This may affect anything that uses my_pread/my_pwrite functions, e.g. MyISAM, ARCHIVE, binary log. For MyISAM INSERT may report that table is crashed when writing to a table that is bigger than 2G. This is fixed by using proper offset type in my_pread/my_pwrite functions on systems that do not have native pread/pwrite calls. Affects systems that do not have native pread/pwrite calls, e.g. Windows. No test case for this fix, since it requires huge table. mysys/my_pread.c: Use proper offset type for restoring position on systems that do not have native pread/pwrite calls.
* \| \| \| \| \| \| \| \| \| \|	restored run-time thread lib detection	unknown	2007-03-28	3	-27/+48
\| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sql/stacktrace.c: removed code duplication sql/stacktrace.h: removed code duplication
* \| \| \| \| \| \| \| \| \|	Post Merge Fix.	unknown	2007-03-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge recycle.(none):/src/bug23736/my50-bug23736	unknown	2007-03-20	2	-11/+6
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| / / / / / / / / \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into recycle.(none):/src/bug23736/my51-bug23736 client/mysqlbinlog.cc: Auto merged include/my_sys.h: Auto merged mysys/array.c: Auto merged mysys/mf_tempdir.c: Manual Merge.
\| * \| \| \| \| \| \| \|	Bug#23736 Pointer free error in mysqlbinlog	unknown	2007-03-20	2	-11/+6
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Mis-matched SAFEMALLOC defines caused misleading error message. client/mysqlbinlog.cc: Bug#23736 Pointer free error in mysqlbinlog - Re-worked the Load_log_processor so that it frees it's resources before my_end is called. This is necessary because SAFEMALLOC's _my_free calls pthread_mutex_lock() using THR_LOCK_malloc which is cleaned up in my_end(). include/my_sys.h: Bug#23736 Pointer free error in mysqlbinlog - Define DYNAMIC_ARRAY beofore MY_TMPDIR - Add DYNAMIC_ARRAY to MY_TMP_DIR mysys/array.c: Bug#23736 Pointer free error in mysqlbinlog - SAFEMALLOC should not be unconditionally undef'd. mysys/mf_tempdir.c: Bug#23736 Pointer free error in mysqlbinlog - Use struct's DYNAMIC_ARRAY. - Use DYNAMIC_ARRAY:delete_dynamic function instead of my_free
\| * \| \| \| \| \| \|	Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50	unknown	2007-03-19	4	-512/+3
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
\| * \| \| \| \| \| \|	Merge naruto.:C:/cpp/bug25042/my50-bug25042	unknown	2007-03-09	1	-38/+111
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into naruto.:C:/cpp/mysql-5.0-maint include/my_pthread.h: Auto merged
* \| \| \| \| \| \| \|	CMakeLists.txt:	unknown	2007-03-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed references to my_winsem.c mysys/CMakeLists.txt: Removed references to my_winsem.c
* \| \| \| \| \| \| \|	Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build	unknown	2007-03-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/kent/bk/tmp/mysql-5.1-build BitKeeper/deleted/.del-CMakeLists.txt~14: Auto merged
\| * \| \| \| \| \| \|	Makefile.am, CMakeLists.txt:	unknown	2007-03-12	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed references to my_winsem.c mysys/CMakeLists.txt: Removed references to my_winsem.c mysys/Makefile.am: Removed references to my_winsem.c
* \| \| \| \| \| \| \|	Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build	unknown	2007-03-12	3	-510/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/kent/bk/tmp/mysql-5.1-build configure.in: Auto merged mysys/Makefile.am: Auto merged BitKeeper/deleted/.del-mysys.dsp~32695fee91189326: Auto merged BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822: Auto merged BitKeeper/deleted/.del-mysys_ia64.dsp~7a98bd8cd01d3043: Auto merged
\| * \| \| \| \| \| \|	Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build	unknown	2007-03-12	3	-510/+1
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| / / / / \| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/kent/bk/tmp/mysql-5.0-build VC++Files/mysys/mysys.vcproj: Auto merged VC++Files/mysys/mysys_ia64.dsp: Auto merged mysys/Makefile.am: Auto merged BitKeeper/deleted/.del-my_semaphore.c: Auto merged VC++Files/mysys/mysys.dsp: SCCS merged
\| \| * \| \| \| \|	Merge mysql.com:/home/kent/bk/tmp/mysql-4.0	unknown	2007-03-12	3	-511/+1
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/kent/bk/tmp/mysql-4.1-build include/Makefile.am: Auto merged
\| \| \| * \| \| \| \|	Makefile.am, configure.in, mysys.dsp:	unknown	2007-03-12	3	-511/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed unused files .del-my_winsem.c: Delete: mysys/my_winsem.c .del-my_semaphore.c: Delete: mysys/my_semaphore.c .del-my_semaphore.h: Delete: include/my_semaphore.h BitKeeper/deleted/.del-my_semaphore.c: Delete: mysys/my_semaphore.c BitKeeper/deleted/.del-my_semaphore.h: Delete: include/my_semaphore.h BitKeeper/deleted/.del-my_winsem.c: Delete: mysys/my_winsem.c VC++Files/mysys/mysys.dsp: Removed unused files configure.in: Removed unused files include/Makefile.am: Removed unused files mysys/Makefile.am: Removed unused files
\| \| * \| \| \| \| \|	After-merge fix:	unknown	2007-02-20	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The declaration of "thr_client_alarm" had got lost, keep it in "mysys/thr_alarm.c". mysys/thr_alarm.c: After-merge fix: In 4.1, the variable "thr_client_alarm" is declared in this module.
\| \| * \| \| \| \| \|	Merge trift2.:/MySQL/M40/clone-4.0	unknown	2007-02-20	1	-1/+0
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into trift2.:/MySQL/M41/merge-4.1 include/config-win.h: Auto merged mysys/my_pthread.c: Auto merged mysys/thr_alarm.c: Auto merged mysys/my_thr_init.c: Not applicable to 4.1 in its current state. sql/mysqld.cc: Change was a backport already, null-merged to 4.1.
\| \| \| * \| \| \| \|	Fix a linkage problem with the previous patch for "thr_client_alarm".	unknown	2007-02-12	2	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysys/my_pthread.c: Linkage problem with previous patch: "thr_client_alarm" must be declared in here. mysys/thr_alarm.c: Linkage problem: Declare "thr_client_alarm" over in "mysys/my_pthread.c".
\| \| \| * \| \| \| \|	Break a double declare of "uint thr_client_alarm" between ↵	unknown	2007-02-12	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"mysys/thr_alarm.c" and "mysys/my_pthread.c". mysys/my_pthread.c: Break a double declare: "uint thr_client_alarm" is also declared in "mysys/thr_alarm.c", take it from there.
\| \| \| * \| \| \| \|	Compile error on Windows: Signal names are undefined. Fix by hiding the ↵	unknown	2007-02-12	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	whole section. mysys/my_thr_init.c: Compile error on Windows: Both "SIGALRM" and "SIGUSR1" are undefined. Fix by hiding the whole section, according to Jani it is not needed on Windows.
\| \| * \| \| \| \| \|	Merge siva.hindu.god:/home/tsmith/m/bk/41	unknown	2007-02-08	1	-1/+0
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into siva.hindu.god:/home/tsmith/m/bk/maint/41 sql/sql_prepare.cc: Manual merge
\| \| \| * \ \ \ \ \	Merge 192.168.0.10:mysql/mysql-4.1-maint	unknown	2007-02-06	1	-1/+0
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|_\|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint mysys/default.c: Auto merged sql/mysqld.cc: Auto merged sql/sql_prepare.cc: Auto merged
\| \| \| \| * \| \| \| \|	Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint	unknown	2007-01-31	1	-1/+0
\| \| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged scripts/mysqld_multi.sh: Auto merged sql/mysqld.cc: Auto merged
\| \| \| \| \| * \| \| \| \|	User visible change - breaks some environments, per Paul DuBois. Reverting ↵	unknown	2007-01-26	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in 4.1 and 5.0.