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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0	unknown	2005-04-06	2	-7/+11
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into deer.(none):/home/hf/work/mysql-5.0.errmsg mysql-test/r/row.result: Auto merged sql/item.cc: Auto merged
\| *	Stupid error message for 'insert "aaa"' into decimal column fixed	unknown	2005-04-06	2	-7/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/r/row.result: test result fixed sql/item.cc: error message for the case of bad decimal value added duplicated code removed
* \|	Update tests after merge of bug fix.	unknown	2005-04-05	5	-52/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/r/null.result: Update results mysql-test/r/show_check.result: Update results mysql-test/r/strict.result: Update results mysql-test/t/null.test: Fix default for smallint column. mysql-test/t/show_check.test: Fix default for bool column.
* \|	Merge	unknown	2005-04-05	31	-62/+189
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/r/create.result: Auto merged mysql-test/r/ctype_latin1_de.result: Auto merged mysql-test/r/grant.result: Auto merged mysql-test/r/grant2.result: Auto merged mysql-test/r/limit.result: Auto merged mysql-test/r/order_by.result: Auto merged mysql-test/r/rpl000001.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/strict.result: Auto merged mysql-test/r/type_blob.result: Auto merged mysql-test/r/type_ranges.result: Auto merged mysql-test/r/warnings.result: Auto merged mysql-test/t/ctype_latin1_de.test: Auto merged mysql-test/t/limit.test: Auto merged mysql-test/t/order_by.test: Auto merged mysql-test/t/show_check.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/type_blob.test: Auto merged mysql-test/t/type_ranges.test: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/sql_insert.cc: Auto merged mysql-test/t/strict.test: SCCS merged
\| * \|	Enable warnings for 'no default' fields being set to default when they	unknown	2005-01-14	28	-52/+93
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	are not specified in an insert. Most of these changes are actually to clean up the test suite to either specify defaults to avoid warnings, or add the warnings to the results. Related to bug #5986. mysql-test/t/index_merge_ror.test: Set default on columns to avoid warnings mysql-test/t/ctype_many.test: Add defaults to avoid warnings mysql-test/t/ctype_latin1_de.test: Add defaults to avoid warnings mysql-test/t/gis-rtree.test: Remove field that isn't used in test mysql-test/t/limit.test: set default values mysql-test/t/null.test: Specify default values mysql-test/t/order_by.test: add default value mysql-test/t/show_check.test: Add defaults mysql-test/t/sp.test: Add default value mysql-test/t/type_blob.test: Set default value mysql-test/t/type_ranges.test: Set default values mysql-test/r/create.result: Update results mysql-test/r/ctype_latin1_de.result: Update results mysql-test/r/ctype_many.result: Update results mysql-test/r/gis-rtree.result: Update results mysql-test/r/grant.result: Update results mysql-test/r/grant2.result: Update results mysql-test/r/help.result: Update results mysql-test/r/limit.result: Update results mysql-test/r/null.result: Update results mysql-test/r/order_by.result: Update results mysql-test/r/rpl000001.result: Update results mysql-test/r/sp.result: Update results mysql-test/r/strict.result: Update results mysql-test/r/type_blob.result: Update results mysql-test/r/type_ranges.result: Update results mysql-test/r/warnings.result: Update results sql/sql_insert.cc: Change check_that_all_fields_are_given_values() to issue warnings for all fields, and not only run when thd->abort_on_warning is set and error on just the first field.
\| * \|	In TRADITIONAL mode, don't allow a NOT NULL field with no default be set to	unknown	2005-01-13	5	-10/+96
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DEFAULT (with no argument) or to the field's type's default by not being listed in the list of fields being inserted. (Bug #5986) sql/item.cc: Add Item_default_value::save_in_field(), with check for setting fields with no default value set. sql/item.h: Implementation of Item_default_value::save_in_field moved to item.cc sql/sql_insert.cc: Call check_that_all_fields_are_given_values() if no values were given and we would be filling row with all default values mysql-test/t/strict.test: Add tests for setting fields to DEFAULT in traditional and regular modes mysql-test/r/strict.result: Add results
* \| \|	Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2005-04-05	1	-2/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
\| * \| \|	Some of the argument place holders were not quite correct compared to	unknown	2005-04-05	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the argument type. Fixed also some float() casts to double() as query_id is now actually longlong type. Related to Bug#9646. sql/sql_parse.cc: Some of the argument place holders were not quite correct compared to the argument type. Fixed also some float() casts to double() as query_id is now actually longlong type.
* \| \| \|	Remove references to result.es files	unknown	2005-04-05	2	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/Makefile.am: Remove result.es references scripts/make_binary_distribution.sh: Remove result.es refernece
* \| \| \|	Merge bk-internal:/home/bk/mysql-5.0	unknown	2005-04-05	2	-19/+43
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/jimw/my/mysql-5.0-clean
\| * \| \|	handler.cc, ha_innodb.cc:	unknown	2005-04-05	2	-19/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Bug #8650 : InnoDB does not rollback SQL statement at an error sql/ha_innodb.cc: Fix Bug #8650 : InnoDB does not rollback SQL statement at an error sql/handler.cc: Fix Bug #8650 : InnoDB does not rollback SQL statement at an error
* \| \| \|	Merge bk-internal:/home/bk/mysql-5.0	unknown	2005-04-05	2	-1/+2
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/jimw/my/mysql-5.0-clean
\| * \| \|	Merge bk-internal:/home/bk/mysql-5.0	unknown	2005-04-05	2	-1/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into serg.mylan:/usr/home/serg/Abk/mysql-5.0
\| \| * \| \|	removed a reference to non-existing file	unknown	2005-04-05	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BitKeeper/etc/ignore: added client/mysqltestmanagerc
* \| \| \| \|	Merge bk-internal:/home/bk/mysql-5.0	unknown	2005-04-05	41	-824/+461
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/jimw/my/mysql-5.0-clean sql/mysqld.cc: Auto merged
\| * \| \| \|	Merge mysql.com:/usr/local/bk/mysql-5.0	unknown	2005-04-05	3	-3/+7
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/pem/work/mysql-5.0
\| \| * \| \| \|	Additional fix for BUG#5907: Traditional mode: invalid value can be inserted ↵	unknown	2005-04-05	3	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	via a stored procedure ... make the handler catch too. mysql-test/r/strict.result: Updated corrected result for BUG#5907. mysql-test/t/strict.test: Corrected test for BUG#5907. sql/sp_head.cc: Make handlers catch certain bad data exceptions in strict mode too.
\| * \| \| \| \|	Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2005-04-05	3	-1/+123
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
\| \| * \| \| \|	Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2005-04-05	3	-1/+123
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
\| \| \| * \| \| \|	Fix Bug #9517 Condition pushdown to storage engine does not work for ↵	unknown	2005-04-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update/delete, post review fix, removed quick constraint
\| \| \| * \| \| \|	Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2005-04-05	3	-1/+123
\| \| \| \|\ \ \ \ \| \| \| \| \|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
\| \| \| \| * \| \|	Fix Bug #9517 Condition pushdown to storage engine does not work for ↵	unknown	2005-04-04	3	-1/+123
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update/delete
\| * \| \| \| \| \|	Merge bk-internal:/home/bk/mysql-5.0	unknown	2005-04-05	1	-1/+3
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into serg.mylan:/usr/home/serg/Abk/mysql-5.0
\| * \| \| \| \| \|	fix broken mix_innodb_myisam_binlog.test	unknown	2005-04-05	1	-9/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	sql/item.cc	unknown	2005-04-05	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	after merge fix sql/mysqld.cc too early for sync-binlog=1 by default :) sql/item.cc: after merge fix sql/mysqld.cc: too early for sync-binlog=1 by default :)
\| * \| \| \| \| \|	Merge	unknown	2005-04-05	33	-810/+321
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sql/field.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/handler.cc: SCCS merged
\| \| * \| \| \| \|	remove the rest of isam/merge references	unknown	2005-04-05	17	-130/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix a race condition in TC_LOG_BINLOG::unlog include/Makefile.am: remove the rest of isam/merge references include/config-win.h: unused and abused macro removed include/my_pthread.h: unused and abused macro removed include/my_sys.h: MY_IGNORE_BADFD flag include/mysql_embed.h: remove the rest of isam/merge references mysql-test/r/replace.result: remove the rest of isam/merge references mysql-test/t/replace.test: remove the rest of isam/merge references mysql-test/t/xa.test: comment mysys/my_sync.c: MY_IGNORE_BADFD flag sql/handler.cc: remove the rest of isam/merge references sql/log.cc: fix a race condition in TC_LOG_BINLOG::unlog preparation for binlog group commit sql/mysql_priv.h: remove duplicates sql/mysqld.cc: remove the rest of isam/merge references sql/opt_range.cc: remove the rest of isam/merge references sql/set_var.cc: hide unused variables. simplify sync_binlog code sql/sql_base.cc: remove the rest of isam/merge references sql/sql_class.h: cleanup
\| \| * \| \| \| \|	delete isam/merge files	unknown	2005-04-04	6	-573/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BitKeeper/deleted/.del-ha_isam.m4~7588b20d5625ce54: Delete: config/ac-macros/ha_isam.m4 BitKeeper/deleted/.del-nisam.h~5efa811281b55093: Delete: include/nisam.h BitKeeper/deleted/.del-merge.h~c3c34b8b88ec67ae: Delete: include/merge.h BitKeeper/deleted/.del-have_isam.inc~8bbdabbdbe0697d3: Delete: mysql-test/include/have_isam.inc BitKeeper/deleted/.del-have_isam.require~be6a18a8a25a617f: Delete: mysql-test/r/have_isam.require BitKeeper/deleted/.del-isam.test~834fb0ee8196c445: Delete: mysql-test/t/isam.test
\| \| * \| \| \| \|	XID SQL syntax	unknown	2005-04-04	12	-107/+239
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	minor cleanups XA tests include/m_ctype.h: minor cleanup sql/field.cc: minor cleanup sql/handler.cc: XID SQL syntax sql/handler.h: XID SQL syntax sql/item_sum.h: minor cleanup sql/lock.cc: comments sql/sql_class.cc: minor cleanup sql/sql_lex.h: XID SQL syntax sql/sql_parse.cc: XID SQL syntax sql/sql_yacc.yy: XID SQL syntax cleanups
* \| \| \| \| \| \|	Merge bk-internal:/home/bk/mysql-5.0	unknown	2005-04-05	11	-74/+135
\|\ \ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/jimw/my/mysql-5.0-clean
\| * \| \| \| \| \|	InnoDB: Disable an assertion that fails on old data due to Bug #9526	unknown	2005-04-05	1	-1/+3
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	innobase/row/row0sel.c: Disable an assertion that fails for old UTF-8 ENUM columns (Bug #9526)
\| * \| \| \| \|	Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement	unknown	2005-04-05	4	-5/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	restore original 'lex->query_tables' table list after processing of information schema table remove unnecessary operations mysql-test/r/ps.result: Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement mysql-test/t/ps.test: Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement sql/sql_lex.h: Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement sql/sql_show.cc: Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement
\| * \| \| \| \|	Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2005-04-05	3	-49/+70
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/gluh/MySQL/Bugs/mysql-5.0
\| \| * \| \| \| \|	Fix for bug#7214: information_schema: unauthorized user can see metadata	unknown	2005-04-05	3	-49/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the fix for 'columns' table only Rights check for 'routines' table is already done (see WL2131 Access control for SHOW ... PROCEDURE\|FUNCTION ...) rename 'testtets' database to 'mysqltest' to keep number of DBs which created by mysql-test as small as possible mysql-test/r/information_schema.result: Fix for bug#7214: information_schema: unauthorized user can see metadata mysql-test/t/information_schema.test: Fix for bug#7214: information_schema: unauthorized user can see metadata sql/sql_show.cc: Fix for bug#7214: information_schema: unauthorized user can see metadata
\| * \| \| \| \| \|	Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2005-04-05	2	-16/+5
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/usr/home/ram/work/mysql-5.0
\| \| * \| \| \| \|	Code optimization(discussed with Monty)	unknown	2005-04-05	2	-16/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
\| * \| \| \| \| \|	Fix for bug #9571: Primary key creation causes server crash.	unknown	2005-04-05	3	-3/+13
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sql/unireg.cc: Fix for bug #9571: Primary key creation causes server crash. We should pass null_pos to the make_field() anyway, as we use it for bit fields.
* \| \| \| \| \|	Merge	unknown	2005-04-04	8	-17/+93
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/r/join_outer.result: Auto merged mysql-test/t/join_outer.test: Auto merged sql-common/client.c: Auto merged sql/mysqld.cc: Auto merged
\| * \| \| \| \|	Merge new tests	unknown	2005-04-04	3	-9/+44
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/r/join_outer.result: Update results mysql-test/t/join_outer.test: Merge
\| \| * \| \| \| \|	Make sure that warning message when GROUP_CONCAT() cuts values is also	unknown	2005-02-23	3	-8/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	updated with the correct number of lines. (Bug #8681) mysql-test/t/join_outer.test: Add new regression test mysql-test/r/join_outer.result: Add new results sql/item_sum.cc: Move cleanup of warning message outside of "if (original)" test or it won't always get cleaned up.
\| * \| \| \| \| \|	Merge mysql.com:/home/jimw/my/mysql-4.1-9472b	unknown	2005-04-04	1	-10/+3
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/jimw/my/mysql-4.1-clean
\| \| * \| \| \| \| \|	Fix handling of max_allowed_packet and net_buffer_length in	unknown	2005-04-01	1	-10/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	embedded server when a size suffix (K, M, G) is added. (Bug #9472) sql/mysqld.cc: Instead of (re)parsing max_allowed_packet and net_buffer_length for the embedded server, just set the global variables to what is set in global_system_variables within get_options().
\| * \| \| \| \| \| \|	Merge mysql.com:/home/jimw/my/mysql-4.1-8866	unknown	2005-04-04	4	-5/+52
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/jimw/my/mysql-4.1-clean client/mysqltest.c: Auto merged sql-common/client.c: Auto merged
\| \| * \| \| \| \| \| \|	Fix reconnect when using prepared statements, and add	unknown	2005-03-28	4	-5/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	--disable_reconnect and --enable_reconnect to mysqltest so that it can be tested properly. (Bug #8866) client/mysqltest.c: Add support for --disable_reconnect and --enable_reconnect mysql-test/r/kill.result: Update results mysql-test/t/kill.test: Fix test to actually verify that killing a connection is working, and that automatic reconnect is working as desired. sql-common/client.c: Clean up MYSQL->stmts on reconnect by invalidating statements not in the MYSQL_STMT_INIT_DONE state, and reconnecting others to the new MYSQL object.
* \| \| \| \| \| \| \| \|	Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2005-04-05	6	-21/+29
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/cps/mysql/trees/mysql-5.0 mysql-test/mysql-test-run.sh: Auto merged
\| * \| \| \| \| \| \| \| \|	Enable IM in the binary distribution and fix Bug #9513 (mysql.server script ↵	unknown	2005-04-04	6	-21/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	from the binary distibution doesn't work out of the box) client/Makefile.am: old mysqlmanager, mysqlmanagerc and mysqlmanager-pwgen renamed into mysqltestmanager, mysqltestmanagerc and mysqltestmanager-pwgen respectively mysql-test/mysql-test-run.sh: Old mysqlmanager, mysqlmanagerc and mysqlmanager-pwgen renamed into mysqltestmanager, mysqltestmanagerc and mysqltestmanager-pwgen respectively scripts/make_binary_distribution.sh: Fix the script to include IM and process mysql.server correctly server-tools/instance-manager/Makefile.am: change default socket name to follow mysqld style (and thus, fix the ptoblem with non-existant localstatedir in the binary distribution) support-files/mysql.spec.sh: Fix mysql.spec template to reflect the name change tools/Makefile.am: old mysqlmanager renamed into mysqltestmanager
* \| \| \| \| \| \| \| \| \|	Skip new test with embedded server	unknown	2005-04-04	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/t/view_grant.test: Skip test with embedded server
* \| \| \| \| \| \| \| \| \|	Fix merge of tests that were split out of other test files	unknown	2005-04-04	6	-18/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/r/ctype_ucs_binlog.result: Update results mysql-test/r/timezone_grant.result: Update results mysql-test/r/user_var-binlog.result: Update results mysql-test/t/ctype_ucs_binlog.test: Update binlog starting position mysql-test/t/timezone_grant.test: Update error numbers mysql-test/t/user_var-binlog.test: Update binlog starting position
* \| \| \| \| \| \| \| \| \|	Merge mysql.com:/home/jimw/my/mysql-4.1-clean	unknown	2005-04-04	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/jimw/my/mysql-5.0-clean
\| * \| \| \| \| \| \| \| \|	Merge bk-internal:/home/bk/mysql-4.1	unknown	2005-04-04	1	-19/+38
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/jimw/my/mysql-4.1-clean