summaryrefslogtreecommitdiff
path: root/client
Commit message (Collapse)AuthorAgeFilesLines
* Added option --set-charset (disable with --skip-set-charset) to mysqldump.unknown2004-03-312-12/+18
| | | | | | | | | | Marked --no-set-names as deprecated, the name is misleading and --no- in front makes it cumbersome to use with --disable or --skip prefixes. The old option will still work for the time being. client/client_priv.h: Added option --set-charset (disable with --skip-set-charset) to mysqldump.
* simple optimzationunknown2004-03-311-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Portability fixes client/mysqltest.c: Fixed that if error number 0 is included in --error, we will not generate an error message include/mysql.h: Portability fix mysql-test/mysql-test-run.sh: Portability fix mysql-test/r/heap_btree.result: Portability fix mysql-test/r/rpl_error_ignored_table.result: Portability fix mysql-test/t/heap_btree.test: Portability fix mysql-test/t/rpl_error_ignored_table.test: Portability fix sql/sql_base.cc: simple optimzation sql/sql_yacc.yy: simple optimzation
* Force clients to recompile if client lib changes (Bug #3009)unknown2004-03-301-10/+11
| | | | | | | sql/lock.cc: Added comments sql/set_var.h: Indentation fix
* Fix to get correct metadata when using temporary tables to create result. ↵unknown2004-03-301-7/+55
| | | | | | | | | | | | | | | | | (Bug #2654) client/mysqltest.c: Added support for --enable_metadata mysql-test/t/order_by.test: Improved comment scripts/mysqlaccess.sh: CGI is required (Bug #2988) sql/field.cc: Fix to get correct metadata when using temporary tables to create result sql/field.h: Fix to get correct metadata when using temporary tables to create result sql/sql_insert.cc: Fix to get correct metadata when using temporary tables to create result
* Merge with 4.0unknown2004-03-251-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-libmysql.def~f5dffcb3ed925d28: Auto merged BitKeeper/deleted/.del-post-incoming~9f2168f531f09f3b: Auto merged BitKeeper/deleted/.del-post-outgoing~1dd3d8f0f6e8f3cd: Auto merged VC++Files/innobase/innobase.dsp: Auto merged VC++Files/strings/MASM6x/strings.dsp: Auto merged client/mysqldump.c: Auto merged innobase/sync/sync0sync.c: Auto merged myisam/mi_check.c: Auto merged mysql-test/t/union.test: Auto merged mysql-test/t/update.test: Auto merged mysys/mf_iocache.c: Auto merged sql/nt_servc.cc: Auto merged mysql-test/r/system_mysql_db.result: Auto merged sql/sql_base.cc: Auto merged
| * "automagically" is not a word.unknown2004-03-221-2/+2
| |
* | Ensure that we use unix file format (no \r\n) for all new filesunknown2004-03-201-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Portability fixes mysql-test/resolve-stack: Turn off EOLN_NATIVE flag mysql-test/t/ansi.test: Turn off EOLN_NATIVE flag mysql-test/t/backup-master.sh: Turn off EOLN_NATIVE flag mysql-test/t/bdb-alter-table-2-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/bdb-deadlock.test: Turn off EOLN_NATIVE flag mysql-test/t/bdb_cache-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/bdb_cache.test: Turn off EOLN_NATIVE flag mysql-test/t/bool.test: Turn off EOLN_NATIVE flag mysql-test/t/cast.test: Turn off EOLN_NATIVE flag mysql-test/t/connect.test: Turn off EOLN_NATIVE flag mysql-test/t/constraints.test: Turn off EOLN_NATIVE flag mysql-test/t/count_distinct3.test: Turn off EOLN_NATIVE flag mysql-test/t/ctype_big5.test: Turn off EOLN_NATIVE flag mysql-test/t/ctype_collate.test: Turn off EOLN_NATIVE flag mysql-test/t/ctype_cp1251-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/ctype_cp1251.test: Turn off EOLN_NATIVE flag mysql-test/t/ctype_create.test: Turn off EOLN_NATIVE flag mysql-test/t/ctype_latin1_de-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/ctype_latin1_de.test: Turn off EOLN_NATIVE flag mysql-test/t/ctype_many.test: Turn off EOLN_NATIVE flag mysql-test/t/ctype_mb.test: Turn off EOLN_NATIVE flag mysql-test/t/ctype_recoding.test: Turn off EOLN_NATIVE flag mysql-test/t/ctype_tis620-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/ctype_tis620.test: Turn off EOLN_NATIVE flag mysql-test/t/ctype_ucs.test: Turn off EOLN_NATIVE flag mysql-test/t/ctype_ujis.test: Turn off EOLN_NATIVE flag mysql-test/t/ctype_utf8.test: Turn off EOLN_NATIVE flag mysql-test/t/date_formats-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/date_formats.test: Turn off EOLN_NATIVE flag mysql-test/t/drop_temp_table.test: Turn off EOLN_NATIVE flag mysql-test/t/fulltext2.test: Turn off EOLN_NATIVE flag mysql-test/t/func_compress.test: Turn off EOLN_NATIVE flag mysql-test/t/func_concat.test: Turn off EOLN_NATIVE flag mysql-test/t/func_default.test: Turn off EOLN_NATIVE flag mysql-test/t/func_encrypt-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/func_gconcat.test: Turn off EOLN_NATIVE flag mysql-test/t/func_if.test: Turn off EOLN_NATIVE flag mysql-test/t/func_isnull.test: Turn off EOLN_NATIVE flag mysql-test/t/func_sapdb.test: Turn off EOLN_NATIVE flag mysql-test/t/gcc296.test: Turn off EOLN_NATIVE flag mysql-test/t/gis-rtree.test: Turn off EOLN_NATIVE flag mysql-test/t/gis.test: Turn off EOLN_NATIVE flag mysql-test/t/grant.test: Turn off EOLN_NATIVE flag mysql-test/t/grant2.test: Turn off EOLN_NATIVE flag mysql-test/t/grant_cache-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/grant_cache.test: Turn off EOLN_NATIVE flag mysql-test/t/heap_auto_increment.test: Turn off EOLN_NATIVE flag mysql-test/t/heap_btree.test: Turn off EOLN_NATIVE flag mysql-test/t/heap_hash.test: Turn off EOLN_NATIVE flag mysql-test/t/help.test: Turn off EOLN_NATIVE flag mysql-test/t/init_connect-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/init_connect.test: Turn off EOLN_NATIVE flag mysql-test/t/init_file-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/init_file.test: Turn off EOLN_NATIVE flag mysql-test/t/innodb-deadlock.test: Turn off EOLN_NATIVE flag mysql-test/t/innodb_cache-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/innodb_cache.test: Turn off EOLN_NATIVE flag mysql-test/t/innodb_handler.test: Turn off EOLN_NATIVE flag mysql-test/t/insert_update.test: Turn off EOLN_NATIVE flag mysql-test/t/isam.test: Turn off EOLN_NATIVE flag mysql-test/t/key_cache-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/key_cache.test: Turn off EOLN_NATIVE flag mysql-test/t/loaddata.test: Turn off EOLN_NATIVE flag mysql-test/t/lock_multi.test: Turn off EOLN_NATIVE flag mysql-test/t/lock_tables_lost_commit-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/lock_tables_lost_commit.test: Turn off EOLN_NATIVE flag mysql-test/t/lowercase_table-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/lowercase_table.test: Turn off EOLN_NATIVE flag mysql-test/t/lowercase_table2.test: Turn off EOLN_NATIVE flag mysql-test/t/lowercase_table3-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/lowercase_table3.test: Turn off EOLN_NATIVE flag mysql-test/t/lowercase_table_qcache-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/lowercase_table_qcache.test: Turn off EOLN_NATIVE flag mysql-test/t/mix_innodb_myisam_binlog.test: Turn off EOLN_NATIVE flag mysql-test/t/multi_statement.test: Turn off EOLN_NATIVE flag mysql-test/t/multi_update-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/myisam-blob-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/myisam-blob.test: Turn off EOLN_NATIVE flag mysql-test/t/mysqlbinlog-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/mysqlbinlog.test: Turn off EOLN_NATIVE flag mysql-test/t/mysqldump.test: Turn off EOLN_NATIVE flag mysql-test/t/negation_elimination.test: Turn off EOLN_NATIVE flag mysql-test/t/packet.test: Turn off EOLN_NATIVE flag mysql-test/t/preload.test: Turn off EOLN_NATIVE flag mysql-test/t/query_cache.test: Turn off EOLN_NATIVE flag mysql-test/t/query_cache_merge.test: Turn off EOLN_NATIVE flag mysql-test/t/repair_part1.test: Turn off EOLN_NATIVE flag mysql-test/t/repair_part2-master.sh: Turn off EOLN_NATIVE flag mysql-test/t/repair_part2.test: Turn off EOLN_NATIVE flag mysql-test/t/row.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl000001-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_EE_error.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_alter.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_chain_temp_table.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_change_master.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_do_grant.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_empty_master_crash.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_error_ignored_table-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_error_ignored_table.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_failsafe.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_flush_log_loop-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_flush_log_loop-master.sh: Turn off EOLN_NATIVE flag mysql-test/t/rpl_flush_log_loop-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_flush_log_loop-slave.sh: Turn off EOLN_NATIVE flag mysql-test/t/rpl_flush_log_loop.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_flush_tables.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_get_lock.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_heap.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_ignore_grant-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_ignore_grant.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_init_slave-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_init_slave.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_insert_id-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_insert_id.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_loaddata.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_loaddata_rule_m-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_loaddata_rule_m.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_loaddata_rule_s-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_loaddata_rule_s.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_loaddatalocal.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_log-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_log-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_master_pos_wait.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_max_relay_size.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_misc_functions-slave.sh: Turn off EOLN_NATIVE flag mysql-test/t/rpl_misc_functions.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_multi_delete-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_multi_delete.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_multi_update.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_openssl.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_optimize.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_relayrotate-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_relayrotate.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_relayspace-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_relayspace.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_reset_slave.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_skip_error-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_skip_error.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_temporary.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_trunc_binlog.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_until.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_user_variables.test: Turn off EOLN_NATIVE flag mysql-test/t/sql_mode.test: Turn off EOLN_NATIVE flag mysql-test/t/subselect.test: Turn off EOLN_NATIVE flag mysql-test/t/subselect2.test: Turn off EOLN_NATIVE flag mysql-test/t/subselect_innodb.test: Turn off EOLN_NATIVE flag mysql-test/t/system_mysql_db.test: Turn off EOLN_NATIVE flag mysql-test/t/system_mysql_db_fix-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/system_mysql_db_fix.test: Turn off EOLN_NATIVE flag mysql-test/t/system_mysql_db_refs.test: Turn off EOLN_NATIVE flag mysql-test/t/timezone-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/timezone.test: Turn off EOLN_NATIVE flag mysql-test/t/type_nchar.test: Turn off EOLN_NATIVE flag mysql-test/t/type_set.test: Turn off EOLN_NATIVE flag mysql-test/t/union-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/variables-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/warnings-master.opt: Turn off EOLN_NATIVE flag mysql-test/r/ansi.result: Turn off EOLN_NATIVE flag mysql-test/r/bdb-deadlock.result: Turn off EOLN_NATIVE flag mysql-test/r/bdb_cache.result: Turn off EOLN_NATIVE flag mysql-test/r/bool.result: Turn off EOLN_NATIVE flag mysql-test/r/cast.result: Turn off EOLN_NATIVE flag mysql-test/r/check_var_limit.require: Turn off EOLN_NATIVE flag mysql-test/r/connect.result: Turn off EOLN_NATIVE flag mysql-test/r/constraints.result: Turn off EOLN_NATIVE flag mysql-test/r/count_distinct3.result: Turn off EOLN_NATIVE flag mysql-test/r/ctype_big5.result: Turn off EOLN_NATIVE flag mysql-test/r/ctype_collate.result: Turn off EOLN_NATIVE flag mysql-test/r/ctype_cp1251.result: Turn off EOLN_NATIVE flag mysql-test/r/ctype_create.result: Turn off EOLN_NATIVE flag mysql-test/r/ctype_latin1_de.result: Turn off EOLN_NATIVE flag mysql-test/r/ctype_mb.result: Turn off EOLN_NATIVE flag mysql-test/r/ctype_recoding.result: Turn off EOLN_NATIVE flag mysql-test/r/ctype_tis620.result: Turn off EOLN_NATIVE flag mysql-test/r/ctype_ucs.result: Turn off EOLN_NATIVE flag mysql-test/r/ctype_ujis.result: Turn off EOLN_NATIVE flag mysql-test/r/ctype_utf8.result: Turn off EOLN_NATIVE flag mysql-test/r/date_formats.result: Turn off EOLN_NATIVE flag mysql-test/r/delete.result: Turn off EOLN_NATIVE flag mysql-test/r/drop_temp_table.result: Turn off EOLN_NATIVE flag mysql-test/r/errors.result: Turn off EOLN_NATIVE flag mysql-test/r/foreign_key.result: Turn off EOLN_NATIVE flag mysql-test/r/fulltext2.result: Turn off EOLN_NATIVE flag mysql-test/r/func_compress.result: Turn off EOLN_NATIVE flag mysql-test/r/func_concat.result: Turn off EOLN_NATIVE flag mysql-test/r/func_default.result: Turn off EOLN_NATIVE flag mysql-test/r/func_gconcat.result: Turn off EOLN_NATIVE flag mysql-test/r/func_if.result: Turn off EOLN_NATIVE flag mysql-test/r/func_isnull.result: Turn off EOLN_NATIVE flag mysql-test/r/func_sapdb.result: Turn off EOLN_NATIVE flag mysql-test/r/gcc296.result: Turn off EOLN_NATIVE flag mysql-test/r/gis-rtree.result: Turn off EOLN_NATIVE flag mysql-test/r/gis.result: Turn off EOLN_NATIVE flag mysql-test/r/grant.result: Turn off EOLN_NATIVE flag mysql-test/r/grant2.result: Turn off EOLN_NATIVE flag mysql-test/r/grant_cache.result: Turn off EOLN_NATIVE flag mysql-test/r/have_big5.require: Turn off EOLN_NATIVE flag mysql-test/r/have_compress.require: Turn off EOLN_NATIVE flag mysql-test/r/have_crypt.require: Turn off EOLN_NATIVE flag mysql-test/r/have_met_timezone.require: Turn off EOLN_NATIVE flag mysql-test/r/have_query_cache.require: Turn off EOLN_NATIVE flag mysql-test/r/have_tis620.require: Turn off EOLN_NATIVE flag mysql-test/r/have_ucs2.require: Turn off EOLN_NATIVE flag mysql-test/r/have_ujis.require: Turn off EOLN_NATIVE flag mysql-test/r/heap_auto_increment.result: Turn off EOLN_NATIVE flag mysql-test/r/heap_btree.result: Turn off EOLN_NATIVE flag mysql-test/r/heap_hash.result: Turn off EOLN_NATIVE flag mysql-test/r/help.result: Turn off EOLN_NATIVE flag mysql-test/r/init_connect.result: Turn off EOLN_NATIVE flag mysql-test/r/innodb-deadlock.result: Turn off EOLN_NATIVE flag mysql-test/r/innodb_cache.result: Turn off EOLN_NATIVE flag mysql-test/r/innodb_handler.result: Turn off EOLN_NATIVE flag mysql-test/r/insert_update.result: Turn off EOLN_NATIVE flag mysql-test/r/isam.result: Turn off EOLN_NATIVE flag mysql-test/r/key_cache.result: Turn off EOLN_NATIVE flag mysql-test/r/loaddata.result: Turn off EOLN_NATIVE flag mysql-test/r/lock_multi.result: Turn off EOLN_NATIVE flag mysql-test/r/lock_tables_lost_commit.result: Turn off EOLN_NATIVE flag mysql-test/r/lowercase0.require: Turn off EOLN_NATIVE flag mysql-test/r/lowercase2.require: Turn off EOLN_NATIVE flag mysql-test/r/lowercase_table.result: Turn off EOLN_NATIVE flag mysql-test/r/lowercase_table2.result: Turn off EOLN_NATIVE flag mysql-test/r/lowercase_table3.result: Turn off EOLN_NATIVE flag mysql-test/r/lowercase_table_qcache.result: Turn off EOLN_NATIVE flag mysql-test/r/mix_innodb_myisam_binlog.result: Turn off EOLN_NATIVE flag mysql-test/r/multi_statement.result: Turn off EOLN_NATIVE flag mysql-test/r/myisam-blob.result: Turn off EOLN_NATIVE flag mysql-test/r/mysqlbinlog.result: Turn off EOLN_NATIVE flag mysql-test/r/mysqldump.result: Turn off EOLN_NATIVE flag mysql-test/r/negation_elimination.result: Turn off EOLN_NATIVE flag mysql-test/r/not_embedded.require: Turn off EOLN_NATIVE flag mysql-test/r/overflow.result: Turn off EOLN_NATIVE flag mysql-test/r/packet.result: Turn off EOLN_NATIVE flag mysql-test/r/preload.result: Turn off EOLN_NATIVE flag mysql-test/r/query_cache.result: Turn off EOLN_NATIVE flag mysql-test/r/query_cache_merge.result: Turn off EOLN_NATIVE flag mysql-test/r/repair_part1.result: Turn off EOLN_NATIVE flag mysql-test/r/repair_part2.result: Turn off EOLN_NATIVE flag mysql-test/r/row.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_EE_error.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_alter.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_chain_temp_table.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_change_master.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_do_grant.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_empty_master_crash.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_error_ignored_table.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_failsafe.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_flush_log_loop.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_flush_tables.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_get_lock.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_heap.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_ignore_grant.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_init_slave.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_insert_id.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_loaddata.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_loaddata_rule_m.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_loaddata_rule_s.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_loaddatalocal.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_master_pos_wait.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_max_relay_size.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_misc_functions.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_multi_delete.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_multi_update.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_openssl.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_optimize.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_relayrotate.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_relayspace.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_reset_slave.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_skip_error.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_temporary.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_trunc_binlog.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_until.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_user_variables.result: Turn off EOLN_NATIVE flag mysql-test/r/sql_mode.result: Turn off EOLN_NATIVE flag mysql-test/r/subselect.result: Turn off EOLN_NATIVE flag mysql-test/r/subselect2.result: Turn off EOLN_NATIVE flag mysql-test/r/subselect_innodb.result: Turn off EOLN_NATIVE flag mysql-test/r/system_mysql_db.result: Turn off EOLN_NATIVE flag mysql-test/r/system_mysql_db_refs.result: Turn off EOLN_NATIVE flag mysql-test/r/timezone.result: Turn off EOLN_NATIVE flag mysql-test/r/true.require: Turn off EOLN_NATIVE flag mysql-test/r/type_nchar.result: Turn off EOLN_NATIVE flag mysql-test/r/type_set.result: Turn off EOLN_NATIVE flag mysql-test/r/warnings.result: Turn off EOLN_NATIVE flag BitKeeper/etc/config: Ensure that we use unix file format (no \r\n) for all new files client/mysqltest.c: Fix for previous push (long delimiters) mysql-test/r/derived.result: Fixed results mysql-test/r/rpl000009.result: Fixed results mysql-test/t/derived.test: Make test portable (for lower_case_table_names=2) mysql-test/t/rpl000009.test: After merge fix
* | Added test to show bug in current union implementationunknown2004-03-191-19/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After merge fixes Portability fixes client/mysqltest.c: Fixed that unget() is done properly (needed for QNX where one can't do many ungetc() in a row) include/errmsg.h: After merge fixes mysql-test/mysql-test-run.sh: merge fix mysql-test/r/system_mysql_db.result: Updated results for 4.1 mysql-test/r/union.result: Added new test mysql-test/t/derived.test: Portability fix (for Mac OS X) mysql-test/t/system_mysql_db_refs.test: Remove warnings mysql-test/t/union.test: Added test to show bug in current union implementation (to be fixed in 4.1) scripts/mysql_create_system_tables.sh: Fix wrong column define scripts/mysql_fix_privilege_tables.sh: Fix for mysql-test-run scripts/mysql_fix_privilege_tables.sql: Merge with 4.0 to get comments. Updated so that it works with privilege tables for MySQL 3.23. sql/repl_failsafe.cc: After merge fix
* | merge with 4.0 (to get compiler error fixes for innodb)unknown2004-03-191-13/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqltest.c: Auto merged include/errmsg.h: Auto merged include/mysql_version.h.in: Auto merged innobase/que/que0que.c: Auto merged mysql-test/t/rpl000009.test: Auto merged sql/set_var.cc: Auto merged libmysql/errmsg.c: merge with 4.0 libmysql/libmysql.c: merge with 4.0 mysql-test/mysql-test-run.sh: merge with 4.0 mysql-test/r/rpl000009.result: merge with 4.0 scripts/mysql_fix_privilege_tables.sh: merge with 4.0 sql/repl_failsafe.cc: merge with 4.0
| * Portability fixesunknown2004-03-191-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed \r from new tests Fixes to get new sustem_mysql_db... tests to work client/mysqltest.c: More debug information innobase/que/que0que.c: Fixed wrong usage of __attribute mysql-test/mysql-test-run.sh: Portability fix; Added CLIENT_BINDIR mysql-test/t/system_mysql_db_fix.test: Removed \r mysql-test/t/system_mysql_db_refs.test: Removed \r scripts/mysql_fix_privilege_tables.sh: Don't set root password from first option Added --bindir option
* | Fix for BUG#3214 "mysqlbinlog --read-from-remote-server --position prints ↵unknown2004-03-181-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | wrong positions" I am fixing it here in 4.1, not in 4.0, as it goes with another change which I did in 4.1 (fix for BUG#3204 ""mysqlbinlog --read-from-remote-server this_binlog.001" prints all binlogs"). client/mysqlbinlog.cc: correcting code to compute the position right when we are reading a remote binlog.
* | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1unknown2004-03-181-4/+35
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1 client/mysqlbinlog.cc: Auto merged mysql-test/r/mysqlbinlog.result: Auto merged
| * | Fix for BUG#3204 ""mysqlbinlog --read-from-remote-server this_binlog.001" ↵unknown2004-03-181-4/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prints all binlogs": we now detect that the server is sending us a log which we did not request by testing the info in the fake Rotate event. I also changed code to not print the fake Rotate which describes the log we asked for (it's always the first received event but old masters may not send it). client/mysqlbinlog.cc: Detect when the master is sending us a binlog which we have not requested, then stop. Skip the fake Rotate event if there is one (there may be none if the server to which we connect is < 4.0.14). mysql-test/r/mysqlbinlog.result: result update: master-bin.000002 is not printed anymore (as mysqlbinlog stops at the end of the requested log, master-bin.000001). mysql-test/t/mysqlbinlog.test: comment is wrong now
* | | Don't change server suffix if given to configureunknown2004-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Portability fixes client/mysqltest.c: Fixed output of 'affected rows' innobase/os/os0file.c: Portability fix (for AIX) mysql-test/r/rpl_trunc_binlog.result: Update results after merge sql/mysqld.cc: Don't change server suffix if given to configure
* | | merge fixes (use old code)unknown2004-03-185-34/+64
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqladmin.c: Auto merged client/mysqltest.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/include/os0file.h: Auto merged innobase/os/os0file.c: Auto merged myisam/mi_check.c: Auto merged sql/ha_innodb.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_handler.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_yacc.yy: Auto merged
| * | After merge fixesunknown2004-03-171-3/+6
| | |
| * | merge with 4.0unknown2004-03-165-32/+59
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union VC++Files/innobase/innobase.dsp: Auto merged VC++Files/libmysql/libmysql.dsp: Auto merged acinclude.m4: Auto merged configure.in: Auto merged BitKeeper/deleted/.del-com0shm.c~6a16f0c3d81de1f: Auto merged BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql: Auto merged extra/replace.c: Auto merged include/my_sys.h: Auto merged innobase/btr/btr0btr.c: Auto merged innobase/btr/btr0cur.c: Auto merged innobase/btr/btr0pcur.c: Auto merged innobase/btr/btr0sea.c: Auto merged innobase/configure.in: Auto merged innobase/data/data0data.c: Auto merged innobase/dict/dict0boot.c: Auto merged innobase/dict/dict0crea.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/dict/dict0load.c: Auto merged innobase/dict/dict0mem.c: Auto merged innobase/ha/ha0ha.c: Auto merged innobase/ha/hash0hash.c: Auto merged innobase/include/btr0btr.ic: Auto merged innobase/include/data0type.ic: Auto merged innobase/include/dict0mem.h: Auto merged innobase/include/log0log.ic: Auto merged innobase/include/mach0data.ic: Auto merged innobase/include/mtr0log.h: Auto merged innobase/include/mtr0mtr.h: Auto merged innobase/include/os0file.h: Auto merged innobase/include/row0upd.ic: Auto merged innobase/include/srv0srv.h: Auto merged innobase/include/sync0sync.h: Auto merged innobase/include/trx0rseg.ic: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/log/log0recv.c: Auto merged innobase/mem/mem0dbg.c: Auto merged innobase/mtr/mtr0log.c: Auto merged innobase/mtr/mtr0mtr.c: Auto merged innobase/os/os0file.c: Auto merged innobase/page/page0cur.c: Auto merged innobase/page/page0page.c: Auto merged innobase/pars/lexyy.c: Auto merged innobase/read/read0read.c: Auto merged innobase/rem/rem0cmp.c: Auto merged innobase/rem/rem0rec.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0purge.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/row/row0undo.c: Auto merged innobase/row/row0upd.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/sync/sync0rw.c: Auto merged innobase/thr/thr0loc.c: Auto merged innobase/trx/trx0purge.c: Auto merged innobase/trx/trx0rec.c: Auto merged innobase/trx/trx0roll.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/trx/trx0undo.c: Auto merged myisam/mi_check.c: Auto merged myisam/myisamchk.c: Auto merged mysql-test/r/multi_update.result: Auto merged mysql-test/r/mysqlbinlog.result: Auto merged mysql-test/r/rpl_error_ignored_table.result: Auto merged mysql-test/t/multi_update.test: Auto merged mysql-test/t/rpl_error_ignored_table.test: Auto merged mysys/mf_iocache.c: Auto merged mysys/mf_pack.c: Auto merged mysys/my_getopt.c: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/lock.cc: Auto merged sql/log.cc: Auto merged sql/opt_range.cc: Auto merged sql/set_var.h: Auto merged sql/sql_cache.cc: Auto merged sql/sql_cache.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_list.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged tests/thread_test.c: Auto merged client/mysqldump.c: Keep original indentation mysql-test/r/merge.result: keep old file scripts/mysql_fix_privilege_tables.sh: Keep old structure in merge with 4.0 sql/table.cc: merge with 4.0 + simple optimizations
| | * Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-121-3/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0 client/mysqlbinlog.cc: Auto merged
| | | * Force mysqlbinlog to require an argument if --local-load is usedunknown2004-03-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (--local-load alone means "I want files to be prepared for LOAD DATA INFILE, in the default temp directory", and mysqlbinlog already does this without --local-load). client/mysqlbinlog.cc: --local-load always needs an argument; --local-load alone is of no use.
| | * | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-111-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.0
| | | * | Fixed error in version.unknown2004-03-111-1/+1
| | | |/
| | * | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-111-7/+7
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.0
| | | * mysqldump.c:unknown2004-03-111-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reverting fix client/mysqldump.c: reverting fix
| | | * mysqldump.c:unknown2004-03-091-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to fix mysqldump problem when local-infile option is present under [client] options header. It will not start. This must be fixed as other programs use that option under [client] options header. client/mysqldump.c: This is to fix mysqldump problem when local-infile option is present under [client] options header. It will not start. This must be fixed as other programs use that option under [client] options header.
| | * | Small fixes.unknown2004-03-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqlbinlog.cc: Patched patch for Bug#2491. sql/set_var.cc: Added max_insert_delayed_threads into 'SHOW VARIABLES'.
| | * | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0unknown2004-03-101-24/+34
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0 mysql-test/mysql-test-run.sh: Auto merged
| | | * | fixed BUG #2874 "Grant table bug" andunknown2004-03-101-24/+34
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added tests for testing structure of mysql db client/mysqltest.c: extend "replace" to column names extend "disable_result_log" to output of --exec commad mysql-test/install_test_db.sh: corrected wrong column definitions (as a result of tests) mysql-test/mysql-test-run.sh: export MYSQL and MYSQL_FIX_SYSTEM_TABLES + added option --result-file for *.opt files scripts/mysql_fix_privilege_tables.sh: added new options to using in tests + added new alters (as a result of new tests) scripts/mysql_fix_privilege_tables.sql: added new alters (as a result of new tests) scripts/mysql_install_db.sh: corrected definition of tables_priv.Table_name
| | * | Patch for #3068: [Prompt without seconds when set from INI file].unknown2004-03-081-0/+6
| | |/ | | | | | | | | | | | | | | | | | | (Fix hours/seconds always to display with two digits.)
| | * Fixed Bug#2491, INSERT DELAYED causes binary log unusable by mysqlbinlog ↵unknown2004-03-041-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (replication is ok) Setting insert delayed threads = 0 at mysql_init_command. sql/mysql_priv.h: New session variable, max_insert_delayed_threads sql/mysqld.cc: New session variable, max_insert_delayed_threads sql/set_var.cc: New session variable, max_insert_delayed_threads sql/sql_class.h: New session variable, max_insert_delayed_threads sql/sql_insert.cc: New session variable, max_insert_delayed_threads BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * Indented comment properlyunknown2004-03-041-8/+9
| | |
| | * fix for bug #2905 - unknown2004-02-263-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "mysqladmin.c & co fail to use MYSQL_PORT as the default value of the TCP/IP port" client/mysqladmin.c: changed the value after REQUIRED_ARG from 0 to MYSQL_PORT client/mysqltest.c: changed the value after REQUIRED_ARG from 0 to MYSQL_PORT client/thread_test.c: changed the value after REQUIRED_ARG from 0 to MYSQL_PORT BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * do not look for string characters "'` inside comments - bug#539unknown2004-02-261-1/+1
| | |
| | * Inserted comment about lost root pwd procedure in Docs relying on command ↵unknown2004-02-251-0/+8
| | | | | | | | | | | | | | | | | | | | | order in mysqladmin. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * A fix for double free of memory in mysqlbinlog.unknown2004-02-231-1/+1
| | |
* | | roll back change in client/mysqladmin.c for bug unknown2004-03-161-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #3160 '"mysqladmin password" doesn't work if --skip-grant-tables' because we can't find out the mysql.user.host properly now mysqladmin just print an advice error-message in this case client/mysqladmin.c: roll back change for bug #3160 '"mysqladmin password" doesn't work if --skip-grant-tables' because we can't find out the mysql.user.host properly now mysqladmin just print an advice error-message in this case
* | | Merge bk@gate:/home/bk/mysql-4.1unknown2004-03-161-3/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_3160/mysql-4.1
| * | | fixed bug #3160 '"mysqladmin password" doesn't work if --skip-grant-tables'unknown2004-03-161-3/+24
| |/ /
* | | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-03-161-5/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1 client/mysqltest.c: Auto merged
| * \ \ Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1unknown2004-03-161-5/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1
| | * | fixed a lot of warnings in processing of unknown2004-03-161-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Q_QUERY_VERTICAL/Q_QYERY_HORIZONTAL in client/mysqltest.c (changed switch to ?:) client/mysqltest.c: fixed a lot of warnings in processing of Q_QUERY_VERTICAL/Q_QYERY_HORIZONTAL (changed switch to ?:)
* | | | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-03-161-4/+10
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_2709/mysql-4.1 sql/sql_class.h: Auto merged
| * | | actions for bug unknown2004-03-151-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #2709 Affected Rows for ON DUPL. KEY undocumented, perheps illogical 1. added COPY_INFO::updated to work with it in 'insert .. on duplicate' instead of COPY_INFO::deleted 2. added affected rows to output of "info:" in mysqltest.c client/mysqltest.c: added "affected rows" to output of "info : ".. mysql-test/r/insert_update.result: added tests for affected rows with insert .. duplicate (bug #2709) mysql-test/t/insert_update.test: added tests for affected rows with insert .. duplicate (bug #2709) sql/sql_class.h: added COPY_INFO::updated sql/sql_insert.cc: get write_record to work with COPY_INFO::updated instead of COPY_INFO::deleted for 'insert ... duplicate' statement
* | | | Fix for bug#3041 --safe-updates option declaration anomalyunknown2004-03-151-2/+2
|/ / /
* | | Mergeunknown2004-03-111-34/+57
|\ \ \ | |/ / |/| | | | | | | | | | | | | | mysql-test/r/mysqldump.result: e mysql-test/t/mysqldump.test: SCCS merged
| * | fixed bug #2591 "mysqldump quotas names inconsistently"unknown2004-03-111-33/+58
| | | | | | | | | | | | | | | | | | | | | mysql-test/r/mysqldump.result: added test for bug #2591 "mysqldump quotas names inconsistently" mysql-test/t/mysqldump.test: added test for bug #2591 "mysqldump quotas names inconsistently"
* | | corrected spelling error horisontal->horizontalunknown2004-03-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | into client/mysqltest.c client/mysqltest.c: corrected spelling error horisontal->horizontal
* | | - added commands --query_vertical and --query_horisontal to client/mysqltest.ccunknown2004-03-061-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - get my_strtod to return inf - get Field_float::store(double) and Field_double::store(float) to set null for nan value (as extra serg's recomendations to fix for patch on Bug #2082 'mysqldump converts "inf" to null') client/mysqltest.c: added commands --query_vertical and --query_horisontal mysql-test/r/insert.result: converted testcase so as my_strtod can return inf now mysql-test/r/mysqldump.result: converted testcase so as my_strtod can return inf now mysql-test/t/insert.test: corrected tests to using --query_vertical instead of pair (vertical_results,horisontal_results) sql/field.cc: corrected Field_float::store(double) and Field_double::store(double) to set null for nan value strings/strtod.c: get my_strtod to return inf
* | | Fixed bug #2082 'mysqldump converts "inf" to NULL' andunknown2004-03-041-10/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added commands vertical_results and horisontal_results to client/mysqltest.c client/mysqltest.c: added commands vertical_results and horisontal_results mysql-test/r/insert.result: added test for bug #2082 'mysqldump converts "inf" to NULL' mysql-test/t/insert.test: Fixed bug #2082 'mysqldump converts "inf" to NULL' sql/field.cc: added test for Fixed bug #2082 'mysqldump converts "inf" to NULL'
* | | Fix up history in readline implementation. unknown2004-03-031-3/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two things changed: 1. Repeated queries are only stored once in the history. 2. Multiline queries are stored in a concated format in the history, in addition to pieces. (Push approved by serg) client/mysql.cc: Fix up history in readline implementation. 1. Repeated queries are only stored once in the history. 2. Multiline queries are stored in a concated format in the history. (Push approved by serg) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | typo fixedunknown2004-02-211-1/+1
| | |