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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge deer.(none):/home/hf/work/mysql-4.1.9110	unknown	2005-07-27	1	-0/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into deer.(none):/home/hf/work/mysql-5.0.clean libmysqld/lib_sql.cc: Auto merged
\| *	Fix for bug #9110 (Max_join_size error)	unknown	2005-07-26	1	-0/+2
\| \| \| \| \| \| \| \| \| \|	libmysqld/lib_sql.cc: This should be done during the thread activation
* \|	Fixes to previous changeset	unknown	2005-07-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	get_defaults_file() -> get_defaults_options() include/my_sys.h: Remove deleted function libmysql/libmysql.def: get_defaults_file() -> get_defaults_options() libmysqld/libmysqld.def: get_defaults_file() -> get_defaults_options()
* \|	Merge	unknown	2005-07-06	2	-4/+4
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BitKeeper/deleted/.del-Makefile.am~6cfa0db5e7778d09: Auto merged BitKeeper/deleted/.del-Makefile.am~41238af048e60515: Auto merged mysql-test/Makefile.am: Auto merged netware/Makefile.am: Auto merged tests/Makefile.am: Auto merged vio/Makefile.am: SCCS merged
\| *	Makefile.am:	unknown	2005-07-05	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir client/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir cmd-line-utils/libedit/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir dbug/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir extra/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir heap/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir isam/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir libmysql/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir libmysql_r/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir libmysqld/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir libmysqld/examples/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir merge/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir myisam/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir myisammrg/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir mysql-test/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir mysys/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir netware/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir regex/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir sql/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir strings/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir tests/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir vio/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir tools/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir
* \|	A fix and a test case for Bug#10794 "mysql_stmt_attr_set no	unknown	2005-06-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	open cursor after mysql_stmt_execute" + post-review fixes. The bug was caused by wrong flags in stmt->server_status on the client side: if there was no cursor, the server didn't send server_status flags to the client, and the old flags were used to set up the fetch function of a statement. Consequently, stmt_read_row_from_cursor was used when there was no cursor. The fix fixes the server to always send server flags to the client. include/mysql_com.h: Update stale comments. libmysql/libmysql.c: Remove an extra assignment. libmysqld/lib_sql.cc: Update to correspond to the changed signature of send_eof sql/protocol.cc: Actual fix for bug#10794: create a function that writes the eof packet to network and use it from send_fields. We need to send a full eof packet from send_fields to inform the client about the cursor status (that there is no cursor in this case). sql/protocol.h: Remove an unused parameter for send_eof. tests/mysql_client_test.c: A test case for Bug#10794 "mysql_stmt_attr_set no open cursor after mysql_stmt_execute"
* \|	Rename all prepared statements COM_ commands to prefix with COM_STMT_	unknown	2005-06-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	libmysql/libmysql.c: Rename. libmysqld/lib_sql.cc: Rename. sql/item_cmpfunc.cc: Use proper method to check for stmt prepare, only_prepare is removed. sql/mysql_priv.h: Remove an obsolete define. Rename mysql_stmt_free to mysql_stmt_close. sql/sql_class.h: Remove THD::only_prepare. Rename. sql/sql_lex.cc: Rename COM_PREPARE -> COM_STMT_PREPARE sql/sql_parse.cc: Rename. sql/sql_prepare.cc: Rename. sql/sql_yacc.yy: Rename. tests/mysql_client_test.c: Rename.
* \|	Merge bk-internal:/home/bk/mysql-5.0	unknown	2005-06-10	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into serg.mylan:/usr/home/serg/Abk/mysql-5.0 mysql-test/mysql-test-run.sh: Auto merged
\| * \|	mysql_client_test.dsp, mysql_test_run_new.dsp, mysqltest.dsp:	unknown	2005-06-09	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added /FD flag, to avoid include file warnings mysqlclient.dsp: Removed duplicate entry for "strings/ctype-cp932.c" Added missing "mysys/my_access.c" libmysqld.dsp: Added missing "mysys/charset.c" libmysqld.def: Added symbol 'get_charset_name' libmysqld/libmysqld.def: Added symbol 'get_charset_name' VC++Files/libmysqld/libmysqld.dsp: Added missing "mysys/charset.c" VC++Files/client/mysqlclient.dsp: Removed duplicate entry for "strings/ctype-cp932.c" Added missing "mysys/my_access.c" VC++Files/client/mysqltest.dsp: Added /FD flag, to avoid include file warnings VC++Files/mysql-test/mysql_test_run_new.dsp: Added /FD flag, to avoid include file warnings VC++Files/tests/mysql_client_test.dsp: Added /FD flag, to avoid include file warnings
* \| \|	remove old libmysqld.a before assembling a new one	unknown	2005-06-09	1	-0/+1
\|/ /
* \|	assemble libmysqld.a 5-10 times faster!	unknown	2005-06-02	1	-16/+11
\| \|
* \|	New file default_modify.c. Fixed a typo on mysqld.cc	unknown	2005-05-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed name of function my_correct_default_file to modify_defaults_file. Improved function and fixed some bugs in it. include/my_sys.h: Changed function name. include/mysql_com.h: New function, modify_defaults_file() libmysql/Makefile.shared: New file, default_modify.lo libmysql/libmysql.def: New function, modify_defaults_file() and fixed version number. libmysqld/libmysqld.def: New function, modify_defaults_file() mysys/Makefile.am: New file, default_modify.c mysys/default.c: Removed function from default.c. New, corresponding one is in default_modify.c, name is modify_defaults_file. server-tools/instance-manager/commands.cc: Changed function name. sql/mysqld.cc: Fixed typo.
* \|	Manual merge (again)	unknown	2005-05-14	1	-1/+4
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	configure.in: Auto merged include/mysql.h: Auto merged innobase/row/row0mysql.c: Auto merged BitKeeper/deleted/.del-ctype-cp932.c: Auto merged BitKeeper/deleted/.del-errmsg.txt~4617575065d612b9: Auto merged BitKeeper/deleted/.del-errmsg.txt~ffe4a0c9e3206150: Auto merged libmysql/libmysql.c: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/ps_grant.test: Auto merged sql/ha_blackhole.cc: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-ucs2.c: Auto merged
\| *	Makefile.am, configure.in:	unknown	2005-05-10	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable creation of embedded lib when --with-darwin-mwcc configure.in: Enable creation of embedded lib when --with-darwin-mwcc libmysqld/Makefile.am: Enable creation of embedded lib when --with-darwin-mwcc
* \|	Fix for bug #9632 (strict.test fails in -embedded-server mode)	unknown	2005-05-09	1	-5/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	libmysqld/libmysqld.c: we need this code before we create thd instance sql/sql_parse.cc: dispatch_command is the more appropriate place for this code
* \|	Clean up merge from 4.1	unknown	2005-05-02	2	-21/+42
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	configure.in: Auto merged extra/my_print_defaults.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/lowercase_table.result: Auto merged mysql-test/r/query_cache.result: Mege results mysql-test/t/lowercase_table.test: Merge tests mysql-test/t/query_cache.test: Merge tests mysys/default.c: Merge from 4.1 sql/sql_cache.cc: Merge sql/sql_parse.cc: Merge from 4.1 sql/sql_table.cc: Merge tests/mysql_client_test.c: Merge
\| *	Manually resolve merge	unknown	2005-04-29	2	-21/+42
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/r/query_cache.result: Resolve merge mysql-test/t/query_cache.test: Resolve merge
\| \| *	Fix crash in embedded server due to incorrect storage of results	unknown	2005-03-31	2	-21/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in the query cache. (Bug #9549) libmysqld/emb_qcache.h: Fix Querycache_stream::use_next_block() to actually use the next block and mark blocks as used when it writes to them. mysql-test/r/query_cache.result: Update results. mysql-test/t/query_cache.test: Add new regression test. libmysqld/emb_qcache.cc: Fix calls to use_next_block() to indicate whether we are writing to the next block or not. sql/sql_cache.cc: Initialize the first block properly when storing a result in the embedded server.
* \| \|	- manual merge	unknown	2005-04-21	1	-0/+16
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sql/share/Makefile.am: Auto merged tools/Makefile.am: Auto merged
\| * \|	- manual merge	unknown	2005-04-19	1	-0/+16
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	sql/share/Makefile.am: Auto merged
\| \| *	- added missing copyright headers to several Makefile.am's (noticed	unknown	2005-04-19	1	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	while testing changes to the mysql-copyright scripts libmysqld/examples/Makefile.am: - added a copyright header sql/share/Makefile.am: - added a copyright header tools/Makefile.am: - added a copyright header
* \| \|	BUG#9391 mysqlshow prints incorrect "rows" information	unknown	2005-04-13	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Removed use of mysql->extra_info - Removed unused function send_records_num VC++Files/winmysqladmin/mysql.h: Comment extra_info as not used anymore client/mysqlshow.c: Remove use of extra info. Instead read number of records in table using SELECT COUNT(*) include/mysql.h: Comment extra_info as not used anymore libmysqld/lib_sql.cc: Removed unused function send_records_num sql-common/client.c: Remove use of extra_info since number of records is not sent in the protocol anymore sql/protocol.cc: Removed unused function send_records_num sql/protocol.h: Removed unused function send_records_num
* \| \|	fixed conflict making embedded server with libmysqld	unknown	2005-03-25	1	-1/+2
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	libmysqld/Makefile.am: Fixed conflict
\| * \|	Fixing blackhole support in libmysqld	unknown	2005-03-25	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	libmysqld/Makefile.am: Adding ha_blackhole.cc
* \| \|	merged	unknown	2005-03-23	1	-2/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BitKeeper/etc/logging_ok: auto-union mysql-test/r/information_schema.result: Auto merged mysql-test/r/ndb_autodiscover.result: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/show_check.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/view.result: Auto merged scripts/fill_func_tables.sh: Auto merged scripts/mysql_create_system_tables.sh: Auto merged scripts/mysql_fix_privilege_tables.sh: Auto merged scripts/mysql_fix_privilege_tables.sql: Auto merged sql/field.cc: Auto merged sql/handler.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_table.cc: Auto merged sql/table.cc: Auto merged
\| * \| \|	Fix test_libmysqld link problem on Windows.	unknown	2005-03-21	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	libmysqld/libmysqld.def: Bump version number, add two symbols VC++Files/libmysqld/examples/test_libmysqld.dsp: Fix target name Remove unwanted dependency
* \| \| \|	Remove unexistent @MT_INCLUES@	unknown	2005-03-18	1	-1/+1
\| \| \| \|
* \| \| \|	Removed support for RAID, mit-threads, and MySQL FS (really, if someone ↵	unknown	2005-03-16	1	-1/+1
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	wants this feature look at a web-dav hookup). BitKeeper/deleted/.del-mysqlfs.m4~2c0a06625ffdef2: Delete: config/ac-macros/mysqlfs.m4 Makefile.am: Removed fs_dir (since dropping mysqlfs support) configure.in: Removed support for MySQLFS. Gone is support for mit-threads. Gone is Raid. I feel like if I say "gone" one more time I should embed a secret country song somewhere in the source as an easter egg. dbug/Makefile.am: Removed mit-threads extra/Makefile.am: Removed mit-threads heap/Makefile.am: removed mit-threads libmysql_r/Makefile.am: removed mit-threads libmysqld/Makefile.am: removed mit-threads myisam/Makefile.am: remove mt-threads myisammrg/Makefile.am: removed mit-threas mysys/Makefile.am: removed mit-threads regex/Makefile.am: removed mit-treads sql/Makefile.am: removed mit-threads strings/Makefile.am: removed mit-threads tests/Makefile.am: removed mit-threads tools/Makefile.am: removed mit-threads
* \| \|	Remove compiler warnings and remove not used variables	unknown	2005-02-25	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(Found during build process) extra/comp_err.c: Remove compiler warnings extra/perror.c: Remove compiler warnings innobase/dict/dict0dict.c: Remove compiler warnings innobase/dict/dict0load.c: Remove compiler warnings innobase/pars/pars0sym.c: Remove compiler warnings innobase/row/row0row.c: Remove compiler warnings innobase/row/row0sel.c: Remove compiler warnings libmysqld/lib_sql.cc: Remove not used variables myisam/mi_key.c: Remove compiler warnings regex/engine.c: Added comment sql/derror.cc: Remove not used variables sql/examples/ha_archive.cc: Fixed bug in blob handling Removed not used variable sql/field.cc: Remove compiler warnings Remove not used variables sql/filesort.cc: Remove compiler warnings sql/ha_heap.cc: Remove not used variable sql/ha_innodb.cc: Remove not used variables Remove compiler warnings sql/handler.cc: Remove compiler warnings and remove not used variables sql/item.cc: Remove compiler warnings and remove not used variables sql/item_subselect.cc: Remove compiler warnings sql/item_sum.cc: Remove compiler warnings sql/item_sum.h: Remove compiler warnings and remove not used variables sql/log.cc: Remove compiler warnings and remove not used variables sql/log_event.cc: Remove compiler warnings sql/mysqld.cc: Remove compiler warnings and remove not used variables sql/opt_range.cc: Remove compiler warnings and remove not used variables sql/slave.cc: Remove compiler warnings and remove not used variables sql/sp_pcontext.cc: Remove compiler warnings and remove not used variables sql/sql_acl.cc: Remove compiler warnings and remove not used variables sql/sql_analyse.cc: Remove compiler warnings and remove not used variables sql/sql_base.cc: Remove compiler warnings and remove not used variables sql/sql_db.cc: Remove compiler warnings and remove not used variables sql/sql_help.cc: Remove compiler warnings and remove not used variables sql/sql_insert.cc: Remove compiler warnings and remove not used variables sql/sql_load.cc: Remove compiler warnings and remove not used variables sql/sql_parse.cc: Remove compiler warnings and remove not used variables sql/sql_prepare.cc: Remove compiler warnings and remove not used variables sql/sql_select.cc: Remove compiler warnings and remove not used variables sql/sql_show.cc: Remove compiler warnings and remove not used variables sql/sql_table.cc: Remove compiler warnings sql/sql_union.cc: Remove compiler warnings sql/sql_update.cc: Remove compiler warnings and remove not used variables sql/sql_yacc.yy: Remove compiler warnings and remove not used variables sql/strfunc.cc: Remove compiler warnings and remove not used variables strings/ctype-ucs2.c: Remove compiler warnings tests/mysql_client_test.c: Remove compiler warnings and remove not used variables tools/mysqlmanager.c: Remove compiler warnings and remove not used variables
* \| \|	Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0	unknown	2005-02-17	2	-0/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa mysql-test/r/ctype_ucs.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/strict.test: Auto merged sql/ha_innodb.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_update.cc: Auto merged sql/examples/ha_archive.cc: Auto merged sql/sql_yacc.yy: Auto merged
\| * \ \	manually merged	unknown	2005-02-14	2	-0/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	client/mysqlbinlog.cc: Auto merged configure.in: Auto merged include/my_global.h: Auto merged include/my_pthread.h: Auto merged innobase/trx/trx0trx.c: Auto merged mysql-test/include/varchar.inc: Auto merged mysql-test/r/bdb.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/mysqlbinlog2.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/user_var.test: Auto merged mysys/hash.c: Auto merged sql/item_func.cc: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/set_var.h: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sp_head.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_repl.cc: Auto merged sql/sql_repl.h: Auto merged sql/sql_table.cc: Auto merged sql/sql_trigger.cc: Auto merged mysql-test/r/ctype_ucs.result: ul mysql-test/r/drop_temp_table.result: ul mysql-test/r/innodb.result: ul mysql-test/r/insert_select.result: ul mysql-test/r/mix_innodb_myisam_binlog.result: ul mysql-test/r/rpl_change_master.result: ul mysql-test/r/rpl_charset.result: ul mysql-test/r/rpl_error_ignored_table.result: ul mysql-test/r/rpl_flush_log_loop.result: ul mysql-test/r/rpl_flush_tables.result: ul mysql-test/r/rpl_loaddata.result: ul mysql-test/r/rpl_loaddata_rule_m.result: ul mysql-test/r/rpl_log.result: ul mysql-test/r/rpl_max_relay_size.result: ul mysql-test/r/rpl_relayrotate.result: ul mysql-test/r/rpl_replicate_do.result: ul mysql-test/r/rpl_rotate_logs.result: ul mysql-test/r/rpl_temporary.result: ul mysql-test/r/rpl_timezone.result: ul mysql-test/r/rpl_until.result: ul mysql-test/r/rpl_user_variables.result: ul mysql-test/r/user_var.result: ul
\| \| * \| \|	query_id and my_xid -> ulonglong	unknown	2005-01-27	2	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix for binlog+autocommit+tclog comments, style fixes libmysqld/libmysqld.rc: Change mode to -rw-rw-r-- libmysqld/resource.h: Change mode to -rw-rw-r-- configure.in: check for getpagesize include/my_global.h: typo ? include/my_pthread.h: bug in thread_safe_decrement_and_test() mysql-test/r/bdb.result: results updated mysql-test/r/innodb.result: results updated mysql-test/r/mix_innodb_myisam_binlog.result: results updated mysql-test/r/rpl_relayrotate.result: results updated sql/ha_berkeley.cc: style fixes sql/ha_innodb.cc: fixes to follow innodb coding style sql/handler.cc: more comments. XA COMMIT ONE PHASE fix. sql/handler.h: my_xid -> ulonglong. comments sql/item_func.cc: DO RELEASE_LOCK("...") is no cache_stmt sql/log.cc: comments, better error messages sql/log_event.cc: even in autocommit mode we may need to cache_stmt xid is ulonglong sql/log_event.h: more comments. sql/mysql_priv.h: query_id is ulonglong sql/mysqld.cc: default value for --log-tc changed sql/share/errmsg.txt: better error messages sql/sql_class.h: cleanup, comments sql/sql_delete.cc: deleting from temporary tables is not always transactional sql/sql_insert.cc: insert into temporary table is not always transactional sql/sql_load.cc: load data into temp table is not always transactional sql/sql_parse.cc: comments. bad merge fixed. xa_state_names[] sql/sql_table.cc: create/drop temp table is not always transactional sql/sql_update.cc: update temp table is not always transactional
* \| \| \| \|	Merge with 4.1	unknown	2005-02-15	1	-7/+11
\|\ \ \ \ \ \| \|/ / / / \|/\| \| / / \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BitKeeper/etc/logging_ok: auto-union BitKeeper/triggers/post-commit: Auto merged innobase/row/row0mysql.c: Auto merged myisam/ft_boolean_search.c: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/distinct.result: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/subselect.test: Auto merged mysql-test/t/union.test: Auto merged sql/item_strfunc.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_list.h: Auto merged sql/examples/ha_archive.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_string.h: Auto merged vio/viosocket.c: Auto merged scripts/mysql_create_system_tables.sh: simple merge sql/field.cc: simple merge sql/item.h: simple merge sql/sql_lex.h: simple merge sql/sql_yacc.yy: Merge (join_table_list was not comptely merged. Need to run test to know how things works...) sql/table.cc: Keep code from 5.0, except delted one not needed line strings/ctype-ucs2.c: Auto merge
\| * \| \|	Fix for bug #8477 (Embedded query_cache test crashes)	unknown	2005-02-12	1	-7/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	libmysqld/emb_qcache.cc: Querycahce data transition fixed
* \| \| \|	Precision Math implementation	unknown	2005-02-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BitKeeper/etc/ignore: Added client/decimal.c client/my_decimal.cc client/my_decimal.h to the ignore list
* \| \| \|	small Makefile.am cleanup	unknown	2005-01-28	2	-10/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	clean: targets removed generated .h files moved to include/ Docs/Images/Makefile.am: no clean: targets please! client/Makefile.am: generated .h files moved to include/ extra/Makefile.am: generated .h files moved to include/ include/Makefile.am: no clean: targets please! libmysql/Makefile.am: generated .h files moved to include/ libmysql_r/Makefile.am: generated .h files moved to include/ libmysqld/Makefile.am: generated .h files moved to include/ libmysqld/examples/Makefile.am: generated .h files moved to include/ no clean: target please! ndb/docs/Makefile.am: no clean: targets please! scripts/Makefile.am: SUPERCLEANFILES means nothing server-tools/instance-manager/Makefile.am: generated .h files moved to include/ sql/Makefile.am: generated .h files moved to include/ sql/share/Makefile.am: instead of (incorrectly) duplicating comp_err command line, call do make in extra/ tools/Makefile.am: generated .h files moved to include/ BitKeeper/etc/ignore: Added include/mysqld_ername.h include/mysqld_error.h include/sql_state.h to the ignore list
* \| \| \|	change to Makefile.am per Serg's request	unknown	2005-01-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	libmysqld/examples/Makefile.am: Change to Makefile.pm per serg's request, was to go out with federated push, but this fix is needed asap for Lenz. This has passed 'make test'
* \| \| \|	fix for make error in Makefile.am of mysql_client_test.c	unknown	2005-01-25	1	-1/+1
\| \| \| \|
* \| \| \|	Merge	unknown	2005-01-24	1	-8/+9
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BitKeeper/etc/ignore: auto-union include/my_global.h: Auto merged libmysql/libmysql.c: Auto merged libmysqld/examples/Makefile.am: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/mysqld.cc: Auto merged tests/mysql_client_test.c: Auto merged
\| * \| \|	- fixed one missing occasion from the mysql_client_test renaming	unknown	2005-01-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	libmysqld/examples/Makefile.am: - fixed a missing rename (mysql_client_test -> mysql_client_test_embedded)
\| * \| \|	- renamed client_test -> mysql_client_test	unknown	2005-01-20	1	-8/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- renamed the tests that use the embedded server (client_test -> mysql_client_test_embedded, mysqltest -> mysql_test_embedded and changed some Makefiles and scripts so they are installed in $bindir (required to be able to run the test suite against the embedded server) tests/mysql_client_test.c: Rename: tests/client_test.c -> tests/mysql_client_test.c libmysql/libmysql.c: - renamed client_test.c to mysql_client_test.c in a comment libmysqld/examples/Makefile.am: - renamed client_test -> mysql_client_test_embedded - renamed mysqltest -> mysqltest_embedded - both will be installed in $bindir scripts/make_binary_distribution.sh: - install mysql_client_test, mysql_client_test_embedded and mysqltest_embedded into bin directory tests/Makefile.am: - renamed client_test to mysql_client_test BitKeeper/etc/ignore: Added tests/mysql_client_test to the ignore list
* \| \| \|	Add ha_federated.cc to libmysqld/Makefile.am so that configuring with both	unknown	2005-01-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	embedded server and federated storage engine compiles. (Bug #7920) libmysqld/Makefile.am: Add ha_federated.cc to sources
* \| \| \|	Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1	unknown	2005-01-12	1	-1/+1
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
\| * \| \|	libmysqld.def, libmysql.def:	unknown	2005-01-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the invisible tabs (!) libmysql/libmysql.def: Use the invisible tabs (!) libmysqld/libmysqld.def: Use the invisible tabs (!)
* \| \| \|	Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1	unknown	2005-01-12	1	-0/+1
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
\| * \| \|	libmysqld.def, libmysql.def:	unknown	2005-01-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing 'get_defaults_files' to fix linking error. libmysql/libmysql.def: Add missing 'get_defaults_files' to fix linking error. libmysqld/libmysqld.def: Add missing 'get_defaults_files' to fix linking error.
* \| \| \|	Merging conflicts resolved	unknown	2005-01-11	2	-2/+6
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	VC++Files/libmysqld/libmysqld.dsp: Auto merged client/mysql.cc: Auto merged include/my_sys.h: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/r/ctype_utf8.result: Auto merged ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged ndb/src/kernel/blocks/suma/Suma.cpp: Auto merged ndb/src/mgmsrv/InitConfigFileParser.cpp: Auto merged sql/item_strfunc.cc: Auto merged sql/strfunc.cc: Auto merged VC++Files/sql/mysqld.dsp: Libraries changed mysys/default.c: get_defaults_files implementation added sql/sql_base.cc: merging sql/sql_show.cc: merging
\| * \| \|	Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1	unknown	2005-01-11	1	-0/+3
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into deer.(none):/home/hf/work/mysql-4.1.5920 client/mysql.cc: Auto merged
\| \| * \| \|	fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file)	unknown	2005-01-03	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	client/mysql.cc: bug #5920 (embedded-server mysql doesn't handle --defaults-file) defaults files handled include/my_sys.h: bug #5920 (embedded-server mysql doesn't handle --defaults-file) get_defaults_file interface added libmysqld/libmysqld.c: just small fix, not related to the bug. mysys/default.c: bug #5920 (embedded-server mysql doesn't handle --defaults-file) get_defaults_files implementation
\| * \| \| \|	A fix for Bug#7365 "embedded server for MacOS: problem with prepared	unknown	2005-01-11	1	-2/+3
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	statements": no test case, the test case is there already, libmysqld/examples/client_test.c, we just need to run it on a daily basis. libmysqld/lib_sql.cc: Convert statement id to least significant byte first format, uset for data transmission in MySQL protocol. It's assumed to be in this format by mysql_stmt_execute.