log-slave-updates since this causes unexpected values in
Exec_master_log_pos in A->B->C replication setup, synchronization
problems in master_pos_wait()...
Still this brokes some functionality in sql/repl_failsafe.cc
(but this file is not used now)
mysql-test/r/rpl_log.result:
SHOW BINLOG EVENTS for binlog on slave should give the same
Orig_log_pos and Pos values
sql/log_event.cc:
Do not propagate our master's log pos to our bin log
sql/repl_failsafe.cc:
Added comment about broken SHOW NEW MASTER
sql/slave.cc:
Do not propagate our master's log pos to our bin log
sql/sql_class.cc:
THD::log_pos is no longer needed
sql/sql_class.h:
THD::log_pos is no longer needed
sql/sql_parse.cc:
Added comment about broken SHOW NEW MASTER
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
BitKeeper/deleted/.del-convert.result~a3b56e1db6f498e9:
Delete: mysql-test/r/convert.result
BitKeeper/deleted/.del-convert.test~f4ceb743194dfe72:
Delete: mysql-test/t/convert.test
BitKeeper/deleted/.del-make_win_src_distribution.old~5c9ebdc4a852b43b:
Delete: scripts/make_win_src_distribution.old
client/mysql.cc:
Use server character set if --default-character-set is not used
client/mysqltest.c:
Code cleanup (merge identical code)
More debug messages
heap/hp_create.c:
After merge fix
include/m_ctype.h:
After merge fix
include/my_global.h:
Remove size_str (we already have size_s)
include/mysql_com.h:
After merge fix
libmysql/libmysql.c:
After merge fix
libmysqld/Makefile.am:
After merge fix
mysql-test/r/auto_increment.result:
After merge fix
mysql-test/r/create.result:
After merge fix
mysql-test/r/ctype_latin1_de.result:
After merge fix
mysql-test/r/distinct.result:
After merge fix
mysql-test/r/drop.result:
After merge fix
mysql-test/r/fulltext.result:
After merge fix
mysql-test/r/func_gconcat.result:
After merge fix
mysql-test/r/func_str.result:
After merge fix
mysql-test/r/func_test.result:
After merge fix
mysql-test/r/grant.result:
After merge fix
mysql-test/r/group_by.result:
After merge fix
mysql-test/r/handler.result:
After merge fix
mysql-test/r/heap.result:
After merge fix
mysql-test/r/heap_btree.result:
After merge fix
mysql-test/r/heap_hash.result:
After merge fix
mysql-test/r/innodb.result:
After merge fix
mysql-test/r/insert.result:
After merge fix
mysql-test/r/insert_select.result:
After merge fix
mysql-test/r/join_outer.result:
After merge fix
mysql-test/r/key.result:
After merge fix
mysql-test/r/key_cache.result:
After merge fix
mysql-test/r/loaddata.result:
After merge fix
mysql-test/r/myisam.result:
After merge fix
mysql-test/r/null.result:
After merge fix
mysql-test/r/null_key.result:
After merge fix
mysql-test/r/order_by.result:
After merge fix
mysql-test/r/rpl_do_grant.result:
After merge fix
mysql-test/r/rpl_error_ignored_table.result:
After merge fix
mysql-test/r/rpl_ignore_grant.result:
After merge fix
mysql-test/r/rpl_loaddata.result:
After merge fix
mysql-test/r/rpl_log.result:
After merge fix
mysql-test/r/rpl_log_pos.result:
After merge fix
mysql-test/r/rpl_max_relay_size.result:
After merge fix
mysql-test/r/rpl_replicate_do.result:
After merge fix
mysql-test/r/rpl_reset_slave.result:
After merge fix
mysql-test/r/rpl_rotate_logs.result:
After merge fix
mysql-test/r/rpl_user_variables.result:
After merge fix
mysql-test/r/select.result:
After merge fix
mysql-test/r/select_safe.result:
After merge fix
mysql-test/r/subselect.result:
After merge fix
mysql-test/r/type_blob.result:
After merge fix
mysql-test/r/type_decimal.result:
After merge fix
mysql-test/r/type_float.result:
After merge fix
mysql-test/r/type_ranges.result:
After merge fix
mysql-test/r/type_time.result:
After merge fix
mysql-test/r/type_uint.result:
After merge fix
mysql-test/r/union.result:
After merge fix
mysql-test/r/warnings.result:
After merge fix
mysql-test/t/auto_increment.test:
After merge fix
mysql-test/t/case.test:
After merge fix
mysql-test/t/ctype_collate.test:
After merge fix
mysql-test/t/ctype_latin1_de.test:
After merge fix
mysql-test/t/drop.test:
After merge fix
mysql-test/t/func_in.test:
After merge fix
mysql-test/t/func_set.test:
After merge fix
mysql-test/t/func_str.test:
After merge fix
mysql-test/t/func_test.test:
After merge fix
mysql-test/t/grant.test:
After merge fix
mysql-test/t/group_by.test:
After merge fix
mysql-test/t/handler.test:
After merge fix
mysql-test/t/heap.test:
After merge fix
mysql-test/t/heap_btree.test:
After merge fix
mysql-test/t/heap_hash.test:
After merge fix
mysql-test/t/innodb.test:
After merge fix
mysql-test/t/insert_select.test:
After merge fix
mysql-test/t/key.test:
After merge fix
mysql-test/t/key_cache.test:
After merge fix
mysql-test/t/lock_tables_lost_commit-master.opt:
After merge fix
mysql-test/t/lock_tables_lost_commit.test:
After merge fix
mysql-test/t/myisam.test:
After merge fix
mysql-test/t/row.test:
After merge fix
mysql-test/t/subselect.test:
After merge fix
mysql-test/t/type_decimal.test:
After merge fix
mysql-test/t/type_ranges.test:
After merge fix
mysql-test/t/type_uint.test:
After merge fix
mysql-test/t/variables.test:
After merge fix
mysql-test/t/warnings.test:
After merge fix
scripts/make_win_src_distribution.sh:
after merge fixes
sql-common/client.c:
After merge fix
Change my_connect() to use poll()
If character set is not given, use servers character set.
sql/field.cc:
After merge fix
Don't give warnings when storing data in fields in optimizer.
sql/ha_myisammrg.h:
After merge fix
sql/log.cc:
After merge fix
sql/log_event.cc:
After merge fix
sql/mysqld.cc:
After merge fix
sql/opt_range.cc:
After merge fix
sql/set_var.cc:
Code cleanup
Fixed wrong usage of base_names (like medium.key_buffer) that caused core dumps
sql/set_var.h:
Fixed wrong usage of base_names (like medium.key_buffer) that caused core dumps
sql/slave.cc:
After merge fix
sql/sql_acl.cc:
After merge fix
Code cleanup
sql/sql_class.cc:
Added convert_string() for more efficient alloc+character-set convert of strings
Add cached flags to avoid calling mysql_charset_same() during parsing.
sql/sql_class.h:
Added convert_string() for more efficient alloc+character-set convert of strings
Add cached flags to avoid calling mysql_charset_same() during parsing.
sql/sql_handler.cc:
After merge fix
sql/sql_lex.h:
After merge fix
sql/sql_parse.cc:
Optimize and fix memory reference errors reported by valgrind
sql/sql_repl.cc:
After merge fix
sql/sql_yacc.yy:
After merge fix
Avoid calling mysql_charset_same() when parsing identifiers
strings/ctype-latin1.c:
Port latin_de conversion code from 4.0
BitKeeper/etc/logging_ok:
auto-union
scripts/make_win_src_distribution.old:
Merge rename: scripts/make_win_src_distribution.sh -> scripts/make_win_src_distribution.old
BUILD/compile-pentium-debug-max:
Auto merged
BitKeeper/deleted/.del-sel000001.result~383913ae4505ec86:
Auto merged
BitKeeper/deleted/.del-sel000001.test~9567c1646058cc:
Auto merged
Build-tools/Bootstrap:
Auto merged
Build-tools/Do-compile:
Auto merged
Docs/Makefile.am:
Auto merged
client/get_password.c:
Auto merged
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
extra/perror.c:
Auto merged
include/config-win.h:
Auto merged
include/my_sys.h:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/btr/btr0pcur.c:
Auto merged
innobase/buf/buf0buf.c:
Auto merged
innobase/buf/buf0flu.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/dict/dict0load.c:
Auto merged
innobase/include/buf0buf.h:
Auto merged
innobase/include/log0recv.h:
Auto merged
innobase/include/row0sel.h:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/include/ut0mem.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/mem/mem0pool.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/trx/trx0sys.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/ut/ut0mem.c:
Auto merged
innobase/ut/ut0ut.c:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_extra.c:
Auto merged
myisam/mi_key.c:
Auto merged
myisam/myisamdef.h:
Auto merged
myisammrg/myrg_queue.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/ctype_latin1_de.result:
Auto merged
mysql-test/r/flush.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/grant_cache.result:
Auto merged
mysql-test/r/join.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/range.result:
Auto merged
mysql-test/r/rpl000018.result:
Auto merged
mysql-test/r/rpl_insert_id.result:
Auto merged
mysql-test/r/rpl_master_pos_wait.result:
Auto merged
mysql-test/r/rpl_relayspace.result:
Auto merged
mysql-test/r/select_safe.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/r/type_date.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/alias.test:
Auto merged
mysql-test/t/ctype_latin1_de.test:
Auto merged
mysql-test/t/fulltext_left_join.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/heap.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
mysql-test/t/order_by.test:
Auto merged
mysql-test/t/range.test:
Auto merged
mysql-test/t/rpl000001.test:
Auto merged
mysql-test/t/rpl000018.test:
Auto merged
mysql-test/t/rpl_insert_id.test:
Auto merged
mysql-test/t/sel000100.test:
Auto merged
mysql-test/t/select_safe.test:
Auto merged
mysql-test/t/type_date.test:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
mysql-test/t/user_var.test:
Auto merged
mysys/default.c:
Auto merged
mysys/mf_format.c:
Auto merged
mysys/my_getopt.c:
Auto merged
mysys/thr_lock.c:
Auto merged
mysys/tree.c:
Auto merged
scripts/Makefile.am:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/Makefile.am:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/nt_servc.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_rename.cc:
Auto merged
sql/sql_repl.h:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
sql/uniques.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
vio/viosocket.c:
Auto merged
BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e:
merge
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
merge
acinclude.m4:
Merge with 4.0 (openssl patch)
client/mysqlbinlog.cc:
Merge with 4.0 in which we had added code from 4.1
(We are basicly only using the 4.1 code here)
configure.in:
Keep 4.1 file
heap/hp_open.c:
merge with 4.0
include/my_base.h:
merge with 4.0
include/my_global.h:
merge with 4.0
include/mysqld_error.h:
merge with 4.0
innobase/ha/ha0ha.c:
merge with 4.0
(Code should be same but we use indentaion from 4.0)
innobase/log/log0recv.c:
merge with 4.0
libmysql/libmysql.c:
Remove with 4.0 code that was ported from 4.1
libmysqld/lib_sql.cc:
merge with 4.0
myisam/mi_open.c:
Remove 4.0 specific code
myisam/myisamchk.c:
merge with 4.0
myisammrg/myrg_rkey.c:
merge with 4.0
mysql-test/r/alter_table.result:
May need to be fixed after merge
mysql-test/r/create.result:
May need to be fixed after merge
mysql-test/r/distinct.result:
May need to be fixed after merge
mysql-test/r/drop.result:
May need to be fixed after merge
mysql-test/r/fulltext.result:
May need to be fixed after merge
mysql-test/r/func_set.result:
May need to be fixed after merge
mysql-test/r/func_str.result:
May need to be fixed after merge
mysql-test/r/func_test.result:
May need to be fixed after merge
mysql-test/r/grant.result:
May need to be fixed after merge
mysql-test/r/group_by.result:
May need to be fixed after merge
mysql-test/r/handler.result:
May need to be fixed after merge
mysql-test/r/heap.result:
May need to be fixed after merge
mysql-test/r/innodb.result:
May need to be fixed after merge
mysql-test/r/insert.result:
May need to be fixed after merge
mysql-test/r/insert_select.result:
May need to be fixed after merge
mysql-test/r/key_diff.result:
May need to be fixed after merge
mysql-test/r/merge.result:
May need to be fixed after merge
mysql-test/r/myisam.result:
May need to be fixed after merge
mysql-test/r/order_by.result:
May need to be fixed after merge
mysql-test/r/query_cache.result:
May need to be fixed after merge
mysql-test/r/rpl_flush_log_loop.result:
May need to be fixed after merge
mysql-test/r/rpl_loaddata.result:
May need to be fixed after merge
mysql-test/r/rpl_log.result:
May need to be fixed after merge
mysql-test/r/rpl_log_pos.result:
May need to be fixed after merge
mysql-test/r/rpl_rotate_logs.result:
May need to be fixed after merge
mysql-test/r/select.result:
May need to be fixed after merge
mysql-test/r/union.result:
May need to be fixed after merge
mysql-test/r/user_var.result:
May need to be fixed after merge
mysql-test/t/alter_table.test:
merge with 4.0
mysql-test/t/create.test:
merge with 4.0
mysql-test/t/distinct.test:
merge with 4.0
mysql-test/t/drop.test:
merge with 4.0
mysql-test/t/flush.test:
merge with 4.0
mysql-test/t/fulltext.test:
merge with 4.0
mysql-test/t/func_set.test:
merge with 4.0
mysql-test/t/func_str.test:
merge with 4.0
mysql-test/t/func_test.test:
merge with 4.0
mysql-test/t/grant.test:
merge with 4.0
mysql-test/t/grant_cache.test:
merge with 4.0
mysql-test/t/innodb.test:
Add back EXPLAIN and SHOW KEYS statements, but make them independent of number of rows returned by InnoDB
mysql-test/t/insert.test:
merge with 4.0
mysql-test/t/insert_select.test:
merge with 4.0
mysql-test/t/merge.test:
merge with 4.0
mysql-test/t/query_cache.test:
merge with 4.0
mysql-test/t/rpl_flush_log_loop.test:
merge with 4.0
mysql-test/t/rpl_loaddata.test:
merge with 4.0
mysql-test/t/rpl_rotate_logs.test:
merge with 4.0
mysql-test/t/select.test:
merge with 4.0
mysql-test/t/symlink.test:
merge with 4.0
mysql-test/t/union.test:
merge with 4.0
mysys/charset.c:
merge with 4.0
scripts/mysql_fix_privilege_tables.sh:
merge with 4.0 (Add quoting for some variables)
sql/field.h:
merge with 4.0
sql/ha_innodb.cc:
merge with 4.0
sql/item_cmpfunc.cc:
merge with 4.0
sql/item_cmpfunc.h:
merge with 4.0
sql/item_func.h:
merge with 4.0
sql/item_strfunc.cc:
merge with 4.0
Fixed null handling with ELT()
sql/item_timefunc.h:
merge with 4.0
sql/lex.h:
merge with 4.0
sql/log.cc:
merge with 4.0
sql/log_event.cc:
Merge with 4.0
Cleanups:
- Indentation
- #endif comments
- Replace strmov() with *pos++= for two byte strings
- Moved variable declarations to start of functions
- Merged identical code (LOAD_EVENT)
- Added casts when subtracting pointers
Did a full diff between this and 4.0 to ensure that the file is correct after merge.
sql/log_event.h:
merge with 4.0
sql/mysql_priv.h:
merge with 4.0
sql/mysqld.cc:
merge with 4.0
sql/repl_failsafe.cc:
merge with 4.0
sql/set_var.cc:
merge with 4.0
sql/set_var.h:
merge with 4.0
sql/share/czech/errmsg.txt:
merge with 4.0
sql/share/danish/errmsg.txt:
merge with 4.0
sql/share/dutch/errmsg.txt:
merge with 4.0
sql/share/english/errmsg.txt:
merge with 4.0
sql/share/estonian/errmsg.txt:
merge with 4.0
sql/share/french/errmsg.txt:
merge with 4.0
sql/share/german/errmsg.txt:
merge with 4.0
sql/share/greek/errmsg.txt:
merge with 4.0
sql/share/hungarian/errmsg.txt:
merge with 4.0
sql/share/italian/errmsg.txt:
merge with 4.0
sql/share/japanese/errmsg.txt:
merge with 4.0
sql/share/korean/errmsg.txt:
merge with 4.0
sql/share/norwegian-ny/errmsg.txt:
merge with 4.0
sql/share/norwegian/errmsg.txt:
merge with 4.0
sql/share/polish/errmsg.txt:
merge with 4.0
sql/share/portuguese/errmsg.txt:
merge with 4.0
sql/share/romanian/errmsg.txt:
merge with 4.0
sql/share/russian/errmsg.txt:
merge with 4.0
sql/share/slovak/errmsg.txt:
merge with 4.0
sql/share/spanish/errmsg.txt:
merge with 4.0
sql/share/swedish/errmsg.txt:
merge with 4.0
sql/share/ukrainian/errmsg.txt:
merge with 4.0
sql/slave.cc:
Merge + some indentation fixes
sql/slave.h:
merge with 4.0
sql/sql_acl.cc:
merge with 4.0
Some end space removal to make it easier to do future merges
sql/sql_acl.h:
merge with 4.0
sql/sql_cache.cc:
merge with 4.0
sql/sql_class.h:
merge with 4.0
sql/sql_handler.cc:
merge with 4.0
sql/sql_lex.cc:
merge with 4.0
sql/sql_lex.h:
merge with 4.0
sql/sql_parse.cc:
merge with 4.0
sql/sql_repl.cc:
merge with 4.0
sql/sql_select.cc:
merge with 4.0
sql/sql_table.cc:
merge with 4.0
sql/sql_union.cc:
Merge with 4.0
Note that I couldn't find out how to merge OPTION_FOUND_ROWS handling so this has to be fixed later
sql/sql_yacc.yy:
merge with 4.0
Removed end space to make merge easier
vio/Makefile.am:
merge with 4.0
(Mostly code cleanups)
include/my_sys.h:
Removed not used define
myisam/mi_check.c:
Indentation change
mysql-test/t/rpl_insert_id.test:
Add test if server supports innodb
mysys/mf_format.c:
Remove QUOTE handling from fn_format()
(fn_format() should not have anything to do with quoting things)
sql/log_event.cc:
Removed some unnecessary casts (by changing functions to use const char *)
Cleaned up some error messages to make them shorter and (hopefully) more readable.
Fixed wrong format strings
Restored 'thd->options' on error.
sql/mini_client.cc:
Changed order of include files to remove compilation warning
sql/mysqld.cc:
Add proper quoting of service arguments (don't use fn_format)
sql/slave.cc:
Simple optimization and cleanup.
Changed rewrite_db() and print_slave_db_safe() to use const char* to avoid casting of arguments when calling functions.
Cleanup of some error messages.
sql/slave.h:
Changed protypes to use const char *
sql/sql_acl.cc:
Simple optimization
vio/viosslfactories.c:
Changed order of include files to remove compilation warning
- Bug #985: "Between RESET SLAVE and START SLAVE, SHOW SLAVE STATUS is wrong."
Now RESET SLAVE puts correct info in mi->host etc. A new test rpl_reset_slave
for that.
- Bug #986: "CHANGE MASTER & START SLAVE do not reset error columns in SHOW
SLAVE STATUS". Now these reset the errors.
mysql-test/r/rpl_loaddata.result:
result update.
mysql-test/t/rpl_loaddata.test:
Test that RESET SLAVE, START SLAVE and CHANGE MASTER all reset
Last_slave_error and Last_slave_errno (columns of SHOW SLAVE STATUS).
We do it in this test because that's one of tests which have
an intentional query error on the slave.
sql/slave.cc:
As we need TWICE the code to copy command-line options (--master-host etc)
to mi (we already had it in init_master_info, but we also need it in RESET
SLAVE to fix bug#985), I make a function of this code.
And a function to reset Last_slave_error and Last_slave_errno (we need
it in CHANGE MASTER, RESET SLAVE, and at the start of the SQL thread).
sql/slave.h:
declarations for new functions.
sql/sql_repl.cc:
copy --master-host etc to mi in RESET SLAVE, so that SHOW SLAVE STATUS
shows correct information.
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_create.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_parse.cc:
merge commit
convert of database to utf8 in case of cahnge_user added
I extended the task to cleaning error messages, making them look nicer,
and making the output of SHOW SLAVE STATUS (column Last_error) be as complete
as what's printed on the .err file;
previously we would have, for a failure of a replicated LOAD DATA INFILE:
- in the .err, 2 lines:
"duplicate entry 2708 for key 1"
"failed loading SQL_LOAD-5-2-2.info"
- and in SHOW SLAVE STATUS, only:
"failed loading SQL_LOAD-5-2-2.info".
Now SHOW SLAVE STATUS will contain the concatenation of the 2 messages.
sql/log_event.cc:
Print the default database when replication stops because of an error. Previously, we had:
"error "Duplicate entry 87987 for key 1", query 'insert into t values(87987)'", ie the db
was not mentioned, making it hard for cases where the same table name is used in
several databases.
Lengthened some error messages (for failing replication of LOAD DATA: mention the table
and the db).
Changes so that SHOW SLAVE STATUS reports as complete errors as the .err file.
sql/slave.cc:
Removed a useless declaration (the rewrite_db() function is already declared in slave.h).
Added missing ')' in error messages.
Tried to make error messages look nicer (previously we had
"do START SLAVE;, error_code=1062"
now we'll have
"do START SLAVE; . Error_code=1062".
This form has been discussed, I agree it's no panacea, but it's still more readable
like this. To be improved in the future :)
sql/slave.h:
declarations.
and other replicate-*-table options in SHOW SLAVE STATUS.
Seems like it had not been done, so I push it now:
there's 4 new columns to SHOW SLAVE STATUS.
mysql-test/r/rpl000015.result:
Result update (more columns)
mysql-test/r/rpl_empty_master_crash.result:
Result update (more columns)
mysql-test/r/rpl_flush_log_loop.result:
Result update (more columns)
mysql-test/r/rpl_log.result:
Result update (more columns)
mysql-test/r/rpl_log_pos.result:
Result update (more columns)
mysql-test/r/rpl_redirect.result:
Result update (more columns)
mysql-test/r/rpl_replicate_do.result:
Result update (more columns)
mysql-test/r/rpl_rotate_logs.result:
Result update (more columns)
mysql-test/t/rpl_replicate_do.test:
Result update (more columns)
sql/slave.cc:
Print replicate_*_table options in SHOW SLAVE STATUS
sql/slave.h:
two functions to make a string of replicate_*_table lists.
mysql-test/t/rpl_flush_log_loop.test:
Add timer to avoid problem when 'flush logs' is executed before we have read all data from master
sql/log.cc:
Better fix for bug #791:
Mark log as LOG_TO_BE_OPENED instead of LOG_CLOSED when it's closed and opened.
sql/mysqld.cc:
Better startup message
sql/slave.cc:
Fix argument to close()
sql/sql_class.h:
Better handling of log.close()
a safer way of initing the mutexes in MYSQL_LOG.
is_open() is now always thread-safe.
See each file for details.
sql/handler.cc:
is_open() with locks
sql/item_func.cc:
is_open() with locks
sql/log.cc:
No more 'inited'.
We now always use is_open() in a thread-safe manner.
This simplifies some functions (no more need to test is_open() twice).
sql/log_event.cc:
is_open() with locks
sql/mysqld.cc:
Init mutexes for the global MYSQL_LOG objects.
We care about no_rotate, because we can't do it in open() anymore (because
we don't have 'inited' anymore).
sql/repl_failsafe.cc:
is_open() with locks
sql/slave.cc:
init pthread objects (mutexes, conds) in the constructor of st_relay_log_info.
Some better locking in rotate_relay_log().
sql/sql_base.cc:
is_open() with locks
sql/sql_class.h:
Before, we inited LOCK_log in MYSQL_LOG::open(), so in other places of the code
when we were never 100% sure that it had been inited. For example, if the server
was running without --log-bin, ::open() was not called so the mutex was not
inited. We could detect it with !inited, but not safely as 'inited' was not
protected by any mutex.
So now:
we *always* init the LOCK_log mutex, even if the log is not used. We can't init
the mutex in MYSQL_LOG's constructor, because for global objects like
mysql_bin_log, mysql_log etc, the constructor is called before MY_INIT(), but
safe_mutex depends on MY_INIT(). So we have a new function MYSQL_LOG::init_pthread_objects
which we call in main(), after MY_INIT().
For the relay log, we call this function in the constructor of
st_relay_log_info, which is called before any function tries to
use the relay log (the relay log is always invoked as rli.relay_log).
So now we should be safe in all cases and we don't need 'inited'.
sql/sql_db.cc:
is_open() with locks
sql/sql_delete.cc:
is_open() with locks
sql/sql_insert.cc:
is_open() with locks
sql/sql_load.cc:
is_open() with locks
sql/sql_parse.cc:
is_open() with locks
sql/sql_rename.cc:
is_open() with locks
sql/sql_repl.cc:
is_open() with locks
sql/sql_table.cc:
is_open() with locks
sql/sql_update.cc:
is_open() with locks
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-cron-build:
Delete: netware/BUILD/cron-build
BitKeeper/deleted/.del-crontab:
Delete: netware/BUILD/crontab
BitKeeper/triggers/post-commit:
Auto merged
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysqld/Makefile.am:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisamdef.h:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/r/connect.result:
Auto merged
mysql-test/r/rpl_temporary.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
netware/BUILD/compile-AUTOTOOLS:
Auto merged
netware/BUILD/compile-linux-tools:
Auto merged
netware/BUILD/compile-netware-END:
Auto merged
netware/BUILD/compile-netware-START:
Auto merged
netware/BUILD/compile-netware-all:
Auto merged
netware/BUILD/compile-netware-debug:
Auto merged
netware/BUILD/compile-netware-standard:
Auto merged
netware/BUILD/mwasmnlm:
Auto merged
netware/BUILD/mwccnlm:
Auto merged
netware/BUILD/mwldnlm:
Auto merged
netware/BUILD/nwbootstrap:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/records.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_error.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
FLUSH LOGS now rotates relay logs,
and a new variable max_relay_log_size.
Plus a very small bit of code cleaning.
libmysqld/lib_sql.cc:
open_log has no default arguments anymore.
mysql-test/r/rpl_flush_log_loop.result:
result update now that FLUSH LOGS rotates relay logs.
mysql-test/r/rpl_log.result:
result update now that FLUSH LOGS rotates relay logs.
mysql-test/r/rpl_rotate_logs.result:
result update now that max_binlog_size is 4096.
mysql-test/t/rpl_rotate_logs-master.opt:
now max_binlog_size must be a multiple of 4096 (see change in mysqld.cc)
sql/log.cc:
Got rid of default arguments of various MYSQL_LOG methods (the default arguments
made code reading uneasy).
Set max_size in ::init().
New function set_max_size() to set max_size of a MYSQL_LOG on-the-fly.
More DBUG info.
sql/mysql_priv.h:
no defaults in open_log().
New variables max_relay_log_size.
sql/mysqld.cc:
New variable and option max_relay_log_size.
max_binlog_size and max_relay_log_size are multiples of IO_SIZE.
No more default arguments for log functions.
sql/set_var.cc:
New variable max_relay_log_size.
If it is 0, then max_binlog_size will apply to relay logs.
When one of these variables is changed, fix_max_%log_size is called
to update max_size of the binary and/or relay logs.
sql/slave.cc:
New function rotate_relay_log().
sql/slave.h:
New function rotate_relay_log().
sql/sql_class.h:
New member max_size of MYSQL_LOG (for automatic rotation).
New method set_max_size() for setting on-the-fly.
sql/sql_parse.cc:
Flush the relay log in FLUSH LOGS.
so I commit again in a fresh tree.
Fix for bug#763 (Relay_log_space too big by 4 bytes),
plus comments and DBUG_PRINT, and we don't start replication
if --bootstrap.
mysql-test/r/rpl_log.result:
Result update
mysql-test/r/rpl_log_pos.result:
Result update
sql/mysqld.cc:
Don't start replication if in bootstrap mode (bootstrap isn't supposed to have
several threads).
sql/slave.cc:
Fix for bug 763 (Relay_log_space too big by 4 bytes).
A DBUG_PRINT.
sql/sql_acl.cc:
Replaced a return by DBUG_RETURN (happened to find this reading a debug log).
sql/sql_repl.cc:
A comment.
For now following tasks have been done:
- PASSWORD() function was rewritten. PASSWORD() now returns SHA1
hash_stage2; for new passwords user.password contains '*'hash_stage2; sql_yacc.yy also fixed;
- password.c: new functions were implemented, old rolled back to 4.0 state
- server code was rewritten to use new authorization algorithm (check_user(), change
user, and other stuff in sql/sql_parse.cc)
- client code was rewritten to use new authorization algorithm
(mysql_real_connect, myslq_authenticate in sql-common/client.c)
- now server barks on 45-byte-length 4.1.0 passwords and refuses 4.1.0-style
authentification. Users with 4.1.0 passwords are blocked (sql/sql_acl.cc)
- mysqladmin.c was fixed to work correctly with new passwords
Tests for 4.0-4.1.1, 4.1.1-4.1.1 (with or without db/password) logons was performed;
mysqladmin also was tested. Additional check are nevertheless necessary.
BitKeeper/etc/ignore:
Added start_mysqld.sh mysys/main.cc to the ignore list
client/mysqladmin.c:
fixed with new password api
include/mysql.h:
So as scramble_323 accepts only null-terminated message, two scramble buffs are necessary.
gotta be fixed
include/mysql_com.h:
new constants and password.c api changes
libmysql/libmysql.c:
mysql_change_user rewritten to work with new password api
scripts/mysql_create_system_tables.sh:
fixed 'Password' column length to 41
scripts/mysql_fix_privilege_tables.sql:
fixed 'Password' column length to 41
sql-common/client.c:
mysql_real_connect rewritten to support new handshake procedure
sql/item_strfunc.cc:
Item_func_password and Item_func_old_password rewritten with new password api
sql/item_strfunc.h:
bit commented, numbers replaced with #defined constants
sql/mysql_priv.h:
removed unnecessary declaration as now all constants defined is in mysql_com.h
sql/mysqld.cc:
scramble initialization moved to sql_parce.cc:check_connection
sql/password.c:
All 4.1 functions were rolled back to 4.0 with attempt to save all possible 4.0-4.1 changes.
Names for 4.0 functions were suffixed with '_323'
Functions for new handshake were added.
sql/slave.cc:
Fixed to new constant; Bug #766 remains to be fixed
sql/slave.h:
fixed to new constant; Buf #766 remains to be fixed
sql/sql_acl.cc:
rewritten to support new passwords (41 byte-long) and password api
sql/sql_acl.h:
ditto
sql/sql_class.cc:
initialization for new members added
sql/sql_class.h:
same thing as in struct mysql - scramble is used for new family of functions, scramble_323 - for old
sql/sql_parse.cc:
check_connections was renamed to check_connection as this name reflects better what this function does
authorization part of check_connection was rewritten
check_user was rewritten with new password and acl api
new function 'authenticate', which optionally re-request scramble from client was added
fixed some typos
COM_CHANGE_USER piece of dipsatch_command() was rewritten
sql/sql_repl.h:
HASH_PASSWORD_LENGTH replaced with SCRAMBLED_PASSWORD_CHAR_LENGTH
bug #766 remains
sql/sql_yacc.yy:
Two-argument form of PASSWORD() was removed
PASSWORD() function was fixed with new password api.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
mysql-test/r/insert_select.result:
Fixed results
mysql-test/r/join_outer.result:
New test case for inner join table dependency
mysql-test/t/insert_select.test:
Remove not used drop tables.
Fixed table names
mysql-test/t/join_outer.test:
New test case for inner join table dependency
sql/slave.cc:
Simple optimizations
Updated VC++ files
VC++Files/client/mysql.dsp:
Update of VC++ files
VC++Files/client/mysqlclient.dsp:
Update of VC++ files
VC++Files/libmysqld/examples/test_libmysqld.dsp:
Update of VC++ files
VC++Files/libmysqld/libmysqld.def:
Update of VC++ files
VC++Files/libmysqld/libmysqld.dsp:
Update of VC++ files
VC++Files/myisam/myisam.dsp:
Update of VC++ files
VC++Files/mysql.dsw:
Update of VC++ files
VC++Files/sql/mysqld.dsp:
Update of VC++ files
include/mysql.h:
Add missing client functions to embedded server
libmysql/libmysql.def:
sort functions to enable comparison with libmysqld.def
libmysqld/libmysqld.c:
Add missing client functions to embedded server
libmysqld/libmysqld.def:
sort functions to enable comparison with libmysql.def
Added missing functions
myisam/mi_preload.c:
Fixed compiler warning.
Small code cleanup
scripts/make_win_src_distribution.sh:
Fixed typo
Don't run zip in verbose mode
scripts/mysql_create_system_tables.sh:
Change so that localhost has full access (to make this like 4.0)
scripts/mysql_fix_privilege_tables.sh:
Allow on to run this from the source distribution
sql-common/client.c:
Fixed memory leak
sql/item_sum.cc:
Removed compiler warning
sql/slave.cc:
Cleanup
sql/sql_client.cc:
Portability fix
sql/sql_help.cc:
Fixed memory leak
mysql-test/r/innodb.result:
Fixed test case after innodb optimize->analyze fix
mysys/mf_pack.c:
Added comments
sql/log_event.cc:
Fixed usage of fn_format()
sql/slave.cc:
Indentation fixes and comments cleanup
sql/sql_repl.cc:
Comment cleanup
mysql-test/r/rpl_rotate_logs.result:
result update
mysql-test/t/rpl_rotate_logs.test:
comments and test update with the error code
sql/slave.cc:
A DBUG_PRINT
sql/sql_repl.cc:
Use ER_MASTER_INFO instead of custom message and zero error code (which display
badly).
More messages.
Testcase for bug 651.
client/mysqltest.c:
More explicit error message if MASTER_POS_WAIT() returns NULL.
mysql-test/r/rpl_loaddata.result:
result update
mysql-test/r/rpl_master_pos_wait.result:
result update
mysql-test/t/rpl000001.test:
sync_with_master (=MASTER_POS_WAIT()) was called when we could expect the SQL slave thread had stopped.
As I yesterday changed code so that "SQL thread stops => MASTER_POS_WAIT() returns NULL immediately" (bugfix),
sync_with_master received NULL (on build.mysql.com, not on my machine; this is a question of milliseconds,
if the slave server will process MASTER_POS_WAIT() before or after the slave SQL thread has stopped), and
in mysqltest.c, sync_with_master complained that it could not sync.
So I just remove this sync_with_master, which does not make sense anymore: we just wait for the slave SQL
thread to stop.
mysql-test/t/rpl_loaddata.test:
Discovered we had wait_for_slave_to_stop, so used it as it automates things.
mysql-test/t/rpl_master_pos_wait.test:
Discovered we had 'send' to send a query without waiting for the resultn so could had a testcase for bug 651.
Shorter timeouts as there is no risk the position is reached.
sql/slave.cc:
A longer DBUG_PRINT.
thd->enter_cond() and exit_cond(), so that the I/O thread accepts to stop
when it's waiting for relay log space.
Reset ignore_log_space_limit to 0 when the SQL thread terminates.
mysql-test/r/rpl_relayspace.result:
result update
mysql-test/t/rpl_relayspace-slave.opt:
smaller relay_log_space_limit to speed up things.
mysql-test/t/rpl_relayspace.test:
Less queries in the test, to make it simpler.
Testcase if the IO thread blocked in wait_for_relay_log_space
accepts to stop when STOP SLAVE.
sql/slave.cc:
thd->enter_cond() and exit_cond(), so that the I/O thread accepts to stop
when it's waiting on cond (waiting for relay log space).
Reset ignore_log_space_limit to 0 when the SQL thread terminates.
Could not add a testcase for this: if the test goes into a MASTER_POS_WAIT, it waits
until this terminates (even doing "connection other_con" to launch "stop slave" is blocked).
- In MASTER_POS_WAIT() don't test if the I/O slave is running, but if the SQL thread
is running.
- Some DBUG info for this bugfix.
sql/slave.cc:
Fix for bug 651: now a dying SQL slave threads wakes up any waiting MASTER_POS_WAIT().
In MASTER_POS_WAIT() don't test if the I/O slave is running, but if the SQL thread
is running.
Some DBUG info.
into narttu.mysql.fi:/my/mysql-4.1
client/mysql.cc:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
Fixed wrong value for SQLSTATE_LENGTH
Added CLIENT_REMEMBER_OPTIONS to mysql_real_connect()
Changed mysql_port and mysql_unix_port to mysqld_xxxx
client/mysql.cc:
Removed valgrind & compiler warnings
client/sql_string.h:
Fix to remove valgrind warnings
include/mysql.h:
Added read_timeout and write_timeout to mysql options struct.
This is to be used for slave when connection to master.
code cleanup
include/mysql_com.h:
Fixed wrong value for SQLSTATE_LENGTH
Added CLIENT_REMEMBER_OPTIONS
include/sql_common.h:
Cleanup after split of libmysql.c to client.c and libmysql.c
include/sql_state.h:
Removed default states
libmysql/client_settings.h:
Cleanup after split of libmysql.c to client.c and libmysql.c
libmysql/libmysql.c:
Cleanup after split of libmysql.c to client.c and libmysql.c
mysql-test/r/type_blob.result:
Update results after someone updated error messages without running tests
mysys/charset.c:
More debug information
mysys/errors.c:
Fixed wrong error message
sql-common/client.c:
Cleanup after split of libmysql.c to client.c and libmysql.c
sql/Makefile.am:
Added sql_client.cc
sql/client_settings.h:
Cleanup after split of libmysql.c to client.c and libmysql.c
sql/log.cc:
Changed mysql_port and mysql_unix_port to mysqld_xxxx
sql/mysql_priv.h:
Changed mysql_port and mysql_unix_port to mysqld_xxxx
sql/mysqld.cc:
Changed mysql_port and mysql_unix_port to mysqld_xxxx
sql/protocol.cc:
Fix for SQLSTATE_LENGTH
Moved function to sql_client.c
sql/repl_failsafe.cc:
Cleanup after split of libmysql.c to client.c and libmysql.c
sql/set_var.cc:
Changed mysql_port and mysql_unix_port to mysqld_xxxx
sql/slave.cc:
Cleanup after split of libmysql.c to client.c and libmysql.c
- Comments for future devs.
- Start_log_event::exec_event() : when we hit it, do a rollback.
- We don't need LOG_EVENT_FORCED_ROTATE_F.
- Stop_log_event::exec_event() : when we hit it, we needn't clean anything.
- Removed LOG_EVENT_TIME_F and LOG_EVENT_FORCED_ROTATE_F.
- We don't need Stop events in the relay log.
- Now filtering of server id is done in the I/O thread first.
sql/log.cc:
We don't need LOG_EVENT_FORCED_ROTATE_F
sql/log_event.cc:
- Comments for future devs.
- Start_log_event::exec_event() : when we hit it, do a rollback. If the SQL
thread was inside a transaction (for example, the master died while writing
to the binlog, so did not commit (because we write to the binlog before committing),
so will rollback), it's sensible to rollback. If we're not in a transaction,
rollback will not hurt (it will do nothing).
- We don't need LOG_EVENT_FORCED_ROTATE_F.
- Stop_log_event::exec_event() : when we hit it, we needn't clean anything, because
each threads has already written some cleaning statements (DROP TEMPORARY TABLE,
DO RELEASE_LOCK); we still clean in Start_log_event::exec_event() (if 4.x).
sql/log_event.h:
- Comments for future devs.
- Removed LOG_EVENT_TIME_F and LOG_EVENT_FORCED_ROTATE_F.
sql/slave.cc:
- We don't need Stop events in the relay log (see changeset's description about
log_event.cc). So we can make event queuing (writing to the relay log) simpler.
- Something that was marked TODO: now filtering of server id (if the server id
of this event is the same as mine ignore it) is done in the I/O thread if
the master is 4.x (it still also done in the SQL thread whatever the version of
the master is, for safe upgrades). This saves disk space.
sql/slave.h:
We don't need master_info.ignore_stop_event anymore, as we don't write Stop_event
to the relay log anymore.
support issue with an unclear message which can have N reasons for appearing.
This should help us know at which point it failed, and get the errno when
my_open was involved (as the reason for the unclear message is often a
permission problem).
RESET SLAVE resets last_error and last_errno in SHOW SLAVE STATUS (without this,
rpl_loaddata.test, which is expected to generate an error in last_error, influenced
rpl_log_pos.test).
A small test update.
Added STOP SLAVE to mysql-test-run to get rid of several stupid error messages
which are printed while the master restarts and the slave attempts/manages to
connect to it and sends it nonsense binlog requests.
mysql-test/mysql-test-run.sh:
Before running a test, stop slave threads if they exist (if they don't
the script goes on fine). This also works fine with the manager.
Before this change, when the master was stopped/restarted (which happened before
the slave server was stopped/restarted), the slave threads
noticed the stop (so printed an error message in slave.err), then managed to
reconnect (to the new master, the one that is running for the _next_ test),
and this reconnection had time to produce error messages (because, for example,
the binlog the slave thread was asking had been deleted) before the slave server
was killed. This change reduces by 10% (40 lines) slave.err in replication tests.
mysql-test/r/rpl000018.result:
Result update.
mysql-test/t/rpl000018.test:
This test does "show master logs" so should do "reset master" instead of
relying on the previous tests.
sql/slave.cc:
More error messages.
sql/sql_repl.cc:
More error messages.
RESET SLAVE resets last_error and last_errno in SHOW SLAVE STATUS.
we now make a distinction between if the master is < 3.23.57, 3.23 && >=57, and 4.x
(before the 2 3.23 were one). This is because in 3.23.57 we have a way to distinguish between
a Start_log_event written at server startup and one written at FLUSH LOGS, so we
have a way to know if the slave must drop old temp tables or not.
Change: mi->old_format was bool, now it's enum (to handle 3 cases). However, functions
which had 'bool old_format' as an argument have their prototypes unchanged, because
the old old_format == 0 now corresponds to the enum value BINLOG_FORMAT_CURRENT which
is equal to 0, so boolean tests are left untouched. The only case were we use mi->old_format
as an enum instead of casting it implicitly to a bool, is in Start_log_event::exec_event,
where we want to distinguish between the 3 possible enum values.
sql/log_event.cc:
Fix for bug 254 :
we now make a distinction between if the master is < 3.23.57, 3.23 && >=57, and 4.x
(before the 2 3.23 were one), to know if the slave must drop old temp tables or not.
sql/slave.cc:
Fix for bug 254 : mi->old_format is now enum.
An unrelated comment.
sql/slave.h:
fix for bug 254 : mi->old_format is now enum.
BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
sql/handler.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
configure.in:
Auto merged
include/config-win.h:
Auto merged
include/mysql.h:
Auto merged
include/mysql_version.h.in:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/ctype_collate.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysys/default.c:
Auto merged
sql/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_string.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43:
Auto merged
client/mysqltest.c:
Auto merged
include/config-win.h:
Auto merged
include/my_global.h:
Auto merged
include/mysql_com.h:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/ut/ut0mem.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/errors.result:
Auto merged
mysql-test/r/loaddata.result:
Auto merged
mysql-test/r/rpl_insert_id.result:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/std_data/rpl_loaddata2.dat:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
mysql-test/t/loaddata.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/raid.test:
Auto merged
mysql-test/t/rpl_insert_id.test:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
sql/field.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/time.cc:
Auto merged
configure.in:
No changes
libmysqld/lib_sql.cc:
No changes
Plus a changeset which I had committed but forgot to push (and this changeset is lost on
another computer, so I recreate it here). This changeset is "user-friendly SHOW BINLOG EVENTS
and CHANGE MASTER TO when log positions < 4 are used.
sql/slave.cc:
fix for bug 576 (DBUG_ASSERT failure when using CHANGE MASTER TO RELAY_LOG_POS=4).
sql/sql_repl.cc:
User-friendly SHOW BINLOG EVENTS:
SHOW BINLOG EVENTS FROM 0: currently one gets
MASTER> show binlog events from 0;
ERROR 1220: Error when executing command SHOW BINLOG EVENTS: Invalid log position
so we silently convert <4 to 4.
sql/sql_yacc.yy:
User-friendly CHANGE MASTER TO:
presently when one does CHANGE MASTER TO MASTER_LOG_POS=0 he gets
030425 10:12:41 Slave I/O thread: connected to master 'root@localhost:3306', r
eplication started in log 'gbichot-bin.013' at position 151
030425 10:12:41 Error reading packet from server: Client requested master to st
art replication from impossible position (server_errno=1236)
030425 10:12:41 Got fatal error 1236: 'Client requested master to start replica
tion from impossible position' from master when reading data from binary log
030425 10:12:41 Slave I/O thread exiting, read up to log 'gbichot-bin.013', pos
ition 151
while she/he probably just wanted to start at the beginning of the
binlog, which is 4. So we silently convert <4 to 4 in sql_yacc.yy
(i.e. in the slave code; fortunately all versions have the same
BIN_LOG_HEADER_SIZE=4 and we should not change this). See comments
for an explaination of why we have to do this in sql_yacc.yy,
not in sql_repl.cc.
Same thing for CHANGE MASTER TO RELAY_LOG_POS.
sql/unireg.h:
warning comment
splittiln common client's parts
include/sql_common.h:
superfluous #ifdef-s removed
libmysql/client_settings.h:
superfluous #ifdef-s removed
libmysql/libmysql.c:
some litter removed
libmysqld/lib_sql.cc:
here we had wrong parameters
mysys/default.c:
this is not needed anymore - calling code fixed
sql-common/client.c:
code trimmed and simplified
sql/client_settings.h:
code trimmed
sql/repl_failsafe.cc:
option's initialization added
sql/slave.cc:
option's initialization added
not the master's binlog) (SW 1571).
sql/slave.cc:
Clearer error message (in the customer's case, the relay log was corrupted,
not the master's binlog).
Here is another pack of changes about gathering common client code in
sql-common/client.c.
Now i symlink the client.c from sql/ and libmysql/. These directories
have client_settings.h files to be included to client.c. It contains
defines and declarations to compile client.c in appropriate manner.
Also i've added include/sql_common.h, containing declarations of what
is exported from client.c
I removed as many #ifdef-s from client.c as i dared to. I think it's better
push it with some extra #ifdef-s now (of course, if everythihg besides it is
ok) so other people can check the code.
Makefile.am:
symlinking of sql-common/client.c was added
include/mysql.h:
MYSQL_CLIENT define moved here from libmysql/Makefile
libmysql/Makefile.am:
../libmysql/client_settings.h added to the list of necessary h-files
libmysql/Makefile.shared:
client.lo added to the list of objects
libmysql/libmysql.c:
a lot of changes about separating code between libmysql.c and client.c
mysys/default.c:
changed to keep compiler happy
sql-common/client.c:
a lot of changes about code separating
sql/Makefile.am:
mini_client.h has to be removed
sql/repl_failsafe.cc:
mysql_real_connect prototype was unified, so we've got to set connection timeout separately
sql/slave.cc:
trimming code to the changed function's prototypes
sql/sql_repl.cc:
mini_client isn't needed anymore
libmysqld/Makefile.am:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
libmysql/libmysql.c:
Resolved conflicts
sql/mini_client.cc:
resolved conflicts
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
- A few more mutex locks and unlocks of rli.log_space_lock for doing clean reads of
rli.ignore_log_space_limit
- Broadcast after unlock, not before (small speed optimisation).
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
BitKeeper/deleted/.del-libmysql.def~29fc6d70335f1c4c:
Auto merged
Makefile.am:
Auto merged
acinclude.m4:
Auto merged
BitKeeper/triggers/post-commit:
Auto merged
Build-tools/Do-compile:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/mysql.dsw:
Auto merged
client/mysql.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqldump.c:
Auto merged
include/config-win.h:
Auto merged
include/my_base.h:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/my_sys.h:
Auto merged
include/violite.h:
Auto merged
innobase/buf/buf0flu.c:
Auto merged
innobase/buf/buf0lru.c:
Auto merged
innobase/include/buf0buf.h:
Auto merged
innobase/include/buf0lru.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/log/log0recv.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/trx/trx0sys.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/ut/ut0ut.c:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_key.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/mi_range.c:
Auto merged
myisam/mi_search.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/r/delete.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/innodb_handler.result:
Auto merged
mysql-test/r/join.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/key.result:
Auto merged
mysql-test/r/multi_update.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
mysql-test/t/ctype_latin1_de.test:
Auto merged
mysql-test/t/delete.test:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
mysql-test/t/innodb_handler.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
mysql-test/t/key.test:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/repair.test:
Auto merged
mysql-test/t/select_safe.test:
Auto merged
mysql-test/t/type_decimal.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysys/default.c:
Auto merged
mysys/my_pthread.c:
Auto merged
scripts/mysql_fix_privilege_tables.sh:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/ha_heap.h:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/init.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mini_client.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/records.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/dutch/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
sql/unireg.h:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql-bench/test-transactions.sh:
Auto merged
strings/ctype-tis620.c:
Auto merged
tests/grant.res:
Auto merged
sql/log_event.cc:
Merge with 4.0.13
Cleaned up comment syntax
common parts of libmysql.c and sql/mini_client.cc moved to sql-common/client.c
names of functions now are same in both cases
libmysql/libmysql.c:
many parts moved to sql-common/client.c
libmysqld/Makefile.am:
superfluous files removed
sql/mini_client.cc:
most of the file moved to sql-common/client.c
sql/mini_client.h:
mc_ prefixes were deleted
sql/repl_failsafe.cc:
mc_ prefixes removed
sql/slave.cc:
_mc prefixes removed
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/records.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
include/my_pthread.h:
Consolidated NetWare pthread_exit() changes.
mysys/mf_path.c:
NetWare needs a semicolon path delimiter.
mysys/my_pthread.c:
Consolidated NetWare pthread_exit() changes.
sql/mini_client.cc:
Modified to match my_connect().
sql/mysqld.cc:
Consolidated NetWare pthread_exit() changes.
sql/slave.cc:
Consolidated NetWare pthread_exit() changes.
sql/sql_load.cc:
Stat properites should not be checked here on NetWare.
is executed, even if the transaction spans on >=2 relay logs (bug #53).
New variable relay_log_purge =0|1
New test to verify bug #53
sql/log.cc:
Now we purge a relay log only when we are sure we won't need it,
i.e. we have executed the final query (if autocommit=1) or the COMMIT.
sql/log_event.cc:
Better tracking of the relay log's name and position
lastly executed, even if we are in a transaction which spans on
2 or more relay logs.
sql/mysql_priv.h:
new option relay_log_purge (the user can now decide himself
if he wants his relay logs to be automatically purged or not,
we don't make unsafe guesses like before)
sql/mysqld.cc:
new option --innodb (replaces --skip-innodb).
Useful for the test suite : we have skip-innodb in mysql-test-run,
but we can ('-opt.info' file) choose to start the server with
InnoDB for this test only.
New option --bdb
sql/repl_failsafe.cc:
Better tracking of the relay log's name and position
lastly executed, even if we are in a transaction which spans on
2 or more relay logs.
sql/set_var.cc:
new variable relay_log_purge
sql/slave.cc:
Better tracking of the relay log's name and position
lastly executed, even if we are in a transaction which spans on
2 or more relay logs.
Now we purge a relay log only when we are sure we won't need it,
i.e. we have executed the final query (if autocommit=1) or the COMMIT
sql/slave.h:
Better tracking of the relay log's name and position
lastly executed, even if we are in a transaction which spans on
2 or more relay logs.
sql/sql_class.h:
prototypes change
sql/sql_parse.cc:
removed thd argument (was not used in the function's body)
sql/sql_repl.cc:
Better tracking of the relay log's name and position
lastly executed, even if we are in a transaction which spans on
2 or more relay logs.
Turn relay_log_purge silently off when someone does CHANGE
MASTER TO RELAY_LOG_*
into genie.(none):/home/hf/work/mysql-5.0.kil
include/mysql_com.h:
Auto merged
myisam/mi_check.c:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/lex.h:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_repl.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
sql/sql_yacc.yy:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
two KILL commands implementation (version 2)
include/mysqld_error.h:
Error message about query interruption added
myisam/mi_check.c:
killed_ptr now retutns only value - not pointer
myisam/myisamchk.c:
killed_ptr returns value now
myisam/myisamdef.h:
killed_ptr returns value now
myisam/sort.c:
killed_ptr returns value now
sql/filesort.cc:
THD::killed now has enum type
sql/ha_berkeley.cc:
THD::killed has enum type
sql/ha_myisam.cc:
killed_ptr returns value now
sql/lock.cc:
two different errors possible here now
sql/log_event.cc:
two ways of killing possible here now
sql/mysqld.cc:
THD::killed has enum type now
sql/records.cc:
two errors are possible here now
sql/share/czech/errmsg.txt:
new error message
sql/share/danish/errmsg.txt:
new error message
sql/share/dutch/errmsg.txt:
new error message
sql/share/english/errmsg.txt:
new error message
sql/share/estonian/errmsg.txt:
new error message
sql/share/french/errmsg.txt:
new error message
sql/share/german/errmsg.txt:
new error message
sql/share/greek/errmsg.txt:
new error message
sql/share/hungarian/errmsg.txt:
new error message
sql/share/italian/errmsg.txt:
new error message
sql/share/japanese/errmsg.txt:
new error message
sql/share/korean/errmsg.txt:
new error message
sql/share/norwegian-ny/errmsg.txt:
new error message
sql/share/norwegian/errmsg.txt:
new error message
sql/share/polish/errmsg.txt:
new error message
sql/share/portuguese/errmsg.txt:
new error message
sql/share/romanian/errmsg.txt:
new error message
sql/share/russian/errmsg.txt:
new error message
sql/share/serbian/errmsg.txt:
new error message
sql/share/slovak/errmsg.txt:
new error message
sql/share/spanish/errmsg.txt:
new error message
sql/share/swedish/errmsg.txt:
new error message
sql/share/ukrainian/errmsg.txt:
new error message
sql/slave.cc:
two errors are possible here now
sql/sql_base.cc:
THD::killed has enum type now
sql/sql_cache.cc:
THD::killed has enum type now
sql/sql_class.cc:
THD::awake implementation changed to handle KILL_QUERY
sql/sql_class.h:
class THD changed to handle KILL_QUERY
sql/sql_delete.cc:
two errors are possible here now
sql/sql_insert.cc:
THD::killed has enum type now
sql/sql_load.cc:
two errors are possible here now
sql/sql_parse.cc:
kill_one_thread function changed to handle KILL_QUERY
sql/sql_prepare.cc:
two errors are possible here now
sql/sql_repl.cc:
the parameter to awake is of THD::killed_state type now
sql/sql_repl.h:
awake parameter changed
sql/sql_select.cc:
two errors are possible here now
sql/sql_show.cc:
notification adopted to changes in class THD
sql/sql_table.cc:
two errors are possible here now
sql/sql_update.cc:
two errors are possible here now
into narttu.mysql.fi:/my/mysql-4.1
configure.in:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Docs/internals.texi:
Auto merged
include/my_global.h:
Auto merged
include/mysql_com.h:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysqld/Makefile.am:
Auto merged
libmysqld/lib_vio.c:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/heap.test:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
BitKeeper/deleted/.del-password.c~76f30876e68eddb4:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/key.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
strings/strto.c:
Auto merged
Fixed non fatal memory leak in slave code.
mysql-test/r/func_test.result:
Added test for DIV
mysql-test/t/func_test.test:
Added test for DIV
mysys/my_alloc.c:
More DBUG statements
sql/item_func.cc:
Added support for ULONG division with DIV
sql/log_event.cc:
Fixed memory leak (Wrong call to init_sql_alloc)
sql/slave.cc:
Fixed memory leak (Wrong call to init_sql_alloc)
sql/sql_base.cc:
More DBUG statements
sql/sql_class.cc:
Added init_for_queries() to fix memory leak in slave code
sql/sql_class.h:
Added init_for_queries() to fix memory leak in slave code
sql/sql_error.cc:
More DBUG statements
sql/sql_parse.cc:
Added init_for_queries() to fix memory leak in slave code
sql/unireg.h:
Moved memory defaults to include file
a deadlock between I/O and SQL threads in replication
when relay_log_space is too small. This fixes bug #79.
sql/log.cc:
New variable rli->ignore_log_space_limit to resolve
a deadlock between I/O and SQL threads in replication
when relay_log_space is too small.
sql/slave.cc:
New variable rli->ignore_log_space_limit to resolve
a deadlock between I/O and SQL threads in replication
when relay_log_space is too small.
sql/slave.h:
New variable rli->ignore_log_space_limit to resolve
a deadlock between I/O and SQL threads in replication
when relay_log_space is too small.
sql/sql_repl.cc:
New variable rli->ignore_log_space_limit to resolve
a deadlock between I/O and SQL threads in replication
when relay_log_space is too small.
into narttu.mysql.fi:/my/mysql-4.1
sql/field.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-compile-netware-standard:
Delete: netware/BUILD/compile-netware-standard
BitKeeper/deleted/.del-mwenv:
Delete: netware/BUILD/mwenv
BitKeeper/deleted/.del-nwbootstrap:
Delete: netware/BUILD/nwbootstrap
BitKeeper/deleted/.del-compile-AUTOTOOLS:
Delete: netware/BUILD/compile-AUTOTOOLS
BitKeeper/deleted/.del-compile-linux-tools:
Delete: netware/BUILD/compile-linux-tools
BitKeeper/deleted/.del-compile-netware-END:
Delete: netware/BUILD/compile-netware-END
BitKeeper/deleted/.del-compile-netware-START:
Delete: netware/BUILD/compile-netware-START
BitKeeper/deleted/.del-compile-netware-all:
Delete: netware/BUILD/compile-netware-all
BitKeeper/deleted/.del-compile-netware-debug:
Delete: netware/BUILD/compile-netware-debug
BitKeeper/deleted/.del-mwasmnlm~bc5746809d67feb5:
Auto merged
BitKeeper/deleted/.del-mwenv~35c8b56062f4b6aa:
Auto merged
BitKeeper/deleted/.del-mwccnlm~be63afd25a14c3f:
Auto merged
BitKeeper/deleted/.del-mwldnlm~efb26c57cba3c980:
Auto merged
BitKeeper/deleted/.del-netware.patch~f70a3a965f54d9ee:
Auto merged
Docs/internals.texi:
Auto merged
VC++Files/bdb/bdb.dsp:
Auto merged
VC++Files/bdb/build_win32/Berkeley_DB.dsw:
Auto merged
VC++Files/bdb/build_win32/db_archive.dsp:
Auto merged
VC++Files/bdb/build_win32/db_buildall.dsp:
Auto merged
VC++Files/bdb/build_win32/db_checkpoint.dsp:
Auto merged
VC++Files/bdb/build_win32/db_deadlock.dsp:
Auto merged
VC++Files/bdb/build_win32/db_dll.dsp:
Auto merged
VC++Files/bdb/build_win32/db_dump.dsp:
Auto merged
VC++Files/bdb/build_win32/db_java.dsp:
Auto merged
VC++Files/bdb/build_win32/db_load.dsp:
Auto merged
VC++Files/bdb/build_win32/db_printlog.dsp:
Auto merged
VC++Files/bdb/build_win32/db_recover.dsp:
Auto merged
VC++Files/bdb/build_win32/db_stat.dsp:
Auto merged
VC++Files/bdb/build_win32/db_static.dsp:
Auto merged
VC++Files/bdb/build_win32/db_static1.dsp:
Auto merged
VC++Files/bdb/build_win32/db_tcl.dsp:
Auto merged
VC++Files/bdb/build_win32/db_test.dsp:
Auto merged
VC++Files/bdb/build_win32/db_upgrade.dsp:
Auto merged
VC++Files/bdb/build_win32/db_verify.dsp:
Auto merged
VC++Files/bdb/build_win32/ex_access.dsp:
Auto merged
VC++Files/bdb/build_win32/ex_btrec.dsp:
Auto merged
VC++Files/bdb/build_win32/ex_env.dsp:
Auto merged
VC++Files/bdb/build_win32/ex_lock.dsp:
Auto merged
VC++Files/bdb/build_win32/ex_mpool.dsp:
Auto merged
VC++Files/bdb/build_win32/ex_tpcb.dsp:
Auto merged
VC++Files/bdb/build_win32/excxx_access.dsp:
Auto merged
VC++Files/bdb/build_win32/excxx_btrec.dsp:
Auto merged
VC++Files/bdb/build_win32/excxx_env.dsp:
Auto merged
VC++Files/bdb/build_win32/excxx_lock.dsp:
Auto merged
VC++Files/bdb/build_win32/excxx_mpool.dsp:
Auto merged
VC++Files/bdb/build_win32/excxx_tpcb.dsp:
Auto merged
VC++Files/client/mysql.dsp:
Auto merged
VC++Files/client/mysqladmin.dsp:
Auto merged
VC++Files/client/mysqlcheck.dsp:
Auto merged
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/client/mysqlclient.dsw:
Auto merged
VC++Files/client/mysqldump.dsp:
Auto merged
VC++Files/client/mysqlimport.dsp:
Auto merged
VC++Files/client/mysqlshow.dsp:
Auto merged
VC++Files/comp_err/comp_err.dsp:
Auto merged
VC++Files/contrib/asm386/zlibvc.dsp:
Auto merged
VC++Files/contrib/asm386/zlibvc.dsw:
Auto merged
VC++Files/contrib/minizip/zlibvc.dsp:
Auto merged
VC++Files/contrib/minizip/zlibvc.dsw:
Auto merged
VC++Files/dbug/dbug.dsp:
Auto merged
VC++Files/dbug/dbug.dsw:
Auto merged
VC++Files/heap/heap.dsp:
Auto merged
VC++Files/innobase/innobase.dsp:
Auto merged
VC++Files/isam/isam.dsp:
Auto merged
VC++Files/isam/isam.dsw:
Auto merged
VC++Files/isamchk/isamchk.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsw:
Auto merged
VC++Files/libmysqld/examples/test_libmysqld.dsp:
Auto merged
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
VC++Files/libmysqltest/myTest.dsp:
Auto merged
VC++Files/libmysqltest/mytest.dsw:
Auto merged
VC++Files/merge/merge.dsp:
Auto merged
VC++Files/merge/merge.dsw:
Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
Auto merged
VC++Files/myisam/myisam.dsp:
Auto merged
VC++Files/myisamchk/myisamchk.dsp:
Auto merged
VC++Files/myisamlog/myisamlog.dsp:
Auto merged
VC++Files/myisammrg/myisammrg.dsp:
Auto merged
VC++Files/mysql.dsp:
Auto merged
VC++Files/mysql.dsw:
Auto merged
VC++Files/myisampack/myisampack.dsp:
Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
Auto merged
VC++Files/mysqldemb/mysqldemb.dsp:
Auto merged
VC++Files/mysqlmanager/MySqlManager.dsp:
Auto merged
VC++Files/mysqlmanager/mysqlmanager.dsw:
Auto merged
VC++Files/mysqlserver/mysqlserver.dsp:
Auto merged
VC++Files/mysqlshutdown/myshutdown.dsp:
Auto merged
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
Auto merged
VC++Files/mysqlwatch/mysqlwatch.dsp:
Auto merged
VC++Files/mysys/mysys.dsp:
Auto merged
VC++Files/mysys/mysys.dsw:
Auto merged
VC++Files/pack_isam/pack_isam.dsp:
Auto merged
VC++Files/perror/perror.dsp:
Auto merged
VC++Files/regex/regex.dsp:
Auto merged
VC++Files/regex/regex.dsw:
Auto merged
VC++Files/replace/replace.dsp:
Auto merged
VC++Files/sql/mysqld.dsw:
Auto merged
VC++Files/sql/mysqldmax.dsp:
Auto merged
VC++Files/sql/old/mysqld.dsw:
Auto merged
VC++Files/strings/MASM6x/strings.dsp:
Auto merged
VC++Files/strings/MASM6x/strings.dsw:
Auto merged
VC++Files/strings/backup/strings.dsp:
Auto merged
VC++Files/strings/backup/strings.dsw:
Auto merged
VC++Files/strings/noMASM/strings.dsp:
Auto merged
VC++Files/strings/noMASM/strings.dsw:
Auto merged
VC++Files/strings/strings.dsw:
Auto merged
VC++Files/test1/test1.dsp:
Auto merged
VC++Files/thr_insert_test/thr_insert_test.dsp:
Auto merged
VC++Files/thr_test/thr_test.dsp:
Auto merged
VC++Files/vio/vio.dsp:
Auto merged
VC++Files/zlib/zlib.dsp:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqlshow.c:
Auto merged
include/my_global.h:
Auto merged
include/my_sys.h:
Auto merged
include/myisam.h:
Auto merged
include/thr_lock.h:
Auto merged
include/violite.h:
Auto merged
innobase/buf/buf0buf.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/trx/trx0sys.c:
Auto merged
libmysqld/lib_vio.c:
Auto merged
myisam/mi_create.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/join.result:
Auto merged
mysql-test/r/rpl000001.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/auto_increment.test:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/func_like.test:
Auto merged
mysql-test/t/group_by.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
mysql-test/t/type_timestamp.test:
Auto merged
mysys/default.c:
Auto merged
mysys/thr_lock.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mf_iocache.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_serv.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/repl_failsafe.h:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_rename.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_repl.h:
Auto merged
sql/sql_update.cc:
Auto merged
sql/stacktrace.c:
Auto merged
sql/table.cc:
Auto merged
sql/unireg.h:
Auto merged
strings/ctype-tis620.c:
Auto merged
strings/t_ctype.h:
Auto merged
support-files/mysql.spec.sh:
Auto merged
tests/grant.res:
Auto merged
vio/viosocket.c:
Auto merged
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-delete.result:
Auto merged
client/mysqlbinlog.cc:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/delete.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/delete.test:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
sql/field.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_repl.h:
Auto merged
sql/sql_select.cc:
Auto merged
now we'll have something like this :
030308 18:46:58 Slave I/O thread: connected to master 'gb@localhost:3306', replication started in log 'FIRST' at position 4
030308 18:46:58 While trying to obtain the list of slaves from the master 'localhost:3306', user 'gb' got the following error: 'Access denied. You need the REPLICATION SLAVE privilege for this operation'
030308 18:46:58 Slave I/O thread exiting, read up to log 'FIRST', position 4
instead of "Error updating slave list: Query error".
This fixes bug #80.
sql/repl_failsafe.cc:
Clearer error message when one forgot to grant REPLICATION SLAVE
sql/repl_failsafe.h:
Clearer error message when one forgot to grant REPLICATION SLAVE
sql/slave.cc:
Updated for new syntax of update_slave_list
+ fix for #70
+ test result fix for LOAD DATA LOCAL bug #82
client/mysqltest.c:
Removed wrong comment and useless sleep
mysql-test/mysql-test-run.sh:
Fix $slave_datadir variable because this
if [ -n "$1" ] ;
slave_datadir="var/$slave_ident-data/"
else
slave_datadir=$SLAVE_MYDDIR
was not coherent and led to problems of master.info not being deleted.
Delete relay-log.info too.
mysql-test/r/rpl000001.result:
SUM is 1022 (1021 was when we had the LOAD DATA LOCAL bug #82).
It's logical to have an even number as we load the same file twice.
sql/slave.cc:
When we RESET SLAVE, clear rli->master_log_* to give a good display in SHOW SLAVE STATUS ;
seeing the old values may confuse the user.
When we START SLAVE, clear rli->master_log_name, not only rli->master_log_pos.
sql/sql_repl.cc:
When we RESET SLAVE, clear mi->master_log_* to give a good display in SHOW SLAVE STATUS (bug #70)
so that it has fetched the most from the master's binlog before the master
accidently dies. SCRUM task #756.
sql/slave.cc:
Replication: give the slave I/O thread a higher priority than the slave SQL thread
so that it has fetched the most from the master's binlog before the master
accidently dies.
sql/slave.h:
Replication: give the slave I/O thread a higher priority than the slave SQL thread
so that it has fetched the most from the master's binlog before the master
accidently dies.
configure.in:
Auto merged
include/config-win.h:
Auto merged
include/thr_lock.h:
Auto merged
mysql-test/Makefile.am:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/log_event.cc:
merge
sql/mysqld.cc:
merge
Fixed bug in RAND() usage in mysqlbinlog
configure.in:
Added detection if pthread_attr_getstacksize() exists
include/thr_lock.h:
Fixed wrong comment
sql/log_event.cc:
Fixed bug in RAND() usage in mysqlbinlog
sql/mysqld.cc:
Portablity fix
sql/repl_failsafe.cc:
Set host_or_ip for system threads (to make other code simpler)
sql/slave.cc:
Set host_or_ip for system threads (to make other code simpler)
sql/sql_class.cc:
Set host_or_ip for system threads (to make other code simpler)
sql/sql_insert.cc:
Set host_or_ip for system threads (to make other code simpler)
sql/sql_show.cc:
Set host_or_ip for system threads (to make other code simpler)
Added ALL as parameter option for all group functions.
Make join handling uniform. This allows us to use ',', JOIN and INNER JOIN the same way.
Sort NULL last if DESC is used (ANSI SQL 99 requirement)
include/my_global.h:
Moved LL from mysql_priv (as this is also in config-win.h)
mysql-test/r/distinct.result:
Updated results
mysql-test/r/func_group.result:
Updated results
mysql-test/r/innodb.result:
Updated results
mysql-test/r/join.result:
Updated results
mysql-test/r/order_by.result:
Updated results
mysql-test/t/func_group.test:
Added test for SUM(ALL ...)
mysql-test/t/innodb.test:
Added test for START TRANSACTION
mysql-test/t/join.test:
Test different join syntaxes
mysql-test/t/order_by.test:
Added new test of NULL ordering.
sql/filesort.cc:
Sort NULL last if DESC is used
sql/lex.h:
Added OLD_PASSWORD() as synonym for PASSWORD.
sql/mysql_priv.h:
Removed LL()
sql/opt_range.cc:
Sort NULL last if DESC is used
sql/opt_range.h:
Sort NULL last if DESC is used
sql/slave.cc:
Indentation changes
sql/sql_parse.cc:
After merge fix
sql/sql_select.cc:
Added comment
sql/sql_yacc.yy:
Added START TRANSACTION syntax
Added ALL as parameter option for all group functions.
Make join handling uniform.
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
Makefile.am:
Auto merged
bdb/os/os_handle.c:
Auto merged
client/mysqladmin.c:
Auto merged
client/mysqlcheck.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
extra/resolveip.c:
Auto merged
include/Makefile.am:
Auto merged
include/config-win.h:
Auto merged
include/my_base.h:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/my_sys.h:
Auto merged
include/mysql.h:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql/Makefile.shared:
Auto merged
libmysql/manager.c:
Auto merged
libmysqld/libmysqld.c:
Auto merged
myisam/ft_static.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/mi_test3.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/func_math.result:
Auto merged
mysql-test/r/handler.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/backup.test:
Auto merged
mysql-test/t/bigint.test:
Auto merged
mysql-test/t/binary.test:
Auto merged
mysql-test/t/count_distinct.test:
Auto merged
mysql-test/t/func_crypt.test:
Auto merged
mysql-test/t/func_group.test:
Auto merged
mysql-test/t/grant_cache.test:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/rpl000015.test:
Auto merged
mysql-test/t/rpl000017.test:
Auto merged
mysys/default.c:
Auto merged
mysys/my_getwd.c:
Auto merged
mysys/my_init.c:
Auto merged
sql/Makefile.am:
Auto merged
sql/des_key_file.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/hostname.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_create.h:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/lex.h:
Auto merged
sql/net_serv.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql-bench/server-cfg.sh:
Auto merged
sql-bench/test-insert.sh:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/table.cc:
Auto merged
Docs/manual.texi:
Use remote version
client/mysql.cc:
Merge
configure.in:
Merge
libmysql/libmysql.c:
Merge
libmysqld/lib_sql.cc:
Merge
myisam/ft_stopwords.c:
Merge
myisam/myisamchk.c:
Merge
mysql-test/r/bigint.result:
Merge
mysql-test/r/group_by.result:
Merge
mysql-test/r/rpl000009.result:
Merge
mysql-test/t/group_by.test:
Merge
mysql-test/t/rpl000009.test:
Merge
mysql-test/t/rpl_rotate_logs.test:
Merge
mysys/Makefile.am:
Merge
mysys/charset.c:
Merge
sql/item.h:
Merge
sql/item_cmpfunc.cc:
Merge
sql/item_cmpfunc.h:
Merge
sql/item_create.cc:
Merge
sql/item_func.cc:
Merge
sql/item_strfunc.h:
Merge
sql/log.cc:
Merge
sql/mysql_priv.h:
Merge
sql/mysqld.cc:
Merge
sql/protocol.cc:
Merge
sql/slave.cc:
Merge
sql/sql_class.h:
Merge
sql/sql_db.cc:
Merge
sql/sql_handler.cc:
Merge
sql/sql_parse.cc:
Merge
sql/sql_select.cc:
Merge
sql/sql_yacc.yy:
Merge
Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL
BitKeeper/deleted/.del-ChangeLog~dfc92e15bee6fc75:
Delete: sql/ChangeLog
BUILD/compile-pentium-valgrind-max:
Don't use valgrind with safemalloc as this can hide some bugs
Makefile.am:
Added platform dirs
bdb/os/os_handle.c:
Portability fix
client/mysql.cc:
Fixes for Netware.
Fixed duplicate output when using 'tee'
Simple optimisations
client/mysqldump.c:
Portability fix
client/mysqltest.c:
Portability fix
configure.in:
Fixes for Netware
extra/resolveip.c:
Fixes for Netware
include/Makefile.am:
Fixes for Netware
include/config-win.h:
Portability fix
include/my_global.h:
Fixes for Netware
include/my_net.h:
Fixes for Netware
include/my_pthread.h:
Fixes for Netware
Added detection of mutexes that was not destroyed
include/my_sys.h:
Fixes for Netware
Added 'extern' before external functions
include/mysql.h:
Fixes for Netware
innobase/configure.in:
Fixes for Netware
innobase/include/os0thread.h:
Fixes for Netware
innobase/os/os0sync.c:
Fixes for Netware
innobase/os/os0thread.c:
Fixes for Netware
innobase/srv/srv0srv.c:
Fixes for Netware
innobase/srv/srv0start.c:
Fixes for Netware
innobase/sync/sync0sync.c:
Fixes for Netware
isam/test3.c:
Disable test on Netware
libmysql/Makefile.shared:
Added my_sleep
libmysql/get_password.c:
Fixes for Netware
libmysql/libmysql.c:
Fixes for Netware
Made mysql_once_init() global
libmysql/manager.c:
Fixes for Netware
myisam/mi_test3.c:
Disable test for netware
mysql-test/mysql-test-run.sh:
Give warning if output file contains errors
mysql-test/r/count_distinct.result:
More tests
mysql-test/r/group_by.result:
Test of ORDER BY NULL
mysql-test/t/backup.test:
Fixes for Netware
mysql-test/t/count_distinct.test:
More tests
mysql-test/t/func_crypt.test:
Fixes for Netware
mysql-test/t/grant_cache.test:
Fixes for Netware
mysql-test/t/group_by.test:
Tests of ORDER BY NULL
mysql-test/t/rpl000015.test:
Fixes for Netware
mysql-test/t/rpl000017.test:
Fixes for Netware
mysql-test/t/rpl_rotate_logs.test:
Fixes for Netware
mysys/Makefile.am:
Added my_sleep.c and my_netware.c
mysys/charset.c:
Fixes for Netware
mysys/default.c:
Fixes for Netware
mysys/mf_tempfile.c:
Fixes for Netware
mysys/my_clock.c:
Fixes for Netware
mysys/my_copy.c:
Fixes for Netware
mysys/my_getwd.c:
Changed function comment from // -> /* */
mysys/my_init.c:
Fixes for Netware
mysys/my_lock.c:
Fixes for Netware
mysys/my_messnc.c:
Fixes for Netware
mysys/my_os2cond.c:
Removed comment
mysys/my_os2dirsrch.c:
Changed function comment from // -> /* */
Fixed indentation
mysys/my_os2dirsrch.h:
Changed function comment from // -> /* */
Fixed indentation
mysys/my_os2file64.c:
Changed function comment from // -> /* */
Fixed indentation
mysys/my_os2mutex.c:
Changed function comment from // -> /* */
Fixed indentation
mysys/my_os2thread.c:
Changed function comment from // -> /* */
Fixed indentation
mysys/my_os2tls.c:
Changed function comment from // -> /* */
Fixed indentation
mysys/my_pthread.c:
Fixes for Netware
mysys/my_redel.c:
Fixes for Netware
mysys/my_tempnam.c:
Fixes for Netware
mysys/my_thr_init.c:
Remove created mutexes when program ends.
mysys/mysys_priv.h:
Cleanup
mysys/safemalloc.c:
Prefix error messages with "Error:"
mysys/thr_alarm.c:
Destroy internal mutex on end_thr_alarm.
mysys/thr_mutex.c:
Added detection of mutex on which one didn't call pthread_mutex_destroy()
scripts/make_binary_distribution.sh:
Fixes for Netware
sql/des_key_file.cc:
Free mutex at end
sql/ha_innodb.cc:
Free mutex at end
sql/ha_myisam.cc:
Changed warnings from REPAIR Note:
(For mysql-test-run)
sql/hostname.cc:
Fixes for Netware
sql/item.h:
Fixed bug in create_tmp_field() which causes a memory overrun
sql/item_func.cc:
Free used mutexes
sql/item_sum.cc:
Fixed bug in create_tmp_field() which causes a memory overrun
sql/log.cc:
Free used mutexes
sql/my_lock.c:
Fixes for Netware
sql/mysql_priv.h:
Fixes for Netware
sql/mysqld.cc:
Fixes for Netware
Added Have_crypt
Properly free mutexes from MYSQL_LOG by calling cleanup
Free mutex before exit
sql/repl_failsafe.cc:
Fixes for Netware
sql/set_var.cc:
Added have_crypt
sql/share/english/errmsg.txt:
Added version socket and port to stderr log
sql/slave.cc:
Remove global MASTER_INFO variable and use instead an allocated variable.
This allows us to correctly free used mutex.
sql/slave.h:
Move constructors and destuctors to slave.cc
(To make it easier to clear all needed variables)
sql/sql_base.cc:
Safety fix
sql/sql_class.h:
Portability fixes.
Added 'cleanup' to log handling to be able to free mutexes.
sql/sql_insert.cc:
Fixes for Netware
mysys/my_sleep.c:
E
sql/sql_parse.cc:
Fixes for Netware
sql/sql_select.cc:
Added optimisation for ORDER BY NULL
sql/sql_select.h:
Fixed bug in create_tmp_field() which causes a memory overrun
sql/sql_table.cc:
Fixed bug in create_tmp_field() which causes a memory overrun
sql/sql_udf.cc:
Free mutex on end
vio/test-ssl.c:
Simple code cleanup
vio/test-sslclient.c:
Simple code cleanup
vio/test-sslserver.c:
Simple code cleanup
vio/viotest-ssl.c:
Simple code cleanup
Fixed comparision of log-binary name to handle comparison when file name extension wraps from .999 to .1000
Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
mysql-test/r/rpl000009.result:
Fixed replication test after fixing replication of DROP/CREATE DATABASE
mysql-test/t/rpl000009.test:
Fixed replication test after fixing replication of DROP/CREATE DATABASE
sql/item_create.cc:
Added timeout for wait_for_master_pos
sql/item_create.h:
Added timeout for wait_for_master_pos
sql/item_func.cc:
Added timeout for wait_for_master_pos
sql/item_func.h:
Added timeout for wait_for_master_pos
sql/lex.h:
Added timeout for wait_for_master_pos
sql/slave.h:
Added timeout for wait_for_master_pos
Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
sql/sql_parse.cc:
Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
sql/sql_repl.cc:
Fixed comparision of log-binary name to handle comparison when file name extension wraps from .999 to .1000
client/mysql.cc:
Auto merged
include/mysql.h:
Auto merged
include/violite.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
sql/field.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mf_iocache.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/protocol.cc:
SCCS merged
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
libmysqld/libmysqld.c:
conflicts resolving
myisam/mi_create.c:
Auto merged
sql/log.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/log_event.cc:
merge with 4.0
sql/sql_db.cc:
merge with 4.0 (use local)
myisam/mi_create.c:
Auto merged
sql/log.cc:
Auto merged
innobase/btr/btr0sea.c:
Merge with 3.23 (use local file)
sql/slave.cc:
merge with 3.23
sql/sql_db.cc:
Merge with 3.23
sql/sql_parse.cc:
Merge with 3.23
This fixes a possible core dump problem in SHOW PROCESSLIST
sql/slave.cc:
Only set thd->query to 0 if LOCK_thread_count is hold
sql/sql_db.cc:
Only set thd->query to 0 if LOCK_thread_count is hold
Also first set query_length, then query
sql/sql_parse.cc:
Indentation changes
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysqld/libmysqld.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mini_client.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_serv.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_error.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/log_event.cc:
Conflicts resolving
sql/log_event.h:
conflicts
sql/mysqld.cc:
conflicts
sql/opt_range.cc:
conflicts
sql/protocol.cc:
conflicts
sql/sql_show.cc:
conflicts
To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys
client/mysqladmin.c:
Auto merged
client/mysqltest.c:
Auto merged
extra/Makefile.am:
Auto merged
include/my_base.h:
Auto merged
innobase/log/log0log.c:
Auto merged
myisam/ft_nlq_search.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/myisam.result:
Auto merged
sql/lex.h:
Auto merged
sql/log_event.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql-bench/test-insert.sh:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.h:
Auto merged
configure.in:
merge with 4.0.9
innobase/btr/btr0pcur.c:
merge with 4.0.9
myisam/mi_check.c:
merge with 4.0.9
myisam/mi_search.c:
merge with 4.0.9
mysql-test/t/myisam.test:
merge with 4.0.9
sql/log_event.cc:
merge with 4.0.9
sql/mysql_priv.h:
merge with 4.0.9
sql/sql_lex.h:
merge with 4.0.9
sql/sql_parse.cc:
merge with 4.0.9
sql/sql_yacc.yy:
merge with 4.0.9
Fix for SHOW VARIABLES in embedded server
Docs/internals.texi:
Added documentation for join_buffer_size
configure.in:
Changed version number
sql/log_event.cc:
Fix for bug in LOAD DATA INFILE
sql/log_event.h:
Fix for bug in LOAD DATA INFILE
sql/slave.cc:
Fix for bug in LOAD DATA INFILE
sql/sql_show.cc:
Fix for SHOW VARIABLES in embedded server
Fixed test suite for HPUX 10.20 and MacOSX
Build-tools/Do-compile:
Added timeout to mysqladmin shutdown commands
Kill old running mysqld started by earlier runs
Removed run time warning from LD_LIBRARY_PATH
client/mysqladmin.c:
Return 1 if pid file isn't deleted on shutdown.
Fix error message if pid file is not deleted
client/mysqltest.c:
Always allow --debug flag
(Makes it easier to run mysql-test-run)
mysql-test/mysql-test-run.sh:
A lot of safety fixes.
This fixes some problems with test suite for HPUX 10.20 and MacOSX
sql-bench/bench-init.pl.sh:
Allow tests to change time limit.
sql-bench/crash-me.sh:
Indentation cleanups
Added DROP for a created table
sql-bench/test-alter-table.sh:
Added default time limit
Changed test to be estimated to get down run time.
Fixed that add_multi_col is detected
sql-bench/test-insert.sh:
Comment cleanup
sql/mysql_priv.h:
Removed not needed prototype.
sql/mysqld.cc:
Removed DBUG warnings
Removed default argument for clean_up() and made it static.
More comments.
Ignore SIGHUP during shutdown
sql/net_pkg.cc:
More comments
sql/slave.cc:
Added DBUG_PRINT messages
BitKeeper/etc/logging_ok:
auto-union
VC++Files/sql/mysqld.dsp:
Auto merged
acinclude.m4:
Auto merged
include/my_base.h:
Auto merged
include/myisam.h:
Auto merged
include/myisammrg.h:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_write.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/case.result:
Auto merged
mysql-test/r/distinct.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/key_diff.result:
Auto merged
mysql-test/r/multi_update.result:
Auto merged
mysql-test/r/order_by.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
mysql-test/t/rpl_log_pos.test:
Auto merged
mysys/Makefile.am:
Auto merged
scripts/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_myisammrg.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_create.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql-bench/server-cfg.sh:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/structs.h:
Auto merged
This fixed some optimization problems when using -DBIG_TABLES
Portabilty fixes for OpenUnix and HPUX
Added C and C++ version numbers to mysqlbug
Docs/mysqld_error.txt:
Added new error message
acinclude.m4:
Fix for configure problem on OpenUnix
configure.in:
Fix for OpenUnix
Added C and C++ versions to mysqlbug
mysql-test/r/variables.result:
Update of max_join_size handling
mysql-test/t/variables.test:
Update of max_join_size handling
mysys/Makefile.am:
Removed duplicate row
mysys/my_alloc.c:
Safety fixes (not fatal)
scripts/Makefile.am:
Added C and C++ compiler versions to mysqlbug
scripts/mysqlbug.sh:
Added C and C++ compiler versions to mysqlbug
sql/item_func.cc:
Fixed that user variables that changes are not threated as constants.
sql/item_func.h:
Fixed that user variables that changes are not threated as constants.
sql/mysqld.cc:
Changed thd variables max_join_size and select_limit to type ha_rows
sql/repl_failsafe.cc:
Removed not needed cast
sql/set_var.cc:
Changed thd variables max_join_size and select_limit to type ha_rows
sql/set_var.h:
Changed thd variables max_join_size and select_limit to type ha_rows
sql/slave.cc:
Removed not needed cast
sql/sql_class.h:
Changed thd variables max_join_size and select_limit to type ha_rows
sql/sql_parse.cc:
Removed not needed cast
Fixed security problem with mysql_drop_db()
sql/sql_show.cc:
Changed thd variables max_join_size and select_limit to type ha_rows
sql/structs.h:
Changed thd variables max_join_size and select_limit to type ha_rows
BitKeeper/etc/logging_ok:
auto-union
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
client/mysql.cc:
#ifdef EMBEDDED_LIBRARY added
client/mysqltest.c:
#ifdef EMBEDDED_LIBRARY added
include/mysql.h:
MYSQL structure changed for embedded case
include/mysql_com.h:
NET structure changed for embedded case
include/violite.h:
no need to special vio types
libmysqld/embedded_priv.h:
superfluous functions removed
libmysqld/lib_sql.cc:
several modifications
libmysqld/lib_vio.c:
file should be removed
libmysqld/libmysqld.c:
several modifications
sql/ha_berkeley.cc:
modification for embedded case
sql/ha_innodb.cc:
modifications for embedded case
sql/ha_myisam.cc:
modifications for embedded case
sql/item_func.cc:
modifications for embedded case
sql/log.cc:
#ifdef-ed parts of file which don't work in embedded case
sql/log_event.cc:
#ifdef-ed parts of file which don't work in embedded case
sql/log_event.h:
#ifdef-ed parts of file which don't work in embedded case
sql/mf_iocache.cc:
file doesn't work in embedded case
sql/mini_client.cc:
file should be removed from embedded library
sql/mysqld.cc:
several modifications
sql/net_pkg.cc:
#ifdef-ed functions which can't work in embedded case
sql/net_serv.cc:
file doesn't work in embedded case
sql/repl_failsafe.cc:
no replication in embedded case
sql/repl_failsafe.h:
no replication in embedded case
sql/set_var.cc:
#ifdef-ed variables which have no sense in embedded library
sql/set_var.h:
#ifdef-ed variables which have no sense in embedded library
sql/slave.cc:
no replication in embedded library
sql/slave.h:
no replication in embedded library
sql/sql_acl.cc:
modifications for embedded case
sql/sql_cache.cc:
modifications for embedded case
sql/sql_class.cc:
modifications for embedded case
sql/sql_class.h:
THD structure modified for embedded case
sql/sql_db.cc:
modification for embedded case
sql/sql_error.cc:
modification for embedded case
sql/sql_help.cc:
modification for embedded case
sql/sql_load.cc:
#ifdef-ed code which doesn't work in embedded case
sql/sql_parse.cc:
#ifdef-ed code which doesn't work in embedded case
sql/sql_prepare.cc:
#ifdef-ed code which doesn't work in embedded case
sql/sql_repl.cc:
no replication in embedded library
sql/sql_repl.h:
no replication in embedded library
sql/sql_select.cc:
query cache don't work now in embedded library
sql/sql_show.cc:
modifications for embedded case
Added syntax support for
CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;
Docs/internals.texi:
Update binary protocol description
innobase/include/db0err.h:
Merge from 3.23
mysql-test/r/insert.result:
Updated test result from 3.23
sql/log.cc:
Fixed bug in replication and log rotation
sql/log_event.cc:
Ensure that BEGIN / COMMIT is handled properly if slave dies
sql/slave.cc:
Fixed bug in replication and log rotation
sql/slave.h:
Ensure that BEGIN / COMMIT is handled properly if slave dies
sql/sql_analyse.cc:
Moved usage of res before res is destroyed (by bzero(&s...))
sql/sql_yacc.yy:
Added syntax support for
CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;
To be able to read MySQL 4.1 dump files.
Class for sending data from server to client (Protocol)
This handles both the old ( <= 4.0 ) protocol and then new binary protocol that is used for prepared statements.
libmysql/libmysql.c:
Jump over reserved bits in the binary protocol
libmysqld/Makefile.am:
rename of net_pkg.cc to protocol.cc
mysql-test/r/case.result:
Fixed previously wrong test
mysql-test/r/cast.result:
Fixed previously wrong test
sql/Makefile.am:
Rename of net_pkg.cc to protocol.cc
sql/field.cc:
Binary protocol
Added key handling functions for new VARCHAR type
sql/field.h:
New protocol
sql/ha_berkeley.cc:
New protocol
sql/ha_berkeley.h:
New protocol
sql/ha_innodb.cc:
New protocol
sql/ha_myisam.cc:
New protocol
sql/item.cc:
New protocol
sql/item.h:
New protocol
sql/item_func.cc:
Removed old code from 3.23
sql/item_func.h:
Set cached_result_type as it was previosly used before set
sql/item_subselect.cc:
Standard make_field() is now good enough
sql/item_subselect.h:
Use default make_field()
sql/item_sum.cc:
Clean up Item_sum::make_field()
sql/item_sum.h:
Use standard make_field()
sql/item_timefunc.h:
return correct types for casts()
Use standard make_field()
sql/log_event.cc:
New protocol
sql/log_event.h:
New protocol
sql/mysql_priv.h:
Move things to protocol.h
sql/opt_range.cc:
Indentation cleanups + small optimization
sql/procedure.h:
Use MYSQL_TYPE instead of FIELD_TYPE
sql/protocol.cc:
Class for sending data from server to client.
This handles both the old ( <= 4.0 ) protocol and then new binary protocol that is used for prepared statements.
sql/repl_failsafe.cc:
New protocol
sql/slave.cc:
New protocol
sql/sql_acl.cc:
New protocol
sql/sql_base.cc:
Move send_fields() to protocol.cc
sql/sql_class.cc:
New protocol
sql/sql_class.h:
New protocol
sql/sql_db.cc:
New protocol
sql/sql_error.cc:
New protocol
sql/sql_handler.cc:
New protocol
sql/sql_help.cc:
New protocol
sql/sql_parse.cc:
Remove wrong assert (variable was not initalized at this point)
sql/sql_prepare.cc:
New protocol
sql/sql_repl.cc:
New protocol
sql/sql_select.cc:
New protocol
sql/sql_show.cc:
New protocol
sql/sql_string.h:
New functions used by the protocol functions
sql/sql_table.cc:
New protocol
sql/structs.h:
Make second_part ulong to prepare for ANSI sub-seconds
sql/time.cc:
New convert function needed by the new protocol functions
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-.my_sys.h.swp~f6a4a7f8dae03f18:
Auto merged
BitKeeper/etc/config:
Auto merged
acconfig.h:
Auto merged
acinclude.m4:
Auto merged
Docs/manual.texi:
Auto merged
client/mysqlcheck.c:
Auto merged
client/mysqlshow.c:
Auto merged
include/myisam.h:
Auto merged
include/violite.h:
Auto merged
isam/pack_isam.c:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
myisam/Makefile.am:
Auto merged
myisam/ft_nlq_search.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/mi_write.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/func_test.result:
Auto merged
mysql-test/r/isam.result:
Auto merged
mysql-test/r/rpl_replicate_do.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/func_test.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysys/hash.c:
Auto merged
mysys/tree.c:
Auto merged
scripts/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/filesort.cc:
Auto merged
sql/gen_lex_hash.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/hash_filo.h:
Auto merged
sql/hostname.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/lex.h:
Auto merged
sql/lock.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mini_client.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_rename.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/dutch/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/table.h:
Auto merged
sql/unireg.cc:
Auto merged
sql-bench/server-cfg.sh:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
sql/ha_myisam.cc:
Merge with 4.0
Removed some commented code
sql/sql_db.cc:
Merge with 4.0
Optimized the logging of the drop db call a bit
sql/sql_update.cc:
Added comment
configure.in:
Auto merged
sql/field.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
New variables @@rand_seed1 and @@rand_seed2 (used by replication)
DROP TEMPORARY TABLE
mysql-test/r/rpl_log.result:
Update of results after last replication change
mysql-test/r/variables.result:
Test of new variables @@rand_seed1 and @@rand_seed2
mysql-test/t/variables.test:
Test of new variables @@rand_seed1 and @@rand_seed2
sql/field.cc:
Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
sql/field.h:
Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
sql/item_func.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/log.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
More debug information
sql/log_event.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/log_event.h:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/set_var.cc:
Add system variables @@rand_seed1 and @@rand_seed2
sql/set_var.h:
Add system variables @@rand_seed1 and @@rand_seed2
sql/slave.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_acl.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_base.cc:
Store DROP of temporary tables in binlog cache
sql/sql_class.h:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_db.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_delete.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_insert.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_lex.h:
DROP TEMPORARY TABLE
sql/sql_load.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_parse.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_rename.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_repl.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_repl.h:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_table.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_update.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_yacc.yy:
DROP TEMPORARY
sql/table.cc:
Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
sql/unireg.cc:
Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
client/mysqlbinlog.cc:
Portability fix
configure.in:
Added use of ASFLAGS (For Solaris with Forte 5.0)
include/my_global.h:
Portability fix
include/myisam.h:
Portability fix
include/queues.h:
Portability fix
innobase/include/ut0ut.h:
Portability fix
innobase/log/log0log.c:
Portability fix
innobase/rem/rem0cmp.c:
Portability fix
innobase/trx/trx0sys.c:
Portability fix
isam/pack_isam.c:
Portability fix
myisam/ft_boolean_search.c:
Portability fix
myisam/mi_dynrec.c:
Code change to go around bug in Forte 5.0
myisam/sort.c:
Portability fix
mysys/my_aes.c:
Portability fix
scripts/Makefile.am:
Support for ASFLAGS
scripts/mysqlbug.sh:
Support for ASFLAGS
sql/field.cc:
Portability fix
sql/filesort.cc:
Portability fix
sql/gen_lex_hash.cc:
Portability fix
sql/ha_innodb.cc:
Portability fix
Changed SHOW INNODB STATUS to return error instead of writing message to log file.
sql/ha_isammrg.cc:
Portability fix
sql/ha_myisam.cc:
Portability fix
sql/ha_myisammrg.cc:
Portability fix
sql/hash_filo.h:
Portability fix
sql/hostname.cc:
Portability fix
sql/item_cmpfunc.h:
Indentation change
sql/item_func.cc:
Portability fix
sql/item_func.h:
Portability fix
sql/log.cc:
Portability fix
sql/log_event.cc:
Portability fix
sql/mysql_priv.h:
Portability fix
sql/mysqld.cc:
Portability fix
Fixed bug with rpl_recovery_rank command line option on 64 bit systems
sql/opt_range.cc:
Portability fix
sql/repl_failsafe.cc:
Portability fix
sql/slave.cc:
Portability fix
sql/slave.h:
Portability fix
sql/sql_acl.cc:
Portability fix
sql/sql_base.cc:
Portability fix
sql/sql_cache.cc:
Portability fix
sql/sql_cache.h:
Portability fix
sql/sql_class.cc:
Portability fix
sql/sql_delete.cc:
Portability fix
sql/sql_insert.cc:
Portability fix
sql/sql_manager.cc:
Portability fix
sql/sql_parse.cc:
Portability fix
BUILD/compile-solaris-sparc-forte:
C
sql/sql_udf.cc:
Portability fix
sql/sql_update.cc:
Portability fix
strings/Makefile.am:
Portability fix
strings/bmove_upp-sparc.s:
Fix so that this works on 32 and 64 bit sparcs
strings/str_test.c:
Cleanup
strings/strappend-sparc.s:
Fix so that this works on 32 and 64 bit sparcs
strings/strend-sparc.s:
Fix so that this works on 32 and 64 bit sparcs
strings/strmake-sparc.s:
Fix so that this works on 32 and 64 bit sparcs
strings/strmov-sparc.s:
Fix so that this works on 32 and 64 bit sparcs
strings/strnmov-sparc.s:
Fix so that this works on 32 and 64 bit sparcs
strings/strstr-sparc.s:
Fix so that this works on 32 and 64 bit sparcs
strings/strxmov-sparc.s:
Fixes to make this more portable, but it's still not usable on 64 bit systems :(
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Docs/manual.texi:
SCCS merged
Added bug fix from 3.23 for AIX 4.3.3 and gcc 3.x
Small change in EXCHANGE output
Propagate open-files-limit from mysqld_safe -> mysqld
Fixed speed bug in GROUP BY
Added quotes around database name in CREATE DATABASE db_name (for binary log)
BitKeeper/etc/ignore:
added stamp-h1
Docs/manual.texi:
Added 4.1 manual section
Updated changelog
client/mysqltest.c:
Added --skip-safemalloc
include/my_global.h:
Added bug fix from 3.23 for AIX 4.3.3 and gcc 3.x
mysql-test/mysql-test-run.sh:
Start mysqltest with --skip-safemalloc (To get it faster)
mysql-test/r/bdb.result:
Update for new EXPLAIN output
mysql-test/r/compare.result:
Update for new EXPLAIN output
mysql-test/r/create.result:
Update for new EXPLAIN output
mysql-test/r/distinct.result:
Update for new EXPLAIN output
mysql-test/r/explain.result:
Update for new EXPLAIN output
mysql-test/r/group_by.result:
Update for new EXPLAIN output
mysql-test/r/heap.result:
Update for new EXPLAIN output
mysql-test/r/innodb.result:
Update for new EXPLAIN output
mysql-test/r/join_outer.result:
Update for new EXPLAIN output
mysql-test/r/key_diff.result:
Update for new EXPLAIN output
mysql-test/r/merge.result:
Update for new EXPLAIN output
mysql-test/r/null_key.result:
Update for new EXPLAIN output
mysql-test/r/order_by.result:
Update for new EXPLAIN output
mysql-test/r/select.result:
Update for new EXPLAIN output
mysql-test/r/temp_table.result:
Fixed speed bug in GROUP BY
mysql-test/r/type_datetime.result:
Update for new EXPLAIN output
mysql-test/r/user_var.result:
Update for new EXPLAIN output
mysql-test/r/variables.result:
Removed variable safe_show_database
mysql-test/t/temp_table.test:
Fixed speed bug in GROUP BY
mysql-test/t/variables.test:
Removed not used variable safe_show_databases
scripts/mysqld_safe.sh:
Propagate open-files-limit from mysqld_safe -> mysqld
sql/mysqld.cc:
Removed variable safe_show_database
sql/set_var.cc:
Removed variable safe_show_database
sql/slave.cc:
Updated error message
sql/sql_db.cc:
Added quotes around database name in CREATE DATABASE db_name
sql/sql_select.cc:
Fixed speed bug in GROUP BY
Fixed reference to freed memory in acl_init()/grant_init()
Fixed possible memory leak. (Could only happen in very strange circumstances)
Fixed bug in ALTER TABLE with BDB tables
Updated mysql-test for valgrind
Docs/manual.texi:
ChangeLog
acinclude.m4:
Added back old LARGEFILE handling.
(Needed to get MySQL to compile on Solaris 2.9 with gcc 3.x)
configure.in:
Added back old LARGEFILE handling.
(Needed to get MySQL to compile on Solaris 2.9 with gcc 3.x)
libmysqld/lib_sql.cc:
Fixed reference to freed memory
mysql-test/mysql-test-run.sh:
Added option --valgrind
mysys/Makefile.am:
Removed warning when doing make
sql/mysqld.cc:
Free regexp memory on shutdown.
read 'des' key files from data directory
Fixed reference to freed memory in grant_init()
sql/slave.cc:
Fixed wrong printf() argument
sql/sql_acl.cc:
Fixed reference to freed memory
sql/sql_acl.h:
Fixed reference to freed memory
sql/sql_base.cc:
Fixed possible memory leak. (Could only happen in very strange circumstances)
sql/sql_parse.cc:
Updated arguments to grant_reload()
sql/sql_table.cc:
Fixed bug in ALTER TABLE with BDB tables
sql/sql_yacc.yy:
memset -> bzero
BitKeeper/etc/logging_ok:
auto-union
client/mysqldump.c:
Auto merged
include/Makefile.am:
Auto merged
include/my_base.h:
Auto merged
include/my_sys.h:
Auto merged
include/sslopt-case.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysql/libmysql.def:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_create.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/type_set.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/Makefile.am:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/net_pkg.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/unireg.h:
Auto merged
sql/sql_cache.cc:
Code cleanup (removed ifdef)
Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()
Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22
BitKeeper/deleted/.del-README~3449730baf983117:
Delete: mysql-test/t/README
BitKeeper/deleted/.del-sql_error.cc~2f1caca8d2485dbe:
Delete: libmysqld/sql_error.cc
BitKeeper/deleted/.del-sql_prepare.cc~f703729793935ed6:
Delete: libmysqld/sql_prepare.cc
Docs/manual.texi:
Updated variable list
client/mysql.cc:
Show warning count to user.
client/mysqltest.c:
Add warnings to test results
configure.in:
New shared library version number
include/errmsg.h:
Indentation cleanup
include/mysql.h:
Removed MYSQL_ERROR
Indentaion cleanups
include/mysql_com.h:
Changed functions to returns true/false to my_bool.
include/mysqld_error.h:
New error messages
isam/pack_isam.c:
Indentation change
libmysql/Makefile.am:
Fix of wrong merge
libmysql/Makefile.shared:
Indentation cleanup
libmysql/errmsg.c:
Removed not used errors
libmysql/libmysql.c:
Change functions to return 1 on error (not -1)
Change type of functions that returns 0/1 to my_bool
Lot of code optimizations.
Lot of changes for prepared statements. This now handles sending of binary data to server.
Receving of binary data is not yet done (will have to wait until server code for this is ready)
mysql_warning_count and mysql_warnings() implemented.
libmysql/libmysql.def:
Added mysql_warnings and mysql_warning_count
libmysql/manager.c:
Fixed wrong testing of result from my_connect()
libmysqld/lib_sql.cc:
Removed global variable THR_NET
Change basic net functions to use THD instead of NET
GRANT handling now uses read/write locks instead of mutex
libmysqld/libmysqld.c:
Changed functions to be my_bool
myisam/ft_boolean_search.c:
Trivial code cleanup
myisam/ft_stopwords.c:
Trivial code cleanup
myisam/mi_check.c:
Update to 4.1 structures
myisam/myisampack.c:
Trivial code cleanup
myisam/rt_key.c:
Code cleanup
myisam/rt_test.c:
Code cleanup
Removed compiler warnings
myisam/sp_key.c:
Indentation changes
myisam/sp_test.c:
Removed compiler warnings
mysql-test/README:
Updated to reflect the new --external flag.
mysql-test/mysql-test-run.sh:
--local (start new server) is now default.
Use --external to test against external server.
mysql-test/r/rollback.result:
Updated for 4.1 warnings
mysql-test/r/rpl_log.result:
Update for 4.1
mysql-test/t/rollback.test:
Updated for 4.1 warnings
mysql-test/t/rpl_log_pos.test:
Portability fix
mysys/hash.c:
Indentation change
mysys/my_error.c:
Indentation change
mysys/tree.c:
Updated file description
sql/field.cc:
Fixed bugs introduced by merge
Use my_sprintf instead of sprintf() + strlen()
sql/field.h:
Add CHARSET_INFO to field structure
sql/gstream.h:
Indentation changes.
Added GPL copyright header
sql/ha_innodb.cc:
Updated parameters for net functions.
sql/item.cc:
Updates of Item_param
Indentation changes
sql/item.h:
Removed size_of() function from item.
sql/item_func.cc:
Update function usage for 4.1
Added get_system_var()
sql/item_func.h:
Indentation change
sql/item_strfunc.cc:
Removed not needed inclusion of gstream.h
Update to use system variables (from 4.0)
sql/item_sum.h:
Removed size_of() functions from item.
sql/item_timefunc.cc:
Change sprintf() + strlen() -> my_sprintf()
Added length parameter to ->append()
sql/item_timefunc.h:
Removed size_of() functions from item.
sql/item_uniq.h:
Removed size_of() functions from item.
sql/lex.h:
Removed SQL_ERROR_COUNT variable
sql/log.cc:
Change sprintf() + strlen() -> my_sprintf()
sql/log_event.cc:
Change sprintf() + strlen() -> my_sprintf()
sql/mini_client.cc:
Added check that one always specifies a length to mc_mysql_query()
sql/mysql_priv.h:
New prototypes
Change of NET -> THD parameter for net functions.
sql/mysqld.cc:
New startup options: 'max_prepared_statements', 'max_error_count'
Updated usage of net functions.
sql/net_pkg.cc:
Change basic net functions to use THD instead of NET
(needed to be able to handle 4.0 and 4.1 protocols)
Lots of function comments
sql/net_serv.cc:
Change int return values -> my_bool
Updated net_write_command() to take an extra header block to be added to the packet.
(This made the prepared statement code much nicer and more efficient)
sql/repl_failsafe.cc:
Update net functions to use THD instead of NET
sql/set_var.cc:
Added @@error_count and @@warning_count variables.
Updated to 4.1 function usage
sql/set_var.h:
Added @@error_count and @@warning_count variables.
sql/share/czech/errmsg.txt:
Removed Warning: from warning error messages.
sql/share/english/errmsg.txt:
Removed Warning: from warning error messages.
sql/share/greek/errmsg.txt:
Removed Warning: from warning error messages.
sql/share/hungarian/errmsg.txt:
Removed Warning: from warning error messages.
sql/share/japanese/errmsg.txt:
Removed Warning: from warning error messages.
sql/share/korean/errmsg.txt:
Removed Warning: from warning error messages.
sql/share/norwegian-ny/errmsg.txt:
Removed Warning: from warning error messages.
sql/share/norwegian/errmsg.txt:
Removed Warning: from warning error messages.
sql/share/polish/errmsg.txt:
Removed Warning: from warning error messages.
sql/share/romanian/errmsg.txt:
Removed Warning: from warning error messages.
sql/share/slovak/errmsg.txt:
Removed Warning: from warning error messages.
sql/share/swedish/errmsg.txt:
Removed Warning: from warning error messages.
sql/slave.cc:
Change basic net functions to use THD instead of NET
skip_load_data_file recoded to fit new client/server protocol
sql/spatial.h:
Added copyright header
Indentation cleanups
sql/sql_acl.cc:
Change basic net functions to use THD instead of NET
GRANT handling now uses read/write locks instead of mutex
sql/sql_analyse.cc:
Change basic net functions to use THD instead of NET
sprintf() + strlen() -> my_sprintf()
sql/sql_base.cc:
More DBUG statements
sql/sql_class.cc:
Change basic net functions to use THD instead of NET
warning and prepared statement handling
sql/sql_class.h:
Change basic net functions to use THD instead of NET
warning and prepared statement handling
sql/sql_db.cc:
Code cleanup & optimization.
sql/sql_delete.cc:
Change basic net functions to use THD instead of NET
sql/sql_derived.cc:
Change basic net functions to use THD instead of NET
sql/sql_do.cc:
Change basic net functions to use THD instead of NET
sql/sql_error.cc:
Big rewrite of error handling.
sql/sql_handler.cc:
Change basic net functions to use THD instead of NET
sql/sql_insert.cc:
Change basic net functions to use THD instead of NET
sql/sql_lex.cc:
Change basic net functions to use THD instead of NET
sql/sql_lex.h:
Added param_count to st_select_lex_node
sql/sql_list.h:
Removed not needed error list.
sql/sql_load.cc:
Change basic net functions to use THD instead of NET
sql/sql_parse.cc:
Change basic net functions to use THD instead of NET
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Update of warning handling.
Added create_select_for_variable() (for SHOW COUNT(*) WARNINGS)
sql/sql_prepare.cc:
Initial prepared statement handling
sql/sql_rename.cc:
Change basic net functions to use THD instead of NET
sql/sql_repl.cc:
Change basic net functions to use THD instead of NET
sql/sql_select.cc:
Small code cleanups
Added missing initialization of error that caused some queries that returned an empty result set to fail
sql/sql_select.h:
Ensure that JOIN.error is properly initialized
sql/sql_show.cc:
Change basic net functions to use THD instead of NET
A lot of optimization
sql/sql_table.cc:
Change basic net functions to use THD instead of NET
Indentaion cleanup
sql/sql_udf.cc:
Change basic net functions to use THD instead of NET
sql/sql_union.cc:
Change basic net functions to use THD instead of NET
sql/sql_update.cc:
Change basic net functions to use THD instead of NET
sql/sql_yacc.yy:
Change basic net functions to use THD instead of NET
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()
sql/structs.h:
Moved structures to files where they was used
sql/table.cc:
Don't accept empty database names
sql/uniques.cc:
Indentation cleanup
sql/unireg.cc:
Change basic net functions to use THD instead of NET
sql/unireg.h:
Added defaults for warnings and prepared statements
strings/ctype-simple.c:
optimization
tests/client_test.c:
Fixed wrong paramaters to printf()
Added missing mutex-lock around critical section in GRANT handling.
Docs/manual.texi:
ChangeLog
sql/lock.cc:
Change name -> alias in TABLE_LIST.
sql/slave.cc:
Change name -> alias in TABLE_LIST.
sql/sql_acl.cc:
Added missing mutex-lock around critical section in GRANT handling.
Changed name -> alias
sql/sql_base.cc:
Change name -> alias in TABLE_LIST.
sql/sql_insert.cc:
Change name -> alias in TABLE_LIST.
sql/sql_parse.cc:
Change name -> alias in TABLE_LIST.
sql/sql_show.cc:
Change name -> alias in TABLE_LIST.
sql/sql_table.cc:
Change name -> alias in TABLE_LIST.
sql/sql_udf.cc:
Change name -> alias in TABLE_LIST.
sql/table.h:
Change name -> alias in TABLE_LIST.
tests/grant.pl:
Fixed grant test
This should fix some issues where --lower-case-table-names doesn't work properly under windows.
client/mysql.cc:
Added missing sslopt-case.h
sql/lock.cc:
Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/log_event.cc:
Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/mysqld.cc:
Fixed that --ssl and --skip-ssl works
sql/slave.cc:
Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_acl.cc:
Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_base.cc:
Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_cache.cc:
Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_handler.cc:
Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_insert.cc:
Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_parse.cc:
Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_show.cc:
Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_table.cc:
Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_udf.cc:
Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_union.cc:
Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_yacc.yy:
Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/table.h:
Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
Improve mysql-test to be more robust.
Fix that GRANT doesn't delete SSL options
Change innobase_flush_log_at_trx_commit to uint.
Don't rotate logs if we read a rotate log entry from the master.
Docs/manual.texi:
Changelog
client/mysqlbinlog.cc:
Handle empty binlogfiles gracefully
client/mysqltest.c:
Do a sleep after 'sync_with_master'
Cleaned up sleep() handling.
Free all memory on exit
configure.in:
Fix for Mac OS 10.2
include/my_sys.h:
Added my_strdup_with_length()
innobase/btr/btr0cur.c:
Fixed wrong printf()
libmysql/libmysql.c:
Added DBUG_PRINT statements.
Assume that mysql_...send() functions has correct query length.
mysql-test/mysql-test-run.sh:
Properly remove log files before starting new tests.
mysql-test/r/grant.result:
Update for new test results
mysql-test/r/innodb.result:
Update for new test results
mysql-test/r/myisam.result:
Update for new test results
mysql-test/r/rpl_log.result:
Update for new test results
mysql-test/r/rpl_rotate_logs.result:
Update for new test results
mysql-test/r/variables.result:
Update for new test results
mysql-test/t/grant.test:
Test that GRANT doesn't delete SSL options
mysql-test/t/myisam.test:
Test long key usage
mysql-test/t/rpl_log.test:
Disable 'show new master'
mysql-test/t/rpl_mystery22.test:
Longer sleep for more safety.
mysql-test/t/rpl_rotate_logs.test:
More comments
mysys/my_malloc.c:
Added my_strdup_with_length()
mysys/safemalloc.c:
Added my_strdup_with_length()
mysys/thr_alarm.c:
Fix of alarms for windows.
sql/ha_innodb.cc:
Change innobase_flush_log_at_trx_commit to uint
mysql-test/r/rpl_redirect.result:
Updated test results
mysql-test/t/rpl_redirect.test:
Added more tests to improve code coverage.
sql/ha_innodb.h:
Change innobase_flush_log_at_trx_commit to uint
sql/item_func.cc:
Return GLOBAL and SESSION as part of column names
sql/log.cc:
Only write STOP events when server goes down.
sql/log_event.cc:
Don't rotate logs if we read a rotate log entry from the master.
sql/log_event.h:
Change ident_len to uint (more efficient)
sql/mysqld.cc:
Change innobase_flush_log_at_trx_commit to uint
sql/net_serv.cc:
More debug output
sql/repl_failsafe.cc:
More DEBUG
Search until we find next position in binary log (and not only =)
sql/slave.cc:
More DBUG & comments
Don't rotate the binary log on master flush logs
sql/slave.h:
indentation change
sql/sql_acl.cc:
Test that GRANT doesn't delete SSL options
sql/sql_parse.cc:
Disable show_new_master.
sql/sql_repl.cc:
Chamger show_binlog_events() to use my_error()
sql/sql_table.cc:
Fixed check for too long keys in MyISAM
sql/sql_udf.cc:
Fix udf handling
Fixed that GRANT ... REQUIRE options are not forgot when doing new GRANT
Changed fn_ext to point at first '.' after directory.
FLUSH LOGS removed numerical extension for all future update logs.
Fixed the mysqld --help reports right values for --datadir and --bind-address
--log-binary=a.b.c now properly strips of .b.c
Fix that one can DROP UDF functions that was not loaded at startup
Made AND optional in REQUIRE
Added REQUIRE NONE
BitKeeper/deleted/.del-CodingStyle~1ba7ff62d4cd0ea:
Delete: vio/docs/CodingStyle
BitKeeper/deleted/.del-COPYING.dbug~ca0c017a4d7e8609:
Delete: vio/docs/COPYING.dbug
BitKeeper/deleted/.del-COPYING.mysql~471498c82977cd3a:
Delete: vio/docs/COPYING.mysql
BitKeeper/deleted/.del-README~947354991dc882f8:
Delete: vio/docs/README
Docs/manual.texi:
Changelog
acinclude.m4:
Fixed searching after ssl directories.
client/Makefile.am:
Moved openssl include to avoid problem with installed readline
include/Makefile.am:
Install my_global.h
include/violite.h:
Fixed that GRANT ... REQUIRE options are not forgot when doing new grant
libmysqld/examples/Makefile.am:
Moved openssl include to avoid problem with installed readline
mysql-test/mysql-test-run.sh:
Improved 'which' handling to give error if command is not found
mysys/mf_fn_ext.c:
Changed fn_ext to point at first '.' after directory.
sql/Makefile.am:
More comments
sql/lex.h:
Added NONE as keyword
sql/log.cc:
FLUSH LOGS removed numerical extension for all future update logs.
Simple code cleanup
sql/mysqld.cc:
Fixed the --help reports right values for --datadir and --bind-address
--log-binary=a.b.c now properly strips of .b.c
Removed option --skip-external-locking (not needed as this is automatic)
sql/repl_failsafe.cc:
Moved some common THD initalization to store_globals()
sql/slave.cc:
Moved openssl include to avoid problem with installed readline
sql/sql_acl.cc:
Moved openssl include to avoid problem with installed readline
sql/sql_acl.h:
Updated function prototypes
sql/sql_base.cc:
Added comment
sql/sql_class.cc:
Moved openssl include to avoid problem with installed readline.
Changed THD::thd to make things work for main thread.
sql/sql_class.h:
Fixed wrongly removed line (fixes compiler problem on MacOSX)
sql/sql_insert.cc:
Moved openssl include to avoid problem with installed readline
sql/sql_lex.cc:
Moved save_to_cache_query=0 to udf detection function to make sql_yacc.yy simpler
sql/sql_lex.h:
Indentation cleanup
sql/sql_parse.cc:
Moved openssl include to avoid problem with installed readline.
Added THD argument to acl_reload()
sql/sql_repl.h:
Made opt_bin_logname static
sql/sql_udf.cc:
Fix that one can DROP UDF functions that was not loaded at startup
sql/sql_yacc.yy:
made AND optional in REQUIRE
Added REQUIRE NONE
Fixed that old SSL options are not forgotten when doing new GRANT.
sql/udf_example.cc:
Improved comments
Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
BitKeeper/deleted/.del-getopt.h~a9ae679fa84f395:
Auto merged
BitKeeper/deleted/.del-getvar.c~2a29ff383970fd31:
Auto merged
Docs/manual.texi:
Auto merged
SSL/cacert.pem:
Auto merged
SSL/client-cert.pem:
Auto merged
SSL/client-key.pem:
Auto merged
SSL/server-cert.pem:
Auto merged
SSL/server-key.pem:
Auto merged
client/mysqldump.c:
Auto merged
include/my_base.h:
Auto merged
include/my_sys.h:
Auto merged
include/mysql_com.h:
Auto merged
isam/isamlog.c:
Auto merged
isam/pack_isam.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
myisam/ft_dump.c:
Auto merged
myisam/ft_parser.c:
Auto merged
myisam/ft_static.c:
Auto merged
myisam/ft_test1.c:
Auto merged
myisam/ft_update.c:
Auto merged
myisam/mi_create.c:
Auto merged
myisam/mi_key.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/mi_static.c:
Auto merged
myisam/mi_test1.c:
Auto merged
myisam/mi_test2.c:
Auto merged
myisam/mi_test3.c:
Auto merged
myisam/mi_update.c:
Auto merged
myisam/mi_write.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisamdef.h:
Auto merged
myisam/myisamlog.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/func_math.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/select_found.test:
Auto merged
mysql-test/t/union.test:
Auto merged
mysys/default.c:
Auto merged
mysys/mf_iocache2.c:
Auto merged
mysys/my_error.c:
Auto merged
mysys/my_init.c:
Auto merged
scripts/mysql_config.sh:
Auto merged
sql/convert.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/gen_lex_hash.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/hostname.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/key.cc:
Auto merged
sql/log.cc:
Auto merged
sql/net_pkg.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/time.cc:
Auto merged
sql/unireg.cc:
Auto merged
strings/Makefile.am:
Auto merged
strings/ctype-latin1_de.c:
Auto merged
strings/ctype-tis620.c:
Auto merged
tools/mysqlmanager.c:
Auto merged
BitKeeper/deleted/.del-sslopt-case.h~224c80e75dad4997:
merge with 4.0.3
BitKeeper/triggers/post-commit:
merge with 4.0.3
client/mysql.cc:
merge with 4.0.3 + simple optimsation
client/mysqltest.c:
merge with 4.0.3 (Indentation change)
configure.in:
merge with 4.0.3
extra/resolve_stack_dump.c:
merge with 4.0.3 (Indentation change)
include/Makefile.am:
merge with 4.0.3
include/myisam.h:
merge with 4.0.3 (Indentation change)
include/mysql.h:
merge with 4.0.3 (removed not used structure)
include/mysqld_error.h:
merge with 4.0.3
libmysql/Makefile.shared:
merge with 4.0.3
libmysql/libmysql.c:
merge with 4.0.3 (Indentation change)
libmysqld/Makefile.am:
merge with 4.0.3
myisam/ft_boolean_search.c:
merge with 4.0.3 (Indentation change)
myisam/ft_nlq_search.c:
merge with 4.0.3 (Indentation change)
myisam/mi_check.c:
merge with 4.0.3
myisam/mi_search.c:
merge with 4.0.3
myisam/mi_unique.c:
merge with 4.0.3
mysys/Makefile.am:
merge with 4.0.3
mysys/mf_casecnv.c:
merge with 4.0.3
sql-bench/server-cfg.sh:
Removed 8000 max row limit for Innodb
sql/Makefile.am:
merge with 4.0.3
sql/field.cc:
Indentation cleanup
Changed sprintf -> my_sprintf
sql/field.h:
merge with 4.0.3
sql/ha_heap.cc:
merge with 4.0.3 (Indentation change)
sql/item.h:
merge with 4.0.3 (Indentation change)
sql/item_cmpfunc.cc:
merge with 4.0.3
sql/item_cmpfunc.h:
Removed size_of() from items
Indentation cleanup
sql/item_create.cc:
merge
sql/item_create.h:
merge
sql/item_func.cc:
Added comments
Changed string functions to use character set of first string argument as default return characterset
Simple optimizations.
Removed return of uninitalized variable.
sql/item_func.h:
merge
sql/item_strfunc.cc:
merge with 4.0.3 (Indentation change)
sql/item_strfunc.h:
removed size_of()
sql/item_uniq.h:
removed size_of()
sql/lex.h:
merge with 4.0.3 (Indentation change)
sql/log_event.cc:
Add ` around database in 'use database' in binary log.
sql/mysql_priv.h:
merge with 4.0.3
sql/mysqld.cc:
merge with 4.0.3 (Indentation change)
sql/share/czech/errmsg.txt:
merge
sql/share/danish/errmsg.txt:
merge
sql/share/dutch/errmsg.txt:
merge
sql/share/english/errmsg.txt:
merge
sql/share/estonian/errmsg.txt:
merge
sql/share/french/errmsg.txt:
merge
sql/share/german/errmsg.txt:
merge
sql/share/greek/errmsg.txt:
merge
sql/share/hungarian/errmsg.txt:
merge
sql/share/italian/errmsg.txt:
merge
sql/share/japanese/errmsg.txt:
merge
sql/share/korean/errmsg.txt:
merge
sql/share/norwegian-ny/errmsg.txt:
merge
sql/share/norwegian/errmsg.txt:
merge
sql/share/polish/errmsg.txt:
merge
sql/share/portuguese/errmsg.txt:
merge
sql/share/romanian/errmsg.txt:
merge
sql/share/russian/errmsg.txt:
merge
sql/share/slovak/errmsg.txt:
merge
sql/share/spanish/errmsg.txt:
merge
sql/share/swedish/errmsg.txt:
merge
sql/share/ukrainian/errmsg.txt:
merge
sql/sql_acl.cc:
merge with 4.0.3
sql/sql_base.cc:
More comments
Fixed bug in send_fields() when using convert
sql/sql_class.cc:
merge
sql/sql_class.h:
Merge with 4.0.3
Moved max_error_count and max_warning_count to variables struct.
sql/sql_delete.cc:
merge with 4.0.3 (Indentation change)
sql/sql_lex.h:
merge with 4.0.3
sql/sql_parse.cc:
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT.
(Should be retrived from variables)
sql/sql_select.cc:
merge with 4.0.3
sql/sql_show.cc:
merge with 4.0.3
sql/sql_union.cc:
merge with 4.0.3
sql/sql_update.cc:
merge with 4.0.3
sql/sql_yacc.yy:
merge with 4.0.3
Indentation cleanup
sql/structs.h:
merge with 4.0.3
sql/table.cc:
merge with 4.0.3
sql/table.h:
merge with 4.0.3
Fixed hang in start_slave_threads() when thread dies quickly.
Docs/manual.texi:
Changelog
client/mysqltest.c:
Indentation cleanup
More DBUG info
libmysql/libmysql.c:
More DBUG info
Give better error from reconnect()
mysql-test/r/rpl_rotate_logs.result:
Update results
mysql-test/t/rpl_log_pos.test:
Fix for fast machines
mysql-test/t/rpl_rotate_logs.test:
Updated test to be more portable
scripts/mysql_zap.sh:
Update for MacOSX
sql/mini_client.cc:
Better error messages from reconnect.
Indentation cleanups
sql/slave.cc:
Fixed hang in start_slave_threads() when thread dies quickly.
sql/slave.h:
Fixed hang in start_slave_threads() when thread dies quickly.
Removed compiler warnings.
Build-tools/Do-compile:
Simple cleanup
include/mysql.h:
Use #include "" instead of include <>
mysql-test/t/innodb_handler.test:
Documented test
Change to be runnable from mysql
sql/mini_client.cc:
Removed dead code
sql/mysqld.cc:
Changed relay_log_space to ulonglong
sql/slave.cc:
Changed relay_log_space to ulonglong
Removed dead code
sql/slave.h:
Changed relay_log_space to ulonglong
sql/sql_acl.cc:
Removed not used variables
sql/sql_base.cc:
Removed not used variables
sql/sql_cache.cc:
Removed not used variables
sql/sql_select.cc:
Removed not used variables
vio/vio.c:
Re-order include files to remove compiler warnings
Changed option variables to my_bool (to avoid bugs in my_getopt())
Added new thread specific mutex LOCK_delete to be able to free LOCK_thread_count early.
Changed usage of LOCK_thread_count -> LOCK_status for statistics variables
libmysqld/lib_sql.cc:
Removed not needed LOCK
mysql-test/mysql-test-run.sh:
Log name of running test
mysql-test/r/rpl_sporadic_master.result:
Cleaned up test
mysql-test/t/rpl_sporadic_master.test:
cleaned up test
sql/log.cc:
Cleanup.
Fixed bug in wait_for_update() that I had introduced.
sql/mini_client.cc:
Indentation changes.
sql/mysql_priv.h:
Changed option variables to my_bool.
sql/mysqld.cc:
Changed option variables to my_bool.
Removed not used LOCK_server_id
Minor code cleanups.
sql/repl_failsafe.cc:
Minor code cleanups
sql/slave.cc:
Minor code cleanups.
Fixed usage of wait_for_update().
sql/slave.h:
Changed option variables to my_bool.
sql/sql_class.cc:
Added new thread specific mutex LOCK_delete to be able to free LOCK_thread_count early
sql/sql_class.h:
Added new thread specific mutex LOCK_delete to be able to free LOCK_thread_count early
sql/sql_insert.cc:
Do broadcast after unlock()
sql/sql_parse.cc:
Removed not needed LOCK
Changed usage of LOCK_thread_count -> LOCK_status for statistics variables
Changed killing of threads to not lock LOCK_thread_count for long.
sql/sql_repl.cc:
Changed options variables to my_bool
Fixed usage of wait_for_update()
Fixed loop to kill slaves to not lock LOCK_thread_count for long.
Code optimization.
sql/sql_repl.h:
bool -> my_bool
Fixed KICK_SLAVE to use LOCK_delete
More DBUG info for replication
Better error messages from replication
Fixed bug in replication code when connecting to 'localhost' (time was not released properly)
Block ALARM signal on Linux for signal handler thread (Fixes problem with running mysqld with --debug)
Removed warning when setting an AUTO_INCREMENT field to NULL
Build-tools/Do-compile:
Always run test with --warnings during build
Docs/manual.texi:
Changelog
configure.in:
Use our version of RWLOCKS on UNIXWARE 7
include/my_pthread.h:
Use our version of RWLOCKS on UNIXWARE 7
include/mysql_version.h.in:
Fixed warning when compiling embedded server
include/mysqld_error.h:
New error messages
libmysql/libmysql.c:
Give connect error message on reconnect if it fails.
Fixed possible buffer overflow in expand_error()
Added error messages for some error conditions.
mysql-test/mysql-test-run.sh:
Portability fixes:
- Search after 'time' in path.
- Search after mysqld in libexec
- Remove end / when doing rm -r (fix for BSD)
Clean up skip_test handling.
mysql-test/r/rpl_empty_master_crash.result:
New results
mysql-test/t/rpl_empty_master_crash.test:
Extended test
mysys/mf_iocache.c:
Remember file position on failed read.
mysys/mf_iocache2.c:
Fixed bug in filelength() call.
mysys/thr_alarm.c:
Made alarm handling more threadsafe when use with DBUG.
mysys/thr_mutex.c:
More debug info
sql/log_event.cc:
More DBUG_PRINT statements.
sql/mini_client.cc:
Better error reporting on failures.
Return connect error on reconnect failure (instead of SERVER_GONE_ERROR)
Fixed critical bug in alarm handling on connect (could leave an alarm event on indefinitely)
sql/mysql_priv.h:
Fixed arguments to mysql_binlog_send()
sql/mysqld.cc:
Block ALARM signal on Linux for signal handler thread (Fixes problem with running mysqld with --debug)
sql/net_pkg.cc:
Removed dead code
sql/net_serv.cc:
Ensure that last_errno is set in net_real_write()
sql/repl_failsafe.cc:
Code cleanup.
Better error handling.
sql/share/czech/errmsg.txt:
New error messages.
sql/share/danish/errmsg.txt:
New error messages.
sql/share/dutch/errmsg.txt:
New error messages.
sql/share/english/errmsg.txt:
New error messages.
sql/share/estonian/errmsg.txt:
New error messages.
sql/share/french/errmsg.txt:
New error messages.
sql/share/german/errmsg.txt:
New error messages.
sql/share/greek/errmsg.txt:
New error messages.
sql/share/hungarian/errmsg.txt:
New error messages.
sql/share/italian/errmsg.txt:
New error messages.
sql/share/japanese/errmsg.txt:
New error messages.
sql/share/korean/errmsg.txt:
New error messages.
sql/share/norwegian-ny/errmsg.txt:
New error messages.
sql/share/norwegian/errmsg.txt:
New error messages.
sql/share/polish/errmsg.txt:
New error messages.
sql/share/portuguese/errmsg.txt:
New error messages.
mysql-test/r/rpl_log_pos.result:
Updated results
mysql-test/t/rpl_log_pos.test:
Added 'sleep' commands to make tests repeatable.
sql/share/romanian/errmsg.txt:
New error messages.
sql/share/russian/errmsg.txt:
New error messages.
sql/share/slovak/errmsg.txt:
New error messages.
sql/share/spanish/errmsg.txt:
New error messages.
sql/share/swedish/errmsg.txt:
New error messages.
sql/share/ukrainian/errmsg.txt:
New error messages.
sql/slave.cc:
Code optimization and cleanup.
More DBUG statements.
Better cleanup if start slave fails.
Better error messages from 'fetch_master_table'
Thread safer handling of 'wait_for_pos'
sql/slave.h:
Better handling of wait_for_pos
sql/sql_load.cc:
Removed warning when setting an AUTO_INCREMENT field to NULL
sql/sql_parse.cc:
Fixed calling of function that has changed.
sql/sql_repl.cc:
More DBUG statements
Give a proper error number from mysql_binlog_send() so that we know when we have to abort slaves.
Fixed configure problems with HPUX and openbsd
SHOW SLAVE STATUS returns empty set if slave is not initialized
SHOW MASTER STATUS returns empty set if binary logging is not enabled.
Fixed shutdown problem on Solaris.
BitKeeper/deleted/.del-set_var.cc~5374527de1955359:
Delete: libmysqld/set_var.cc
BitKeeper/etc/ignore:
added libmysqld/set_var.cc
Build-tools/Do-compile:
Remove warnings from touch during compilation
Docs/manual.texi:
Changelog
client/mysqltest.c:
Added real_sleep command
configure.in:
Fixed type for HPUX10
innobase/configure.in:
Fixed type for openbsd
libmysql/libmysql.c:
Fix for new SHOW SLAVE STATUS
myisam/mi_update.c:
Update key file if using external locking
mysql-test/mysql-test-run.sh:
Safety fix
mysql-test/r/rpl000015.result:
Update for new SHOW SLAVE STATUS
mysql-test/r/rpl_empty_master_crash.result:
Update for new SHOW SLAVE STATUS
mysql-test/t/rpl000001.test:
sleep -> real_sleep to avoid timing problem
sql/mysqld.cc:
Fixed bug with SIGTERM on Solaris
sql/slave.cc:
SHOW SLAVE STATUS returns empty sets if slave is not initialized.
sql/sql_repl.cc:
SHOW MASTER STAT returns empty set if no binary logging.
Fixed some windows portability problems and removed some compiler warnings
Cleaned up QUOTE() function and fixed bug in \0 and \Z handling.
Docs/manual.texi:
Changelog
Added information about new IF() behaviour.
libmysql/libmysql.def:
Removed mysql_ssl_clear
myisam/mi_dynrec.c:
Minor cleanup
mysql-test/r/func_str.result:
Added more tests for QUOTE
mysql-test/t/func_str.test:
Added more tests for QUOTE
mysys/mf_iocache.c:
Removed compiler warnings
sql/ha_innodb.cc:
Added missing null to generated string.
sql/item_cmpfunc.cc:
Changed IF(expr, column, NULL) to take type from column
sql/item_strfunc.cc:
Cleaned up QUOTE() function and fixed bug in \0 and \Z handling.
sql/log.cc:
Minor cleanup
sql/mysql_priv.h:
Fixed problem with opt_enable_named_pipe
sql/mysqld.cc:
Fixed problem with opt_enable_named_pipe
Fixed some syntax errors in windows code
sql/set_var.cc:
Removed compiler warnings
sql/slave.cc:
Removed compiler warnings
sql/sql_show.cc:
Removed compiler warnings
Fix for syntax error bug in SET TRANSACTION ISOLATION
BitKeeper/deleted/.del-sslopt-case.h~224c80e75dad4997:
Delete: include/sslopt-case.h
client/mysql.cc:
Fix for SSL and new my_getopt
client/mysqladmin.c:
Fix for SSL and new my_getopt
client/mysqlcheck.c:
Fix for SSL and new my_getopt
client/mysqldump.c:
Fix for SSL and new my_getopt
client/mysqlimport.c:
Fix for SSL and new my_getopt
client/mysqlshow.c:
Fix for SSL and new my_getopt
include/Makefile.am:
Fix for SSL and new my_getopt
include/sslopt-longopts.h:
Fix for SSL and new my_getopt
libmysql/libmysql.c:
Fix for SSL and new my_getopt
mysql-test/r/innodb.result:
Simple test of transaction isolations
mysql-test/t/innodb.test:
Simple test of transaction isolations
sql/mini_client.cc:
Merge of mysql_real_connect() with libmysql.c
sql/mysqld.cc:
Simple test of transaction isolations
Remove use of current_thd in get_options()
sql/slave.cc:
Indentation cleanup
sql/sql_yacc.yy:
Fix for SET TRANSACTION ...
Updated WEEK() and DATE information in the manual.
Docs/manual.texi:
Updated WEEK() information.
Added more information of how MySQL stores dates.
libmysql/Makefile.am:
Fix after merge
libmysqld/lib_vio.c:
Use new vio_blocking()
mysql-test/r/group_by.result:
Update results after merge
sql/ha_innodb.cc:
Fix after merge
sql/lex.h:
Fix after merge
sql/slave.cc:
Added missing include file
sql/sql_base.cc:
Added function comments
vio/test-ssl.c:
Fix after merge
Fixed bugs in my last changeset that made MySQL hard to compile.
Added mutex around some data that could cause table cache corruptions when using OPTIMIZE TABLE / REPAIR TABLE or automatic repair of MyISAM tables.
Added mutex around some data in the slave start/stop code that could cause THD linked list corruptions
Extended my_chsize() to allow one to specify a filler character.
Extend vio_blocking to return the old state (This made some usage of this function much simpler)
Added testing for some functions that they caller have got the required mutexes before calling the function.
Use setrlimit() to ensure that we can write core file if one specifies --core-file.
Added --slave-compressed-protocol
Made 2 the minimum length for ft_min_word_len
Added variables foreign_key_checks & unique_checks.
Less logging from replication code (if not started with --log-warnings)
Changed that SHOW INNODB STATUS requre the SUPER privilege
More DBUG statements and a lot of new code comments
BitKeeper/deleted/.del-rpl_compat.result~c950bc346b12c61a:
Delete: mysql-test/r/rpl_compat.result
BitKeeper/deleted/.del-rpl_compat.test~5f6ba955e02aa95f:
Delete: mysql-test/t/rpl_compat.test
Docs/manual.texi:
Updated manual with fixes in this changeset
client/mysqltest.c:
Indentation cleanup
Better error messages for some error conditions.
include/my_pthread.h:
Added 'safe_mutex_assert_owner()' to check that the thread really owns the mutex.
include/my_sys.h:
Extended my_chsize() to allow one to specify a filler character.
(For MySQL index logs)
include/raid.h:
New my_chsize()
include/violite.h:
Extend vio_blocking to return the old state
innobase/include/dyn0dyn.h:
Merge with 3.23 (AIX DYN_ARRAY_DATA_SIZE)
innobase/include/dyn0dyn.ic:
Merge with 3.23
isam/create.c:
Fix for new my_chsize()
isam/isamchk.c:
Fix for new my_chsize()
isam/pack_isam.c:
Fix for new my_chsize()
libmysql/manager.c:
Fix for new vio_blocking()
libmysqld/lib_sql.cc:
Fix for new open_log()
myisam/mi_cache.c:
Fix typo from previous checking
myisam/mi_check.c:
Fix for new my_chsize()
myisam/mi_create.c:
Fix for new my_chsize()
myisam/mi_delete_all.c:
Fix for new my_chsize()
myisam/myisampack.c:
Fix for new my_chsize()
mysql-test/include/master-slave.inc:
Better initialization for replication tests
mysql-test/mysql-test-run.sh:
Added option --log-warnings
mysql-test/r/insert.result:
More tests if INSERT ...(DEFAULT)
mysql-test/r/rpl000001.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000002.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000003.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000004.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000005.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000006.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000007.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000008.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000009.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000010.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000011.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000012.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000013.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000014.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl_alter.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl_empty_master_crash.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl_get_lock.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl_log.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl_magic.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl_mystery22.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl_skip_error.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl_sporadic_master.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/insert.test:
More tests if INSERT ...(DEFAULT)
mysql-test/t/rpl000001.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl000002.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl000003.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl000004.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl000005.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl000006.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl000007.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl000009.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl000011.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl000013.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl000014.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl_alter.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl_empty_master_crash.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl_get_lock.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl_magic.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl_mystery22.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl_skip_error.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl_sporadic_master.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysys/mf_iocache.c:
More debug info
Force seek after reinit_io_cache()
mysys/mf_iocache2.c:
Added my_b_filelength()
mysys/my_chsize.c:
Extended my_chsize() to allow one to specify a filler character.
(For MySQL index logs)
mysys/raid.cc:
Extended my_chsize() to allow one to specify a filler character.
(For MySQL index logs)
sql/field.h:
Fix for INSERT ... (DEFAULT)
sql/ha_berkeley.h:
Fix for dynamic variables
sql/ha_innodb.cc:
Change sprintf() to my_sprintf() to make code portable.
Fix after sync with 3.23
(We still need to fix the storage of the replication position in innodb)
sql/ha_innodb.h:
Fix for dynamic variables
sql/handler.cc:
Remove writting of COMMIT to the binary log.
(Now done in MYSQL_LOG::write())
sql/item_func.cc:
Query_log_event() now always takes query length.
sql/item_func.h:
Indentation cleanup
sql/item_strfunc.h:
Indentation cleanup
sql/item_timefunc.h:
Indentation cleanup
sql/lock.cc:
Check that we own critical mutexes.
sql/log.cc:
Big code cleanup / rewrite / optimize.
- The index log file has its own IO_CACHE object.
- Many functions totally rewritten to make them smaller and faster.
- New handling of index log files
- Lots of new comments
sql/log_event.cc:
Code cleanup
New comments
sql/log_event.h:
Query_log_event() now always takes query length.
sql/mini_client.cc:
Better error messages on reconnect.
Fixed wrong variable usage from last commit.
sql/mysql_priv.h:
New arguments to open_log()
sql/mysqld.cc:
Use setrlimit() to ensure that we can write core file if one specifies --core-file
Added index file name as parameter to openlog().
Added --slave-compressed-protocol
Made 2 the minimum length for ft_min_word_len
sql/net_serv.cc:
Use new vio_blocking()
(The vio_blocking() change was done to make this code more readable)
sql/repl_failsafe.cc:
Minor code cleanup
sql/set_var.cc:
Added variables slave_compressed_protocol, foreign_key_checks & unique_checks.
sql/set_var.h:
Generalization
sql/slave.cc:
Code cleanup & rewrite.
Dont call SELECT VERSION() on check_master_version()
New init_slave() code.
Ensure that all threads create a THD early.
Add locks around manipulation of critical structures
Don't retry a command more than master_retry_count times.
Write less warnings to the log file (if not started with --log-warnings)
Faster flush_relay_log_info()
sql/slave.h:
More comments
Added new arguments to some functions.
sql/sql_acl.cc:
More DBUG info
New parameter to Query_log_event()
sql/sql_base.cc:
Added some mutex checking.
sql/sql_cache.cc:
Less not critical debug info
sql/sql_class.h:
Fix for new log handling.
sql/sql_db.cc:
Added mutex around remove_db_from_cache()
sql/sql_delete.cc:
Added missing parameters to changed functions
sql/sql_insert.cc:
Added missing parameters to changed functions
sql/sql_parse.cc:
Do an 'end_active_trans()' before 'load_master_data'
Changed that SHOW INNODB STATUS requre the SUPER privilege
Added new function parameters to new functions
sql/sql_rename.cc:
Added missing parameters to changed functions
sql/sql_repl.cc:
Code cleanups / new comments
Fix for new find_first_log() calling standard.
More DBUG statements.
Show binlogs updated to use new IO_CACHE:d index log file.
sql/sql_repl.h:
New function arguments
sql/sql_select.cc:
Indentation changes
sql/sql_table.cc:
Added missing parameters to changed functions
Added checking of mutex
Added mutex around critical regions.
sql/sql_test.cc:
Don't use THR_ALARM if the configuration doesn't support it.
sql/sql_update.cc:
Added missing parameters to changed functions
sql/table.cc:
Added missing parameters to changed functions
vio/vio.c:
Extend vio_blocking to return the old state
vio/viosocket.c:
Extend vio_blocking to return the old state
vio/viossl.c:
Extend vio_blocking to return the old state
Docs/manual.texi:
Changelog
sql/gen_lex_hash.cc:
Merged --verbose option from 4.0
Smaller hash table
sql/slave.cc:
Added some mutex locks to make SLAVE START and SLAVE STOP thread safe.
Fixed wrong usage of sprintf() in ha_innodb.cc
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
Auto merged
Docs/manual.ja.texi:
Auto merged
include/config-os2.h:
Auto merged
innobase/btr/btr0btr.c:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/btr/btr0sea.c:
Auto merged
innobase/buf/buf0buf.c:
Auto merged
innobase/data/data0data.c:
Auto merged
innobase/dict/dict0crea.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/fsp/fsp0fsp.c:
Auto merged
innobase/ibuf/ibuf0ibuf.c:
Auto merged
innobase/include/buf0buf.ic:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/log/log0log.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/rem/rem0cmp.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0purge.c:
Auto merged
innobase/row/row0umod.c:
Auto merged
innobase/row/row0upd.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
innobase/sync/sync0sync.c:
Auto merged
innobase/trx/trx0roll.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/trx/trx0undo.c:
Auto merged
innobase/ut/ut0ut.c:
Auto merged
isam/pack_isam.c:
Auto merged
mysys/Makefile.am:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/key.cc:
Auto merged
sql/mini_client.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.cc:
Auto merged
support-files/my-huge.cnf.sh:
Auto merged
support-files/my-large.cnf.sh:
Auto merged
support-files/my-medium.cnf.sh:
Auto merged
support-files/my-small.cnf.sh:
Auto merged
Docs/manual.texi:
Merge with 3.23.51
configure.in:
Merge with 3.23.51
include/Makefile.am:
Merge with 3.23.51
innobase/dict/dict0load.c:
Merge with 3.23.51
innobase/include/univ.i:
Merge with 3.23.51
innobase/row/row0mysql.c:
Merge with 3.23.51
innobase/srv/srv0srv.c:
Merge with 3.23.51
innobase/srv/srv0start.c:
Merge with 3.23.51
myisam/mi_cache.c:
Merge with 3.23.51
myisammrg/myrg_rnext.c:
Merge with 3.23.51
myisammrg/myrg_rprev.c:
Merge with 3.23.51
sql/ha_innodb.cc:
Merge with 3.23.51
Changed used of sprintf() to make code portable.
sql/handler.cc:
Indentation change
sql/lex.h:
Comment cleanup
sql/log.cc:
Merge with 3.23.51
sql/log_event.h:
Merge with 3.23.51
sql/mysql_priv.h:
Merge with 3.23.51
sql/mysqld.cc:
Merge with 3.23.51
Cleaned up handling of innodb_flush_log_at_trx_commit
sql/share/portuguese/errmsg.txt:
Merge with 3.23.51
sql/slave.cc:
Not merged as this affects many files; Will be fixed in next changeset
sql/slave.h:
Merge with 3.23.51
sql/sql_acl.cc:
Merge with 3.23.51 (no changes)
sql/sql_db.cc:
Merge with 3.23.51
sql/sql_parse.cc:
Merge with 3.23.51
sql/sql_yacc.yy:
Merge with 3.23.51
(Renamed NO_FOREIGN_KEY_CHECKS and RELAXED_UNIQUE_CHECKS)
support-files/mysql.spec.sh:
Merge with 3.23.51
Made a some new buffers thread specific and changeable.
Resize of key_buffer.
AUTO_COMMIT -> AUTOCOMMIT
Fixed mutex bug in DROP DATABASE
Fixed bug when using auto_increment as second part of a key where first part could include NULL.
Split handler->extra() to extra() and extra_opt() to be able to support thread specific buffers.
Don't write message to error log when slave reconnects becasue of timeout.
Fixed possible update problem when using DELETE/UPDATE on small tables
(In some cases we used index even if table scanning would be better)
A lot of minior code cleanups
BitKeeper/deleted/.del-net.c~ef21d6402bb882f9:
Delete: libmysql/net.c
BitKeeper/etc/ignore:
added libmysql/net.c
Docs/manual.texi:
New SET syntax & system variables.
client/client_priv.h:
moved order of include files
client/mysql.cc:
Removed compiler warning
client/mysqladmin.c:
Use new SHOW GLOBAL syntax (if server supports it)
configure.in:
version change
include/Makefile.am:
indentation cleanup
include/my_getopt.h:
Made some helper functions global
include/my_sys.h:
Removed not used code
include/myisam.h:
Added extra argument to ..._extra()
include/myisammrg.h:
Added extra argument to ..._extra()
include/mysql_com.h:
changed NET to be able to support changeable system variables
include/mysql_embed.h:
Added MYSQL_SERVER_SUFFIX
include/mysql_version.h.in:
Added check of multiple including (needed for embedded library)
include/mysqld_error.h:
New error messages
innobase/dict/dict0dict.c:
Remove compiler warnings
innobase/include/ut0mem.h:
Remove compiler warnings
innobase/include/ut0mem.ic:
Remove compiler warnings
isam/isamchk.c:
new init_key_cache() arguments
isam/isamlog.c:
new init_key_cache() arguments
isam/test2.c:
new init_key_cache() arguments
isam/test3.c:
new init_key_cache() arguments
libmysql/Makefile.am:
Removed net.c (Automaticly make it from net_serv.cc)
libmysql/Makefile.shared:
Removed net.c (Automaticly make it from net_serv.cc)
libmysql/libmysql.c:
Changeable system variables
libmysqld/Makefile.am:
Added set_var.cc file
libmysqld/embedded_priv.h:
Changed order of include fiels
libmysqld/lib_sql.cc:
merge with mysqld.cc (for changeable variables)
libmysqld/libmysqld.c:
New changeable system variables
myisam/mi_check.c:
Added extra argument to ..._extra()
myisam/mi_extra.c:
Added extra argument to ..._extra()
myisam/mi_open.c:
Removed not used variable
myisam/mi_test1.c:
Changed call to init_key_cache
myisam/mi_test2.c:
Added extra argument to ..._extra()
myisam/mi_test3.c:
Added extra argument to ..._extra()
myisam/mi_write.c:
Add cache size argument to bulk-insert-init
myisam/myisamchk.c:
Use new key cache
myisam/myisamdef.h:
new mi_init_bulk_insert() arguments
myisam/myisamlog.c:
Added extra argument to ..._extra()
myisam/myisampack.c:
Added extra argument to ..._extra()
myisammrg/myrg_extra.c:
Added extra argument to ..._extra()
myisammrg/myrg_rrnd.c:
Added extra argument to ..._extra()
mysql-test/r/insert_select.result:
New changeable system variables
mysql-test/r/key.result:
Test of bug in auto_increment
mysql-test/r/query_cache.result:
New changeable system variables
mysql-test/r/rpl000001.result:
New changeable system variables
mysql-test/r/rpl000016.result:
New changeable system variables
mysql-test/r/union.result:
New changeable system variables
mysql-test/r/user_var.result:
New changeable system variables
mysql-test/r/variables.result:
New changeable system variables
mysql-test/t/key.test:
Test of bug in auto_increment
mysql-test/t/query_cache.test:
New changeable system variables
mysql-test/t/rpl000001.test:
New changeable system variables
mysql-test/t/rpl000009.test:
New changeable system variables
mysql-test/t/rpl000016.test:
New changeable system variables
mysql-test/t/rpl_compat.test:
New changeable system variables
mysql-test/t/union.test:
New changeable system variables
mysql-test/t/user_var.test:
New changeable system variables
mysql-test/t/variables.test:
New changeable system variables
mysys/default.c:
Bigger default memory allocation
mysys/mf_iocache.c:
Removed compiler warning
mysys/mf_keycache.c:
Made key cache resizable on the fly
Removed not needed extra argument to init_key_cache()
mysys/my_getopt.c:
Made some helper functions global
sql/Makefile.am:
Aded set_var.cc
sql/convert.cc:
Comment cleanup
sql/field.cc:
new changeable system variables
sql/filesort.cc:
new changeable system variables
sql/ha_berkeley.cc:
AUTO_COMMIT -> AUTOCOMMIT
sql/ha_innodb.cc:
new changeable system variables
sql/ha_myisam.cc:
Added extra argument to ..._extra()
sql/ha_myisam.h:
Added extra argument to ..._extra()
sql/ha_myisammrg.cc:
Added extra argument to ..._extra()
sql/ha_myisammrg.h:
Added extra argument to ..._extra()
sql/handler.cc:
Added extra argument to ..._extra()
Added resize of key cache
Change ha_table_typelib for use with new system variables
sql/handler.h:
Added extra argument to ..._extra()
sql/item.cc:
new changeable system variables
sql/item.h:
Added better support of Item_uint
sql/item_func.cc:
Added support for SET @@[global | session] system_variable
sql/item_strfunc.cc:
new changeable system variables
sql/key.cc:
Fixed bug in auto_increment on second part keys
sql/lex.h:
Removed not needed keywords
sql/log.cc:
new changeable system variables
sql/log_event.cc:
new changeable system variables
sql/log_event.h:
Removed not needed var reference
sql/mini_client.cc:
new changeable system variables
code cleanup
sql/mini_client.h:
Indentation cleanup
sql/mysql_priv.h:
Changed order of include files & variables to make file more readable
sql/mysqld.cc:
Changed order of variables to make file more readable.
Support for changeable variables
Rename of system variables
Moved init_vars to set_var.cc
Changed output of --help
sql/net_pkg.cc:
Added my_net_local_init() to make it possible to set different defaults for network connection depending if you are a client, embedded library or server.
sql/net_serv.cc:
new changeable system variables
To support this, some global variables had to be move to the NET structure.
sql/records.cc:
new changeable system variables
use extra_opt()
sql/repl_failsafe.cc:
new changeable system variables
minior code cleanups
sql/repl_failsafe.h:
removed not needed external var reference
sql/share/czech/errmsg.txt:
new changeable system variables
sql/share/danish/errmsg.txt:
new changeable system variables
sql/share/dutch/errmsg.txt:
new changeable system variables
sql/share/english/errmsg.txt:
new changeable system variables
sql/share/estonian/errmsg.txt:
new changeable system variables
sql/share/french/errmsg.txt:
new changeable system variables
sql/share/german/errmsg.txt:
new changeable system variables
sql/share/greek/errmsg.txt:
new changeable system variables
sql/share/hungarian/errmsg.txt:
new changeable system variables
sql/share/italian/errmsg.txt:
new changeable system variables
sql/share/japanese/errmsg.txt:
new changeable system variables
sql/share/korean/errmsg.txt:
new changeable system variables
sql/share/norwegian-ny/errmsg.txt:
new changeable system variables
sql/share/norwegian/errmsg.txt:
new changeable system variables
sql/share/polish/errmsg.txt:
new changeable system variables
sql/share/portuguese/errmsg.txt:
new changeable system variables
sql/share/romanian/errmsg.txt:
new changeable system variables
sql/share/russian/errmsg.txt:
new changeable system variables
sql/share/slovak/errmsg.txt:
new changeable system variables
sql/share/spanish/errmsg.txt:
new changeable system variables
sql/share/swedish/errmsg.txt:
new changeable system variables
sql/share/ukrainian/errmsg.txt:
new changeable system variables
sql/slave.cc:
new changeable system variables
Added some suppression of error messages
Initialize current_thd for all slave threads.
sql/sql_acl.cc:
Added checking of arguments for SET PASSWORD (for new SET defintion)
sql/sql_acl.h:
new prototypes
sql/sql_base.cc:
new changeable system variables
sql/sql_cache.cc:
new changeable system variables
sql/sql_cache.h:
Renamed some arguments to make code more readable
sql/sql_class.cc:
new changeable system variables
sql/sql_class.h:
New changeable system variables
Code cleanup
sql/sql_db.cc:
Fixed bug in DROP DATABASE
sql/sql_delete.cc:
Usage of wrong define in test (possible speed problem)
sql/sql_insert.cc:
use extra_opt()
Code cleanup
sql/sql_lex.cc:
Added support for SET @@[global | session] system_variable
sql/sql_lex.h:
Added support for SET @@[global | session] system_variable
sql/sql_load.cc:
Cleanup for embedded library
Use extra_opt()
sql/sql_parse.cc:
Cleanup for embedded library
New changeable system variables
sql/sql_repl.cc:
new changeable system variables
sql/sql_repl.h:
Fixed variable definitions
sql/sql_select.cc:
new changeable system variables
sql/sql_show.cc:
New changeable system variables
sql/sql_table.cc:
Fixed bug in DROP DATABASE
sql/sql_union.cc:
New changeable system variables
sql/sql_update.cc:
Usage of wrong define in test (possible speed problem)
sql/sql_yacc.yy:
New changeable system variables
sql/structs.h:
Added typedef for SHOW_VAR
sql/table.cc:
Fixed bug in auto_increment on second part keys
sql/uniques.cc:
Comment fix
sql/unireg.h:
A
code cleanup
Docs/manual.texi:
changelog
sql/ha_innobase.cc:
Removed compiler warning
sql/slave.cc:
Cleanup comments and indentation for suppressing connect warnings
sql/sql_db.cc:
clean up comment
sql/sql_delete.cc:
Fix wrong usage of constant which could cause mysqld to use index when doing an update/delete on small tables.
sql/sql_update.cc:
Fix wrong usage of constant which could cause mysqld to use index when doing an update/delete on small tables.
Suppress prints by slave.cc when there is a normal reconnect after the master has been quiet for the time of the net read timeout; this removes the Error 1159 messages many users have complained about in the replication of 3.23.51
sql/slave.cc:
Suppress prints by slave.cc when there is a normal reconnect after the master has been quiet for the time of the net read timeout; this removes the Error 1159 messages many users have complained about in the replication of 3.23.51
include/my_sys.h:
Removed not needed macro (SAFE_MUTEX can handle this case better).
sql/log.cc:
Simple optimization
sql/log_event.cc:
Fix problem in LOAD DATA if table_name is NULL (unlikely event)
sql/log_event.h:
cleanup
sql/slave.cc:
remove unnecessary assert
(Needed for query cache for systems which doesn't have native semaphores)
mysys/my_getopt.c:
Safety fix.
mysys/my_winsem.c:
Shange all semaphore code to be uniform
mysys/thr_rwlock.c:
cleanup
sql/gen_lex_hash.cc:
Error message if wrong number of arguments.
sql/slave.cc:
R
Slave thread is always in an auto-commit state: remove unnecessary tests when we flush master info
sql/slave.cc:
Slave thread is always in an auto-commit state: remove unnecessary tests when we flush master info
Do not flush the position to master.info file if we have a transaction open
sql/slave.cc:
Do not flush the position to master.info file if we have a transaction open
sql/slave.h:
Do not flush the position to master.info file if we have a transaction open
SHOW DATABASES
CREATE TEMPORARY TABLE
LOCK TABLES
REPLICATION SLAVE & REPLICATION CLIENT
SUPER
EXECUTE
All scripts & documentation is updated for this change.
Added better error messages for global privileges
BitKeeper/deleted/.del-mysql_new_fix_privilege_tables.sh~b1664b401375eece:
Delete: scripts/mysql_new_fix_privilege_tables.sh
Docs/manual.texi:
Updated manual for privilege changes.
include/mysqld_error.h:
new error messages
mysql-test/install_test_db.sh:
Updated to use new privileges
mysql-test/r/grant_cache.result:
Updated to use new privileges
mysql-test/r/rpl000017.result:
Updated to use new privileges
mysql-test/t/rpl000017.test:
Updated to use new privileges
mysys/safemalloc.c:
Cleanup
scripts/mysql_fix_privilege_tables.sh:
Updated to use new privileges
scripts/mysql_install_db.sh:
Updated to use new privileges
sql/field.h:
Cleanup
sql/item_strfunc.cc:
Updated to use new privileges
sql/lex.h:
Updated to use new privileges
sql/log.cc:
Updated to use new privileges
sql/mysql_priv.h:
Updated to use new privileges
sql/mysqld.cc:
Updated to use new privileges
sql/repl_failsafe.cc:
Updated to use new privileges
sql/share/czech/errmsg.txt:
new error messages
sql/share/danish/errmsg.txt:
new error messages
sql/share/dutch/errmsg.txt:
new error messages
sql/share/english/errmsg.txt:
new error messages
sql/share/estonian/errmsg.txt:
new error messages
sql/share/french/errmsg.txt:
new error messages
sql/share/german/errmsg.txt:
new error messages
sql/share/greek/errmsg.txt:
new error messages
sql/share/hungarian/errmsg.txt:
new error messages
sql/share/italian/errmsg.txt:
new error messages
sql/share/japanese/errmsg.txt:
new error messages
sql/share/korean/errmsg.txt:
new error messages
sql/share/norwegian-ny/errmsg.txt:
new error messages
sql/share/norwegian/errmsg.txt:
new error messages
sql/share/polish/errmsg.txt:
new error messages
sql/share/portuguese/errmsg.txt:
new error messages
sql/share/romanian/errmsg.txt:
new error messages
sql/share/russian/errmsg.txt:
new error messages
sql/share/slovak/errmsg.txt:
new error messages
sql/share/spanish/errmsg.txt:
new error messages
sql/share/swedish/errmsg.txt:
new error messages
sql/share/ukrainian/errmsg.txt:
new error messages
sql/slave.cc:
Portability cleanup
sql/sql_acl.cc:
Updated to use new privileges
sql/sql_acl.h:
Updated to use new privileges
sql/sql_base.cc:
Remove not used include file
sql/sql_class.cc:
Comment cleanup
sql/sql_class.h:
Updated to use new privileges
Comment cleanups
sql/sql_insert.cc:
Updated to use new privileges
sql/sql_lex.h:
Indentation cleanup
sql/sql_parse.cc:
Updated to use new privileges
sql/sql_repl.cc:
Updated to use new privileges
Comment cleanup
sql/sql_show.cc:
Updated to use new privileges
sql/sql_yacc.yy:
Updated to use new privileges
Sorted some tockens for easer merge to 4.1 in the future.
sql/table.h:
Updated to use new privileges
tests/grant.pl:
Updated to use new privileges
tests/grant.res:
Updated to use new privileges
Fixed critical bug on 64 bit systems.
Cleanups
BUILD/compile-solaris-sparc-purify:
Added --debug option.
sql/log_event.cc:
Added DBUG_xxx statements.
Cleanup
sql/opt_range.h:
Dummy fix to remove warnings in purify
sql/repl_failsafe.cc:
Cleanup
sql/slave.cc:
Added DBUG statements to be able to find bugs.
Optimized code.
Fixed critical bug on 64 bit systems.
sql/sql_repl.cc:
Added DBUG_xx statements.
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
BUILD/compile-pentium-debug:
Auto merged
BitKeeper/triggers/post-commit:
Auto merged
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
extra/mysql_install.c:
Auto merged
extra/resolve_stack_dump.c:
Auto merged
extra/resolveip.c:
Auto merged
include/my_sys.h:
Auto merged
include/mysqld_error.h:
Auto merged
isam/pack_isam.c:
Auto merged
libmysql/Makefile.shared:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/ft_dump.c:
Auto merged
myisam/ft_test1.c:
Auto merged
myisam/ftdefs.h:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_test1.c:
Auto merged
myisam/mi_write.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/t/select_found.test:
Auto merged
mysys/charset.c:
Auto merged
mysys/default.c:
Auto merged
mysys/hash.c:
Auto merged
sql/field.cc:
Auto merged
sql/gen_lex_hash.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/hostname.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/dutch/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/sql_update.cc:
Auto merged
sql/structs.h:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
strings/Makefile.am:
Auto merged
strings/ctype-ujis.c:
Auto merged
tools/mysqlmanager.c:
Auto merged
sql/slave.cc:
Released some variables in non-debug version. These are needed
in mysqld.cc my_getopt struct, which defines some options,
which are used by mysql_test in a non-debug version.
sql/sql_repl.cc:
Released some variables in non-debug version. These are needed
in mysqld.cc my_getopt struct, which defines some options,
which are used by mysql_test in a non-debug version.
bison 1.34 yacc rule compliance
more robust handling of relay log corruption
mysql-test/r/rpl000014.result:
updated result
mysql-test/r/rpl_log.result:
updated result
sql/mysqld.cc:
reckless slave option
sql/slave.cc:
reckless slave + more robust handling of relay log corruption
sql/slave.h:
reckless slave
sql/sql_yacc.yy:
brought the rules into compliance with bison 1.34 by adding ';' at the end of each rule
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BUILD/FINISH.sh:
Auto merged
BUILD/SETUP.sh:
Auto merged
BUILD/compile-pentium-debug:
Auto merged
acconfig.h:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
heap/hp_rfirst.c:
Auto merged
heap/hp_rnext.c:
Auto merged
include/my_sys.h:
Auto merged
include/myisam.h:
Auto merged
libmysql/Makefile.shared:
Auto merged
myisam/mi_write.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/heap.test:
Auto merged
mysql-test/t/select_found.test:
Auto merged
mysql-test/t/union.test:
Auto merged
mysys/mf_iocache2.c:
Auto merged
mysys/my_vsnprintf.c:
Auto merged
sql/convert.cc:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/structs.h:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
strings/Makefile.am:
Auto merged
DBUG_ macro cleanup
buffer boundary cleanup
This changeset, although not fully tested, works for me better than
anything I've had so far, including what is in the repository. I will
push it unless something crashes while I am writing this :-)
mysql-test/r/rpl000014.result:
updated result
mysql-test/r/rpl000015.result:
updated result
mysql-test/r/rpl000016.result:
updated result
mysql-test/r/rpl_log.result:
new result
mysys/mf_iocache.c:
DBUG_ cleanup
mysys/mf_iocache2.c:
DBUG_ fix
sql/log.cc:
added relay_log_space_limit
sql/mysqld.cc:
relay_log_space_limit
sql/slave.cc:
relay_log_space_limit
sql/slave.h:
relay_log_space_limit
sql/sql_class.h:
relay_log_space_limit
sql/sql_repl.cc:
fixed buffer overrun bug
If no problems are discovered in the next week, this will make the replication
code ready for 4.0.2 release.
dbug/dbug.c:
cleanup of my previous fix
sql/mysqld.cc:
fixed a REALLY NASTY BUG - slave threads were being launched before
initialization of global thread keys. Thus if the slave thread was slow
to start everything worked fine, but if it started quickly, we would get
into trouble using the unitinialized keys
sql/net_pkg.cc:
make net_printf() work with 0 error code taking the third argument as
format string in that case
sql/slave.cc:
misc fix-ups and debugging instrumentations
sql/slave.h:
added skip_log_purge member
sql/sql_class.cc:
debugging instrumentation to track down random memory corruption
sql/sql_class.h:
added debugging sentry to THD to track down memory corruption
sql/sql_repl.cc:
fixed bugs in CHANGE MASTER
into mysql.sashanet.com:/reiser-data/mysql-4.0
sql/lex.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
memory corruption I can only repeat on one system.
mysql-test/r/multi_update.result:
extended test trying to find why the old one was failing
mysql-test/r/rpl000015.result:
result update
mysql-test/t/multi_update.test:
updated test to do more intermediate result checks
mysql-test/t/rpl000014.test:
cosmetic change
mysql-test/t/rpl000015-slave-master-info.opt:
reduce connect retry trying to simulate a bug
mysql-test/t/rpl000015.test:
cosmetic change
sql/lex.h:
added RELAY_LOG_FILE and RELAY_LOG_POS to CHANGE MASTER TO
sql/log.cc:
fixed replication bug
sql/log_event.cc:
properly ignore replication errors according to error mask
sql/mysqld.cc:
handle SIGFPE in the coredump handler
sql/slave.cc:
do not kick slave if it has already exited and freed the structures
sql/sql_lex.cc:
fixed initialization bug in CHANGE MASTER TO
sql/sql_lex.h:
CHANGE MASTER TO .. RELAY_LOG_FILE=,RELAY_LOG_POS=
sql/sql_repl.cc:
CHANGE MASTER TO .. RELAY_LOG_FILE=,RELAY_LOG_POS=
sql/sql_yacc.yy:
CHANGE MASTER TO .. RELAY_LOG_FILE=,RELAY_LOG_POS=
client/mysql.cc:
new ctypes
client/mysqldump.c:
new ctypes
client/mysqltest.c:
new ctypes
client/sql_string.cc:
new ctypes
client/sql_string.h:
new ctypes
extra/mysql_install.c:
new ctypes
extra/replace.c:
new ctypes
extra/resolve_stack_dump.c:
new ctypes
extra/resolveip.c:
new ctypes
heap/hp_hash.c:
new ctypes
include/m_ctype.h:
new ctypes
include/my_sys.h:
new ctypes
isam/_key.c:
new ctypes
isam/_search.c:
new ctypes
libmysql/Makefile.shared:
new ctypes
libmysql/libmysql.c:
new ctypes
myisam/ft_dump.c:
new ctypes
myisam/ft_parser.c:
new ctypes
myisam/mi_test1.c:
new ctypes
mysys/charset.c:
new ctypes
mysys/default.c:
new ctypes
mysys/getvar.c:
new ctypes
mysys/hash.c:
new ctypes
mysys/mf_casecnv.c:
new ctypes
mysys/mf_dirname.c:
new ctypes
mysys/mf_format.c:
new ctypes
mysys/mf_iocache2.c:
new ctypes
mysys/mf_soundex.c:
new ctypes
mysys/mf_wfile.c:
new ctypes
mysys/my_error.c:
new ctypes
mysys/my_getwd.c:
new ctypes
mysys/my_init.c:
new ctypes
mysys/my_vsnprintf.c:
new ctypes
mysys/typelib.c:
new ctypes
sql/convert.cc:
new ctypes
sql/des_key_file.cc:
new ctypes
sql/field.cc:
new ctypes
sql/field.h:
new ctypes
sql/field_conv.cc:
new ctypes
sql/filesort.cc:
new ctypes
sql/ha_innodb.cc:
new ctypes
sql/hostname.cc:
new ctypes
sql/init.cc:
new ctypes
sql/item.cc:
new ctypes
sql/item_func.cc:
new ctypes
sql/item_strfunc.cc:
new ctypes
sql/item_sum.cc:
new ctypes
sql/item_timefunc.cc:
new ctypes
sql/key.cc:
new ctypes
sql/log.cc:
new ctypes
sql/mysql_priv.h:
new ctypes
sql/mysqld.cc:
new ctypes
sql/opt_range.cc:
new ctypes
sql/procedure.cc:
new ctypes
sql/slave.cc:
new ctypes
sql/sql_acl.cc:
new ctypes
sql/sql_analyse.cc:
new ctypes
sql/sql_base.cc:
new ctypes
sql/sql_cache.cc:
new ctypes
sql/sql_db.cc:
new ctypes
sql/sql_handler.cc:
new ctypes
sql/sql_lex.cc:
new ctypes
sql/sql_parse.cc:
new ctypes
sql/sql_show.cc:
new ctypes
sql/sql_string.cc:
new ctypes
sql/sql_string.h:
new ctypes
sql/sql_table.cc:
new ctypes
sql/sql_yacc.yy:
new ctypes
sql/table.cc:
new ctypes
sql/time.cc:
new ctypes
strings/Makefile.am:
new ctypes
strings/ctype-big5.c:
new ctypes
strings/ctype-czech.c:
new ctypes
strings/ctype-gbk.c:
new ctypes
strings/ctype-latin1_de.c:
new ctypes
strings/ctype-sjis.c:
new ctypes
strings/ctype-tis620.c:
new ctypes
strings/ctype.c:
new ctypes
strings/str2int.c:
new ctypes
strings/strto.c:
new ctypes
tools/mysqlmanager.c:
new ctypes
not yet tested - will not be pushed for a few hours - need to commit in
order to pull
BUILD/compile-pentium-debug:
link statically
sql/slave.cc:
properly seek the position when recovering from a partial read
of one of our users which replicates from a live server. So I now have a
lot of confidence in it and will push. It passes all tests, so I if I broke
somebody's code in 3.23 merge this is your fault - you should have had a good test
case :-)
sql/slave.cc:
added DBUG_ASSERT()
sql/slave.h:
fixed cache initialization problem
fixed replication bug - flush_master_info() needs to be called every time we read an
event from master
this is will not be pushed yet
mysys/my_vsnprintf.c:
make my_vsnprintf() work with oversized strings
corrected Swedish "skipp" in the comments
sql/log.cc:
wrong change - to be undone
sql/slave.cc:
fixed bug - flush_master_info() needs to be called every time we read an
event from master
got LOAD DATA INFILE replication from 3.23 master to 4.0 slave to work
for some reason query_cache now fails - will push anyway and document the
failure if I can repeat it.
client/mysqltest.c:
added require_version
mysql-test/mysql-test-run.sh:
added --master-binary=,--slave-binary=,--old-master options
sleep_until_file_exists -> sleep_until_file_created
sql/slave.cc:
fixed bug in LOAD DATA INFILE replication from 3.23 master
fixed bug in LOAD DATA FROM MASTER
fixed rpl000001.result
Slave now replicates 3.23 master, with the exception of LOAD DATA INFILE,
which is still buggy. Will push this one after the pull/merge
mysql-test/r/rpl000001.result:
fixed bug in result
sql/log_event.cc:
fixes for slave backward compat
sql/log_event.h:
fixes for slave backward compat
sql/mysql_priv.h:
fixes for slave backward compat
sql/net_serv.cc:
fixes for slave backward compat
sql/repl_failsafe.cc:
fixed bug in LOAD DATA FROM MASTER
sql/slave.cc:
fixes for slave backward compat
sql/slave.h:
fixes for slave backward compat
sql/sql_load.cc:
fixes for slave backward compat
Docs/manual.texi:
More information about UNSIGNED BIGINT arithmetic
sql/slave.cc:
Make binary logs 4G safe
sql/slave.h:
Make binary logs 4G safe
sql/sql_rename.cc:
cleanup
mysql-test/t/rpl000001.test:
modified test to break current replicatioin on a large log with a large lag
in slave thread between append and read of the relay log
mysys/mf_iocache.c:
fixed one bug in IO_CACHE but there is another one not fixed yet
sql/slave.cc:
fixed bug in 3.23 master replication
Test of unsigned BIGINT values
Fixes for queries-per-hour
Cleanup of replication code (comments and portability fixes)
Make most of the binary log code 4G clean
Changed syntax for GRANT ... QUERIES PER HOUR
Docs/manual.texi:
Fixed Changelog, upgrading to 4.0 and 4.1 TODO sections.
Docs/mysqld_error.txt:
Added error message.
configure.in:
Fix for autoconf 2.52
include/my_getopt.h:
Portability fix.
include/my_global.h:
Portablity fix.
include/mysqld_error.h:
New error messages
mysql-test/r/bigint.result:
Test of unsigned BIGINT values.
mysql-test/r/func_op.result:
Test of unsigned BIGINT values.
mysql-test/r/varbinary.result:
Test of unsigned BIGINT values.
mysql-test/t/bigint.test:
Test of unsigned BIGINT values.
sql/item_func.h:
Optimized Item_int_func() usage.
sql/lock.cc:
Cleanup comments
sql/log.cc:
Cleanup
sql/log_event.cc:
Cleanup and portability fixes.
sql/log_event.h:
Cleanup and portability fixes.
sql/mini_client.cc:
Cleanup and portability fixes.
sql/mysqld.cc:
Fix for queries-per-hour
sql/repl_failsafe.cc:
Prepare for making binary log 2G clean.
sql/share/czech/errmsg.txt:
New error messages
sql/share/danish/errmsg.txt:
New error messages
sql/share/dutch/errmsg.txt:
New error messages
sql/share/english/errmsg.txt:
New error messages
sql/share/estonian/errmsg.txt:
New error messages
sql/share/french/errmsg.txt:
New error messages
sql/share/german/errmsg.txt:
New error messages
sql/share/greek/errmsg.txt:
New error messages
sql/share/hungarian/errmsg.txt:
New error messages
sql/share/italian/errmsg.txt:
New error messages
sql/share/japanese/errmsg.txt:
New error messages
sql/share/korean/errmsg.txt:
New error messages
sql/share/norwegian-ny/errmsg.txt:
New error messages
sql/share/norwegian/errmsg.txt:
New error messages
sql/share/polish/errmsg.txt:
New error messages
sql/share/portuguese/errmsg.txt:
New error messages
sql/share/romanian/errmsg.txt:
New error messages
sql/share/russian/errmsg.txt:
New error messages
sql/share/slovak/errmsg.txt:
New error messages
sql/share/spanish/errmsg.txt:
New error messages
sql/share/swedish/errmsg.txt:
New error messages
sql/share/ukrainian/errmsg.txt:
New error messages
sql/slave.cc:
Cleanup
sql/slave.h:
Cleanup
sql/sql_acl.cc:
Cleanup and removal of possible reserved words
sql/sql_base.cc:
More DBUG
sql/sql_cache.cc:
Cleanup & portability fixes
sql/sql_class.h:
Make binary log 4G clean
sql/sql_delete.cc:
More DBUG
sql/sql_handler.cc:
Cleanup & portability fixes
sql/sql_parse.cc:
Cleanup of queries-per-hours code
sql/sql_rename.cc:
Add missing DBUG_RETURN
sql/sql_repl.cc:
Cleanup & portability fixes
sql/sql_select.cc:
Cleanup & portability fixes
sql/sql_show.cc:
Cleanup & portability fixes
sql/sql_update.cc:
Small cleanup of multi-update-code (need second pass)
sql/sql_yacc.yy:
Changed syntax for GRANT ... QUERIES PER HOUR
strings/str2int.c:
Cleanup & portability fixes
likely() and unlikely() branch prediction compiler hint macros
clean-up of comments
include/my_global.h:
added likely() and unlikely() macros to help some compilers optimize
the code for architecture-specific branch prediction policies
include/my_sys.h:
coverted my_b_append_tell() from macro to a function as it needed to be more
complex to avoid a potential race condition
mysql-test/mysql-test-run.sh:
hostname-independent relay log name to have consistent SHOW SLAVE STATUS
output
mysql-test/r/rpl000014.result:
result update
mysql-test/r/rpl000015.result:
result update
mysql-test/r/rpl000016.result:
result update
mysql-test/r/rpl_log.result:
result update
mysql-test/t/rpl000017-slave.sh:
proper cleanup of old logs
mysys/mf_iocache.c:
cosmetic changes + more debugging asserts
mysys/mf_iocache2.c:
my_b_append_tell()
cleanup of comments
sql/log.cc:
fix potential bug - do not rotate log in the middle of event
sql/slave.cc:
do not write stop events when the server does not actually stop but just
rotates the log
fixed race between queue_event() and show_slave_status()
clean-up of comments
sql/slave.h:
added ignore_stop_event flag to SLAVE_LOG_INFO
fixed a couple of bugs with SEQ_READ_APPEND cache
rpl000016 still has non-deterministic result, but I am going to commit and
push since what I have is now better than what is in the main repository
client/mysqltest.c:
added wait_for_slave_to_stop
cleaned up TODO and comments
include/my_sys.h:
fixed race in flush_io_cache in SEQ_READ_APPEND cache
mysql-test/r/rpl000016.result:
updated result
mysql-test/t/rpl000016.test:
use wait_for_slave_to_stop to have deterministic slave behaviour for the test
mysys/mf_iocache.c:
fixed race in flush_io_cache()
fixed failure to unlock mutex in my_b_append()
sql/log.cc:
be compatible with 3.23 master
sql/log_event.cc:
3.23 master compat
sql/slave.cc:
3.23 master compat
sql/sql_class.h:
compat with 3.23 master
fixed too quick timeout in mysql-test-run which caused a race with the
new server getting started before the old one completely finished
shutdown. This should fix the pid warning we've been getting as well as
inconsistent results when running tests with the manager
libmysqld/lib_sql.cc:
post-merge fix
mysql-test/mysql-test-run.sh:
fixed start/stop timeout and cleanup of log directory
mysql-test/r/rpl000014.result:
post-merge fix
mysql-test/r/rpl000015.result:
post-merge fix
mysql-test/r/rpl000016.result:
post-merge fix
mysql-test/r/rpl_log.result:
post-merge fix
sql/log_event.cc:
post-merge fix
sql/slave.cc:
post-merge fix
sql/slave.h:
post-merge fix
sql/sql_class.h:
post-merge fix
tools/mysqlmanager.c:
added debug message
first pull, merge,test, and get it to work.
The main change is the new replication code - now we have two slave threads
SQL thread and I/O thread. I have also re-written a lot of the code to
prepare for multi-master implementation.
I also documented IO_CACHE quite extensively and to some extend, THD class.
Makefile.am:
moved tags target script into a separate file
include/my_sys.h:
fixes in IO_CACHE for SEQ_READ_APPEND + some documentation
libmysqld/lib_sql.cc:
updated replication locks, but now I see I did it wrong and it won't compile. Will fix
before the push.
mysql-test/r/rpl000014.result:
test result update
mysql-test/r/rpl000015.result:
test result update
mysql-test/r/rpl000016.result:
test result update
mysql-test/r/rpl_log.result:
test result update
mysql-test/t/rpl000016-slave.sh:
remove relay logs
mysql-test/t/rpl000017-slave.sh:
remove relay logs
mysql-test/t/rpl_log.test:
updated test
mysys/mf_iocache.c:
IO_CACHE updates to make replication work
mysys/mf_iocache2.c:
IO_CACHE update to make replication work
mysys/thr_mutex.c:
cosmetic change
sql/item_func.cc:
new replication code
sql/lex.h:
new replication
sql/log.cc:
new replication
sql/log_event.cc:
new replication
sql/log_event.h:
new replication
sql/mini_client.cc:
new replication
sql/mini_client.h:
new replication
sql/mysql_priv.h:
new replication
sql/mysqld.cc:
new replication
sql/repl_failsafe.cc:
new replication
sql/slave.cc:
new replication
sql/slave.h:
new replication
sql/sql_class.cc:
new replication
sql/sql_class.h:
new replication
sql/sql_lex.h:
new replication
sql/sql_parse.cc:
new replication
sql/sql_repl.cc:
new replication
sql/sql_repl.h:
new replication
sql/sql_show.cc:
new replication
sql/sql_yacc.yy:
new replication
sql/stacktrace.c:
more robust stack tracing
sql/structs.h:
new replication code
BitKeeper/etc/ignore:
Added mysql-test/r/rpl000002.eval mysql-test/r/rpl000014.eval mysql-test/r/rpl000015.eval mysql-test/r/rpl000016.eval mysql-test/r/slave-running.eval mysql-test/r/slave-stopped.eval to the ignore list
Docs/manual.texi:
fixed bad merge
include/my_bitmap.h:
fixed comment format
mysql-test/r/rpl_get_lock.result:
make the test results predicable
mysql-test/t/rpl_get_lock.test:
predicatable test results
mysys/my_bitmap.c:
do not init/destroy mutex if bitmap is not declared thread safe
sql/slave.cc:
clean-up suggested by Monty to make init_slave_skip_errors() more compact
added extra/mysql_install.c - will work on it in 4.0, but it does not hurt
to have it sit in 3.23 tree for now since it will eventually be backported
to 3.23 anyway
Docs/manual.texi:
documented slave-skip-errors
updated change history
extra/resolve_stack_dump.c:
fixed wrong help message
include/my_bitmap.h:
bitmap code updates
mysql-test/r/rpl_get_lock.result:
test for a possible bug in release_lock() replication
mysql-test/t/rpl_get_lock.test:
test for possible bug in release_lock replication
mysys/my_bitmap.c:
bitmap code updates/clean-up
sql/mysqld.cc:
slave-skip-errors
sql/slave.cc:
slave-skip-errors
sql/slave.h:
slave skip errors
Docs/manual.texi:
Auto merged
mysql-test/t/rpl000013.test:
Auto merged
mysql-test/t/rpl000016.test:
Auto merged
extra/resolveip.c:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_select.cc:
Auto merged
fixed skip counter to do the RightThing (TM) when the user messes up.
Still do RightThing when he gets it right.
mysql-test/r/rpl000016.result:
updated test result
mysql-test/t/rpl000013.test:
test alias bug
mysql-test/t/rpl000016.test:
test for proper skip when the user messes up
sql/slave.cc:
proper skip even when the user goofs up
sql/sql_base.cc:
drop real name, not last used alias in the log
--local-master option in mysql-test-run
do not log CREATE TABLE when doing table dump
fix replication to slave off 3.23 master
client/mysqltest.c:
fix to be able to use env vars for socket and port in connect
mysql-test/include/master-slave.inc:
connect to port specified in environment
mysql-test/mysql-test-run.sh:
added --local-master option - will assume master is on port 3306 on localhost
sql/log_event.cc:
fixes to slave off 3.23 master
sql/log_event.h:
fixes to slave off 3.23 master
sql/slave.cc:
do not log CREATE TABLE when doing table dump
moved fail-safe replication routines from sql_repl.cc to repl_failsafe.cc
write start event only in the first log
client/mysqlbinlog.cc:
work to enable reading 3.23 logs
libmysql/Makefile.shared:
added mf_iocache2 to libmysqlclient - needed for mysqlbinlog
mysql-test/mysql-test-run.sh:
added --start-and-exit
mysql-test/r/rpl000002.result:
result clean-up
mysql-test/r/rpl000016.result:
result update
mysql-test/r/rpl_log.result:
result update
mysql-test/t/rpl000016.test:
test cleanup
mysys/mf_iocache.c:
fixed new bug
sql/log.cc:
write start event only on server start or after reset master
sql/log_event.cc:
work to enable reading 3.23 log format
sql/log_event.h:
work to enable reading 3.23 format
sql/repl_failsafe.cc:
code restructuring
sql/repl_failsafe.h:
re-organized code
sql/slave.cc:
check master version
sql/slave.h:
old_format member
sql/sql_class.h:
allow user to specify io cache type
need_start_event member to allow writing start event only in the first log
sql/sql_parse.cc:
code re-organization
sql/sql_repl.cc:
code reorganization
sql/sql_repl.h:
reorganized code
removal of duplicate code in mf_iocache.cc
work on failsafe replication
work on SEQ_READ_APPEND io cache
include/my_sys.h:
updates for SEQ_READ_APPEND
libmysql/Makefile.am:
fix for mysys/mf_iocache.c
libmysql/libmysql.c:
updates for new format of SHOW SLAVE HOSTS
mysql-test/r/rpl000001.result:
test replication of LOAD DATA LOCAL INFILE
mysql-test/r/rpl000002.result:
updated test result
mysql-test/t/rpl000001.test:
test LOAD DATA LOCAL INFILE
mysys/mf_iocache.c:
cleanup to remove duplicate functionality
some work on SEQ_READ_APPEND
sql/mf_iocache.cc:
cleanup to remove duplicate functionality
sql/repl_failsafe.cc:
more work on failsafe replication
sql/repl_failsafe.h:
more work on failsafe replication
sql/slave.cc:
cleanup
more work on failsafe replication
sql/sql_load.cc:
fixed bug on replicating empty file loads
got LOAD DATA LOCAL INFILE to work again, and to be replicated
sql/sql_repl.cc:
cleanup
more work on failsafe replication
sql/sql_repl.h:
more work on failsafe replication
use $MAX_TABLES mysqltest variable to make join test portable
make test now works with the manager on IA64 Linux
client/mysqltest.c:
added MAX_TABLES variable
libmysql/libmysql.c:
portability fixes for 64-bit systems
mysql-test/mysql-test-run.sh:
fixed bug - wrong values of -display in xterm in gdb mode
mysql-test/r/join.result:
make test work on both 32-bit and 64-bit systems
mysql-test/t/join.test:
make test work on both 32-bit and 64-bit systems
sql/mini_client.cc:
64-bit portability fixes
sql/mini_client.h:
64-bit portability fixes
sql/slave.cc:
64-bit portability fixes
tools/mysqlmanager.c:
64-bit portability fixes
a bit more work on failsafe replication
client/mysqltest.c:
added require_manager support
mysql-test/mysql-test-run.sh:
added --no-manager
mysql-test/r/rpl_failsafe.result:
updated result
mysql-test/t/rpl000018.test:
must have manager
mysql-test/t/rpl_failsafe.test:
must have manager
sql/repl_failsafe.cc:
more work
sql/repl_failsafe.h:
more work
sql/slave.cc:
update replication status for fail-safe replication on different events
mysql-test/t/rpl000001.test:
test for coredump on slave while trying to print aborted query
sql/slave.cc:
do not coredump printing aborted query if it has % in it.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-rpm:
Auto merged
Docs/manual.texi:
Auto merged
sql/mysqld.cc:
merge
Don't give an error even if one uses master-ssl options and SSL is
not used.
BitKeeper/etc/logging_ok:
auto-union
client/Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
myisam/mi_check.c:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_show.cc:
Auto merged
strings/strmake.c:
Auto merged
mysql-test/t/rpl000017-slave.sh:
Auto merged
Made replication test portable
Fixed buffer overrun bug in replication
client/Makefile.am:
Fix for make dist
mysql-test/t/rpl000017-slave.sh:
Made replication test portable
sql/slave.cc:
Fixed buffer overrun bug
strings/strmake.c:
More documentation
Fixed bug in UNION
client/mysqlbinlog.cc:
Added error message handling to read_log_event()
heap/hp_write.c:
More debug info
myisam/myisampack.c:
Cleanup
mysql-test/mysql-test-run.sh:
Portability fixes.
mysql-test/r/union.result:
More tests cases for UNION
mysql-test/t/union.test:
More tests cases for UNION
sql/Makefile.am:
Added mysql_embed.h
sql/item.cc:
Fixed bug when using the same table multiple times in union.
sql/log_event.cc:
Removed use of ## construct (Portability problem)
sql/log_event.h:
Added error message handling to read_log_event()
sql/mysql_priv.h:
Added mysql_embed.h
sql/opt_sum.cc:
Cleanup
sql/slave.cc:
cleanup
sql/sql_base.cc:
Integrated table->ref_primary_key into table->part_of_key
sql/sql_union.cc:
Cleanup
sql/table.cc:
Integrated table->ref_primary_key into table->part_of_key
sql/table.h:
Integrated table->ref_primary_key into table->part_of_key
into work.mysql.com:/home/bk/mysql-4.0
Docs/manual.texi:
Auto merged
extra/perror.c:
Auto merged
include/myisam.h:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/rpl000017-slave.sh:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/slave.cc:
Auto merged
Fixed some wrong test cases
Docs/manual.texi:
Changelog
extra/perror.c:
Added BDB table errors
include/myisam.h:
Fix for LOAD DATA FROM MASTER when using tables with checksum
myisam/mi_check.c:
Fix for LOAD DATA FROM MASTER when using tables with checksum
mysql-test/mysql-test-run.sh:
Better logging
mysql-test/r/join.result:
Fixed missing results
mysql-test/r/rpl000006.result:
Updated result
mysql-test/t/join.test:
Fixed wrong test
mysql-test/t/rpl000001.test:
Fixed wrong test
mysql-test/t/rpl000006.test:
Cleanup
mysql-test/t/rpl000017-slave.sh:
Fixed too long password
mysql-test/t/rpl000017.test:
Fixed too long password
sql/ha_myisam.cc:
Fix for LOAD DATA FROM MASTER when using tables with checksum
sql/handler.cc:
Unique error for DEADLOCK
sql/slave.cc:
Fix for LOAD DATA FROM MASTER when using tables with checksum
config.guess:
Auto merged
config.sub:
Auto merged
ltconfig:
Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
Auto merged
client/Makefile.am:
Auto merged
include/errmsg.h:
Auto merged
include/global.h:
Auto merged
include/heap.h:
Auto merged
include/my_sys.h:
Auto merged
include/mysql_com.h:
Auto merged
isam/isamlog.c:
Auto merged
libmysql/libmysql.c:
Auto merged
merge/open.c:
Auto merged
myisam/ft_search.c:
Auto merged
myisam/ftdefs.h:
Auto merged
myisam/mi_test_all.sh:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisamlog.c:
Auto merged
myisam/myisampack.c:
Auto merged
myisam/sort.c:
Auto merged
myisammrg/myrg_open.c:
Auto merged
mysys/hash.c:
Auto merged
mysys/mf_casecnv.c:
Auto merged
mysys/mf_format.c:
Auto merged
mysys/my_lib.c:
Auto merged
mysys/tree.c:
Auto merged
sql-bench/bench-init.pl.sh:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/bdb.test:
Auto merged
mysql-test/t/err000001.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/overflow.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
strings/ctype.c:
Auto merged
Docs/manual.texi:
Change to 3.23 manual.
(I will later add the changes for 4.0 to this copy)
client/mysql.cc:
merge
client/mysqlbinlog.cc:
merge
client/mysqldump.c:
merge
client/mysqltest.c:
merge
client/thread_test.c:
merge
configure.in:
merge
include/my_pthread.h:
merge
include/mysqld_error.h:
merge
libmysql/net.c:
merge
myisam/mi_cache.c:
merge
myisam/mi_check.c:
merge
mysql-test/t/fulltext.test:
merge
mysys/mf_qsort.c:
merge
sql/lock.cc:
merge
sql/md5.c:
merge
sql/mini_client.cc:
merge
sql/share/czech/errmsg.txt:
merge
sql/share/danish/errmsg.txt:
merge
sql/share/dutch/errmsg.txt:
merge
sql/share/english/errmsg.txt:
merge
sql/share/estonian/errmsg.txt:
merge
sql/share/french/errmsg.txt:
merge
sql/share/german/errmsg.txt:
merge
sql/share/greek/errmsg.txt:
merge
sql/share/hungarian/errmsg.txt:
merge
sql/share/italian/errmsg.txt:
merge
sql/share/japanese/errmsg.txt:
merge
sql/share/korean/errmsg.txt:
merge
sql/share/norwegian-ny/errmsg.txt:
merge
sql/share/norwegian/errmsg.txt:
merge
sql/share/polish/errmsg.txt:
merge
sql/share/portuguese/errmsg.txt:
merge
sql/share/romanian/errmsg.txt:
merge
sql/share/russian/errmsg.txt:
merge
sql/share/slovak/errmsg.txt:
merge
sql/share/spanish/errmsg.txt:
merge
sql/share/swedish/errmsg.txt:
merge
sql/sql_load.cc:
merge
sql/sql_repl.cc:
merge
Fix bug in isamlog
Add argument types to function declarations.
Docs/manual.texi:
Updated credits
client/mysql.cc:
Fixes for OS2
client/mysqladmin.c:
Fixes for OS2
client/mysqldump.c:
Fixes for OS2
client/mysqlimport.c:
Fixes for OS2
client/mysqltest.c:
Fixes for OS2
dbug/dbug.c:
Fixes for OS2.
Use new C calling convention.
dbug/factorial.c:
Fixes for OS2.
Use new C calling convention.
include/errmsg.h:
Fix for OS2
include/global.h:
Fixes for OS2.
include/my_pthread.h:
Fixes for OS2.
include/my_sys.h:
Fixes for OS2.
include/mysql_com.h:
Move defines to global.h
include/thr_alarm.h:
Fixes for OS2.
isam/isamchk.c:
Fixes for OS2.
Add arguments to function declarations.
isam/isamlog.c:
Fixes for OS2.
Fix bug in logfile handling.
isam/test1.c:
Add arguments to function decl
isam/test2.c:
Add arguments to function declarations.
isam/test_all.res:
Update result
libmysql/get_password.c:
Fixes for OS2.
libmysql/libmysql.c:
Fixes for OS2.
libmysql/net.c:
Fixes for OS2.
libmysql/violite.c:
Add arguments to function declarations.
merge/_locking.c:
Add argument types to function declarations.
merge/close.c:
Add argument types to function declarations.
merge/create.c:
Add argument types to function declarations.
merge/extra.c:
Add argument types to function declarations.
merge/open.c:
Add argument types to function declarations.
merge/panic.c:
Add argument types to function declarations.
merge/rsame.c:
Add argument types to function declarations.
merge/update.c:
Add argument types to function declarations.
myisam/ft_eval.c:
Portability fix
myisam/ft_search.c:
Portability fix
myisam/ft_test1.c:
Portability fix
myisam/ftdefs.h:
Portability fix
myisam/mi_check.c:
Portability fix
myisam/mi_test1.c:
Portability fix
myisam/mi_test2.c:
Portability fix
myisam/mi_test_all.sh:
Update to test for MACH variable
myisam/myisamlog.c:
Cleanup
myisam/myisampack.c:
Don't use variable 'new'
myisam/sort.c:
Portability fix
myisammrg/myrg_delete.c:
Add argument types to function declarations.
myisammrg/myrg_locking.c:
Add argument types to function declarations.
myisammrg/myrg_open.c:
Add argument types to function declarations.
myisammrg/myrg_panic.c:
Add argument types to function declarations.
mysql-test/t/backup.test:
Fix for OS2
mysql-test/t/show_check.test:
Fix for OS2
mysys/charset.c:
Dont use variable 'new'
mysys/default.c:
Fixes for OS2.
mysys/getopt.c:
Fixes for OS2.
mysys/getopt1.c:
Fixes for OS2.
mysys/list.c:
Don't use variable 'new'
mysys/mf_dirname.c:
Fixes for OS2.
mysys/mf_format.c:
Fixes for OS2.
mysys/mf_path.c:
Fixes for OS2.
mysys/mf_qsort.c:
Portability fix
mysys/mf_tempfile.c:
Fixes for OS2.
mysys/my_clock.c:
Fixes for OS2.
mysys/my_copy.c:
Fixes for OS2.
mysys/my_create.c:
Fixes for OS2.
mysys/my_getwd.c:
Fixes for OS2.
mysys/my_init.c:
Fixes for OS2.
mysys/my_lib.c:
Fixes for OS2.
mysys/my_lock.c:
Fixes for OS2.
mysys/my_malloc.c:
Portability fix
mysys/my_mkdir.c:
Fixes for OS2.
mysys/my_open.c:
Fixes for OS2.
mysys/my_pthread.c:
Fixes for OS2.
mysys/my_realloc.c:
Fixes for OS2.
mysys/my_redel.c:
Fixes for OS2.
mysys/my_static.c:
Fixes for OS2.
mysys/my_tempnam.c:
Fixes for OS2.
mysys/my_thr_init.c:
Fixes for OS2.
mysys/my_write.c:
Fixes for OS2.
mysys/test_charset.c:
Fixes for OS2.
mysys/thr_alarm.c:
Fixes for OS2.
mysys/tree.c:
Fixes for OS2.
sql/field.cc:
Fixes for OS2.
sql/field.h:
Fixes for OS2.
sql/gen_lex_hash.cc:
Fixes for OS2.
sql/hostname.cc:
Fixes for OS2.
sql/item_func.cc:
Fixes for OS2.
sql/item_strfunc.cc:
Fixes for OS2.
sql/log_event.cc:
Fixes for OS2.
sql/md5.c:
Fixes for OS2.
sql/mini_client.cc:
Fixes for OS2.
sql/mysql_priv.h:
Fixes for OS2.
sql/mysqld.cc:
Fixes for OS2.
sql/net_serv.cc:
Fixes for OS2.
sql/slave.cc:
Fixes for OS2.
sql/sql_base.cc:
Fixes for OS2.
sql/sql_db.cc:
Portability fix
sql/sql_insert.cc:
Fixes for OS2.
sql/sql_load.cc:
Fixes for OS2.
sql/sql_parse.cc:
Fixes for OS2.
sql/sql_table.cc:
Fixes for OS2.
sql/sql_udf.cc:
Fixes for OS2.
sql/violite.c:
Fixes for OS2.
strings/ctype-big5.c:
Fixes for OS2.
strings/ctype-gbk.c:
Fixes for OS2.
strings/ctype-sjis.c:
Fixes for OS2.
strings/ctype-tis620.c:
Fixes for OS2.
strings/ctype.c:
Fixes for OS2.
strings/strnlen.c:
Fixes for OS2.
Stop event and bugs the test suite could not catch
Did some big restructuring of binlog event classes - most important
change is that now each event class has exec_event method and one does
not need to modify slave core code to add a new event. Slave code is
now much smaller and easier to read
include/my_sys.h:
pre_code and arg in IO_CACHE
mysql-test/r/rpl_log.result:
updated result for LOAD DATA INFILE fix
mysys/mf_iocache.c:
pre_close routine and arg pointer for callback magic
sql/log.cc:
changed MYSQL_LOG so that write() method is for generic
Log_event - removed redundant code
sql/log_event.cc:
added classes for file events
added exec_event() method to all classes
restructured/cleaned up event classes
sql/log_event.h:
added classes for file events
added exec_event() method to all classes
restructured/cleaned up event classes
sql/mf_iocache.cc:
pre_close/arg
sql/mysqld.cc:
added slave-load-tmpdir and old-rpl-compat options
sql/slave.cc:
changed exec_event() to use Log_event::exec_event()
some routines are now needed in log_event.cc and cannot be static/inline
general cleanup
sql/slave.h:
some routines are now extern because they are called from log_event.cc
sql/sql_class.cc:
added slave_net
sql/sql_class.h:
added slave_net to THD
MYSQL_LOG::write now handles generic Log_event
sql/sql_load.cc:
changes for new handling of LOAD DATA INFILE replication
sql/sql_repl.cc:
added log_loaded_block() callback for IO_CACHE
sql/sql_repl.h:
added structure to pass args to IO_CACHE callback from mysql_load
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
sql/mysqld.cc:
Auto merged
mysql-test/t/bdb.test:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_update.cc:
Auto merged
configure.in:
New version
added a test case for it - took some creative work to figure out
how to make it happen at will
updated the manual
Docs/manual.texi:
fixed wrong info on SLAVE_SKIP_COUNTER
fixed wrong info in BitKeeper tree build instructions
updated change history about bug fix
mysql-test/t/rpl_sporadic_master.test:
tried hard to get slave confused, but failed. nevertheless, a more
exhaustive test case does not hurt
sql/slave.cc:
fixed mysterious offset confusion bug
remove extension from binary log if the user specifies one to avoid
non-rotatable logs
fixed possible use of unitialized IO_CACHE in debug mode
sql/log.cc:
fixed race condition in automatic binlog rotation
sql/mysqld.cc:
remove extension from binary log if the user specifies one to avoid
non-rotatable logs
sql/slave.cc:
fixed race condition with slave thread during server shutdown
sql/sql_class.h:
new_file() needed an argument to know if it was called withing the
log mutex or not
sql/sql_repl.cc:
fixed possible use of unitialized IO_CACHE in debug mode
use truncate table
sql/slave.cc
fixed race condition on server shutdown
sql/sql_repl.cc
fixed uninitialized use of io_cache
mysql-test/t/rpl_sporadic_master.test:
use truncate table
sql/slave.cc:
fixed race condition on server shutdown
sql/sql_repl.cc:
fixed uninitialized use of io_cache
fixed test case to produce same results on txn-enabled binary.
temporary fix - permanent fix is it make mysqld behave the same with
MyISAM on auto_increment insert after delete from tbl_name regardless
of how the binary was compiled
sql/slave.cc
fixed concurrency bug with log_seq
sql/slave.h
last_log_seq needs to be updated atomically with pos
sql/sql_repl.cc
cleared up comment and fixed concurrency bug
mysql-test/t/rpl_sporadic_master.test:
fixed test case to produce same results on txn-enabled binary.
temporary fix - permanent fix is it make mysqld behave the same with
MyISAM on auto_increment insert after delete from tbl_name regardless
of how the binary was compiled
sql/slave.cc:
fixed concurrency bug with log_seq
sql/slave.h:
last_log_seq needs to be updated atomically with pos
sql/sql_repl.cc:
cleared up comment and fixed concurrency bug
added debugging options to master to behave sporadically, and a
test case to make sure the slave can deal with it
BitKeeper/triggers/post-commit:
fixed message
sql/mysqld.cc:
added debugging options to force the master to occasionally break
replication
sql/slave.cc:
cosmetic change to improve readability
sql/sql_repl.cc:
support for --sporadic-binlog-dump-fail and --max-binlog-dump-events
sql/sql_repl.h:
support for --sporadic-binlog-dump-fail and --max-binlog-dump-events
updated rotate event to set new position along with the new log
mysql-test/mysql-test-run.sh:
added --do-test
mysql-test/r/rpl_log.result:
update for new rotate event format
sql/log_event.cc:
rotate event now supports forcing a new position, not just the log
sql/log_event.h:
clean-up of rotate event, support for position force with rotate event
sql/slave.cc:
accept position setting from rotate event
sql/sql_repl.cc:
updates to fake_rotate_event() for the new format
mark a master-forced rotate with a special flag
mysql-test/r/rpl000014.result:
updated result
mysql-test/r/rpl000015.result:
updated result
mysql-test/r/rpl000016.result:
updated result
mysql-test/r/rpl_log.result:
updated result
mysql-test/t/rpl000017-slave.sh:
fix for change in master.info format
mysql-test/t/rpl_log.test:
test for correct last_log_seq in show slave status
sql/log.cc:
mark a master-forced rotate with a special flag
sql/log_event.cc:
show master forced rotate info in SHOW BINLOG EVENTS
sql/log_event.h:
master forced rotation flag
sql/slave.cc:
keep trace of last log sequences in MASTER_INFO
do not rotate on slave, if the rotation on master was forced by its master
sql/slave.h:
keep track of last log sequence number in MASTER_INFO
fixed bugs in log seq - now starting to look good
fixes for SHOW BINLOG EVENTS
will push this one
include/mysqld_error.h:
merged errors from 3.23
mysql-test/mysql-test-run.sh:
wrong quotes in --skip-test
mysql-test/r/drop.result:
updated test
mysql-test/r/rpl_log.result:
updated test
mysql-test/t/drop.test:
updated test
mysql-test/t/rpl_log.test:
fixed bugs in test case
sql/item_sum.h:
remove compiler warning about re-ordered initialization
sql/log.cc:
fixed a bunch of loq_seq bugs
sql/log_event.cc:
fixed log seq bugs, added info for Slave event in SHOW BINLOG EVENTS
sql/share/czech/errmsg.txt:
merged errors from 3.23
sql/share/danish/errmsg.txt:
merged errors from 3.23
sql/share/dutch/errmsg.txt:
merged errors from 3.23
sql/share/english/errmsg.txt:
merged errors from 3.23
sql/share/estonian/errmsg.txt:
merged errors from 3.23
sql/share/french/errmsg.txt:
merged errors from 3.23
sql/share/german/errmsg.txt:
merged errors from 3.23
sql/share/greek/errmsg.txt:
merged errors from 3.23
sql/share/hungarian/errmsg.txt:
merged errors from 3.23
sql/share/italian/errmsg.txt:
merged errors from 3.23
sql/share/japanese/errmsg.txt:
merged errors from 3.23
sql/share/korean/errmsg.txt:
merged errors from 3.23
sql/share/norwegian-ny/errmsg.txt:
merged errors from 3.23
sql/share/norwegian/errmsg.txt:
merged errors from 3.23
sql/share/polish/errmsg.txt:
merged errors from 3.23
sql/share/portuguese/errmsg.txt:
merged errors from 3.23
sql/share/romanian/errmsg.txt:
merged errors from 3.23
sql/share/russian/errmsg.txt:
merged errors from 3.23
sql/share/slovak/errmsg.txt:
merged errors from 3.23
sql/share/spanish/errmsg.txt:
merged errors from 3.23
sql/share/swedish/errmsg.txt:
merged errors from 3.23
sql/slave.cc:
fixed log_seq bugs
preserve originating server id in Intvar events to avoid inifinite loops
include/mysqld_error.h:
new error messages
mysql-test/r/drop.result:
updated result
mysql-test/r/flush.result:
updated result
mysql-test/t/drop.test:
test for proper handling of drop/create database when holding
global read lock
mysql-test/t/flush.test:
test to see if other thread would block on drop database if we
are holding global read lock
sql/log.cc:
preserve originating server id in Intvar log event
sql/share/czech/errmsg.txt:
new error messages
sql/share/danish/errmsg.txt:
new error messages
sql/share/dutch/errmsg.txt:
new error messages
sql/share/english/errmsg.txt:
new error messages
sql/share/estonian/errmsg.txt:
new error messages
sql/share/french/errmsg.txt:
new error messages
sql/share/german/errmsg.txt:
new error messages
sql/share/greek/errmsg.txt:
new error messages
sql/share/hungarian/errmsg.txt:
new error messages
sql/share/italian/errmsg.txt:
new error messages
sql/share/japanese/errmsg.txt:
new error messages
sql/share/korean/errmsg.txt:
new error messages
sql/share/norwegian-ny/errmsg.txt:
new error messages
sql/share/norwegian/errmsg.txt:
new error messages
sql/share/polish/errmsg.txt:
new error messages
sql/share/portuguese/errmsg.txt:
new error messages
sql/share/romanian/errmsg.txt:
new error messages
sql/share/russian/errmsg.txt:
new error messages
sql/share/slovak/errmsg.txt:
new error messages
sql/share/spanish/errmsg.txt:
new error messages
sql/share/swedish/errmsg.txt:
new error messages
sql/slave.cc:
fixed typo in comment
sql/sql_db.cc:
global read lock should block drop/create database
cleanup of register_slave_on_master()
mysql-test/r/rpl000002.result:
new output of show slave hosts
sql/mysqld.cc:
user and password are shown in show slave hosts only if show-slave-auth-info option is on
sql/slave.cc:
cleanup of register_slave_on_master()
sql/sql_repl.cc:
do not show user/pass for slave unless running with show-slave-auth-info
sql/sql_repl.h:
show-slave-auth-info
BitKeeper/etc/logging_ok:
auto-union
include/my_sys.h:
Auto merged
myisam/myisamchk.c:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/sql_table.cc:
Auto merged
test case included ( drop) - currently fails, along with rpl000009
mysql-test/r/drop.result:
new test
mysql-test/t/drop.test:
expose a bug in the new symlink table code
sql/slave.cc:
turn off symlink bit to avoid a bug
sql/sql_repl.cc:
turn off symlink bit to avoid a bug
error message if the table open or the index creation failed.
Updated portuguese error messages.
Fix for OS/2 that affected CHECK TABLE.
Docs/manual.texi:
Changelog.
libmysql/errmsg.c:
Updated portuguese error messages
mysys/my_copy.c:
Fix for OS/2
sql/net_pkg.cc:
cleanup
sql/share/portuguese/errmsg.txt:
Updated portuguese error messages
sql/slave.cc:
Cleanup.
Fixed bug that caused client to hang because mysqld never did
send an error message if the table open or the index creation failed.
sql/sql_parse.cc:
Moved handling of 'no_send_ok' to fetch_nx_table.
sql/sql_table.cc:
Cleanup.
into work.mysql.com:/home/bk/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
include/my_sys.h:
Auto merged
libmysql/Makefile.shared:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
info on how to connect to the slave for the clients that connect to
the master, but would like to know where the slaves are
include/mysql_com.h:
register slaves
mysql-test/mysql-test-run.sh:
parameters to test slave registration
mysql-test/r/rpl000002.result:
test of slave registration
mysql-test/t/rpl000002.test:
test slave registration
sql/mysql_priv.h:
slave registration
sql/mysqld.cc:
slave registration
sql/slave.cc:
slave registration
sql/slave.h:
slave registration
sql/sql_lex.h:
slave registration
sql/sql_parse.cc:
slave registration
sql/sql_repl.cc:
slave registration
sql/sql_repl.h:
slave registration
sql/sql_yacc.yy:
slave registration
include/mysqld_error.h:
new errors
mysql-test/r/rpl000009.result:
test load data from master
mysql-test/t/rpl000009.test:
test load data from master
sql/mini_client.cc:
extra functionality needed for load data from master and other things
sql/mini_client.h:
addition to API
sql/mysql_priv.h:
mysql_create_db()/mysql_rm_db() now return a value
sql/share/english/errmsg.txt:
more error messages
sql/slave.cc:
cleanup of fetch_nx_table()
sql/slave.h:
cleanup of fetch_nx_table()
sql/sql_base.cc:
remove unused code originally written for retrieving a non-existent table in slave thread
sql/sql_class.cc:
remove unused replication variables
sql/sql_class.h:
remove unused replication variabled
sql/sql_db.cc:
make mysql_create_db()/mysql_rm_db() work with thd == 0
(do not write messages to the net) and instead return success/error
sql/sql_lex.h:
added SQLCOM_LOAD_MASTER_DATA
sql/sql_parse.cc:
LOAD MASTER DATA, cleanup of LOAD TABLE FROM MASTER
sql/sql_repl.cc:
LOAD DATA FROM MASTER
sql/sql_repl.h:
LOAD DATA FROM MASTER
sql/sql_yacc.yy:
LOAD DATA FROM MASTER
added support for virtual master ( replicating from a directory with binlogs)
test case for backup/restore with virtual master
client/mysqltest.c:
fix to accomodate for new test case
mysql-test/mysql-test-run.sh:
do not automagically start slave
sql/log.cc:
support for virtual master
sql/log_event.cc:
fix for mysqlbinlog
sql/log_event.h:
fix for mysqlbinlog
sql/mysqlbinlog.cc:
fix for mysqlbinlog
sql/slave.cc:
virtual master
sql/slave.h:
virtual master
sql/sql_class.h:
clean-up/fixes for virtual master
sql/sql_repl.cc:
cleanup/fixes for virtual master
sql/sql_repl.h:
virtual master
BitKeeper/deleted/.del-compile-ia64-O0-sgicc~a4e0732013d6b602:
Delete: BUILD/compile-ia64-O0-sgicc
BitKeeper/deleted/.del-compile-ia64-O0~3a41dfebefc817d1:
Delete: BUILD/compile-ia64-O0
BitKeeper/deleted/.del-compile-ia64-O2-sgicc~6ff796ecac337849:
Delete: BUILD/compile-ia64-O2-sgicc
BitKeeper/deleted/.del-compile-ia64-O2~87d13594c3599830:
Delete: BUILD/compile-ia64-O2
BitKeeper/deleted/.del-compile-ia64-O6~c34e6b943b12c468:
Delete: BUILD/compile-ia64-O6
Docs/manual.texi:
Cleanup
mysql-test/r/rpl000014.result:
Change port number for comparison
mysql-test/r/rpl000015.result:
Change port number for comparison
mysql-test/r/rpl000016.result:
Change port number for comparison
mysql-test/t/rpl000014.test:
Change port number for comparison
mysql-test/t/rpl000015.test:
Change port number for comparison
mysql-test/t/rpl000016.test:
Change port number for comparison
sql-bench/Results/ATIS-mysql-NT_4.0:
New test results
sql-bench/Results/RUN-mysql-NT_4.0:
New test results
sql-bench/Results/alter-table-mysql-NT_4.0:
New test results
sql-bench/Results/big-tables-mysql-NT_4.0:
New test results
sql-bench/Results/connect-mysql-NT_4.0:
New test results
sql-bench/Results/create-mysql-NT_4.0:
New test results
sql-bench/Results/insert-mysql-NT_4.0:
New test results
sql-bench/Results/select-mysql-NT_4.0:
New test results
sql-bench/Results/wisconsin-mysql-NT_4.0:
New test results
sql/slave.cc:
Removed not used variable
Docs/manual.texi:
Updated MyODBC section
libmysql/conf_to_src.c:
Fixed wrong typecast
mysql-test/r/func_regexp.result:
Added test case for REGEXP bug
mysql-test/t/func_regexp.test:
Added test case for REGEXP bug
regex/engine.c:
Fixed wrong type
regex/regexec.c:
Fixed wrong type
sql/records.cc:
Fixed test of READ lock
sql/slave.cc:
Cleanup
mark killed partially completed updates with an error code in binlog
stop replication if the master reports a possible partial/killed update
test partially killed update
mysql-test/r/rpl000001.result:
updated result
mysql-test/r/rpl000012.result:
updated result
mysql-test/t/rpl000001.test:
test handing a killed partial update
mysql-test/t/rpl000012.test:
test temporary table replication more thoroughly
sql/log_event.h:
mark killed partially completed updates with an error code
BitKeeper/etc/ignore:
Added bdb/btree/btree_auto.c bdb/build_vxworks/db_int.h bdb/build_win32/db_int.h bdb/build_win32/include.tcl bdb/build_win32/libdb.rc bdb/db/crdel_auto.c bdb/db/db_auto.c bdb/dist/config.hin to the ignore list
sql/slave.cc:
stop replication if the master reports a possible partial/killed update
sql/sql_base.cc:
do not log the drop internal temporary tables into the binary log
added support for kill expr
fixed coredump in set @a := foo;
added testcase for user_var
added testcase for kill
sql/slave.cc:
fd -> vio
sql/sql_class.cc:
fd->vio, fixed coredump on set @a := foo;
sql/sql_class.h:
fd -> vio
sql/sql_repl.cc:
fd -> vio
sql/sql_yacc.yy:
added support for kill expr - needed this for a clean test case of kill
interrupt I/O after thr_alarm_kill()
test case for order by desc coredump
mysql-test/t/order_by.test:
added test case for order by desc bug
sql/slave.cc:
close socket on slave stop
sql/slave.h:
close socket on slave stop
sql/sql_class.cc:
close socket on slave stop
sql/sql_class.h:
close socket on slave stop
sql/sql_parse.cc:
changed kill_one_thread to use prepare_to_die()
sql/sql_repl.cc:
close socket on slave stop
Fixed bug introduced with last ORDER BY optimization
Changed log position to longlong to avoid warnings.
Docs/manual.texi:
Update for innobase
mysql-test/r/innobase.result:
Fixed test cases
mysql-test/t/bdb.test:
Removed not used tables
mysql-test/t/innobase.test:
Fixed test cases
sql/field.h:
Fixed bug introduced with last ORDER BY optimization
sql/ha_berkeley.cc:
Fixed bug when index_init() was called twice.
sql/mysql_priv.h:
Added option to not get stack trace (when using gdb)
sql/mysqld.cc:
Added option to not get stack trace (when using gdb)
sql/slave.cc:
Changed log position to longlong to avoid warnings.
sql/slave.h:
Changed log position to longlong to avoid warnings.
sql/sql_parse.cc:
Removed warnings
sql/sql_select.cc:
Cleanups
update for the fix
sql/slave.cc
re-merged Jeremy's message changes, got the code to compile and run again
after a mess-up in the merge
Docs/manual.texi:
update for the fix
sql/slave.cc:
re-merged Jeremy's message changes, got the code to compile and run again
after a mess-up in the merge
Changed errmsg -> my_errmsg (portability issue)
Fixed that mysqlbinlog writes SET TIMESTAMP before all queries
Fixed comments in default my.cnf files
Docs/manual.texi:
Updated information about character sets
client/mysqladmin.c:
Added missing help text
client/mysqltest.c:
Changed --replace to --replace_result to not conflict with SQL replace command
include/my_sys.h:
change errmsg -> my_errmsg (portability issue)
libmysql/errmsg.c:
change errmsg -> my_errmsg (portability issue)
myisam/mi_cache.c:
Changed seek+read to pread
myisam/mi_check.c:
Fix bug that caused myisamchk to be very slow under some specific error conditions
myisam/mi_dynrec.c:
cleanup
myisam/myisamchk.c:
Write out value of checksum
myisam/myisamdef.h:
cleanup
mysql-test/r/backup.result:
Fixed the case where backup caused different error messages
mysql-test/r/bdb.result:
Added new test case
mysql-test/r/fulltext.result:
Fix for new CREATE TABLE format
mysql-test/t/backup.test:
Use --replace_result and --send
mysql-test/t/bdb.test:
New test case
mysql-test/t/status.test:
Use --send
mysys/errors.c:
change errmsg -> my_errmsg (portability issue)
mysys/my_error.c:
change errmsg -> my_errmsg (portability issue)
mysys/typelib.c:
Only accept full type names
sql/derror.cc:
change errmsg -> my_errmsg (portability issue)
sql/ha_berkeley.cc:
Fixed bug when using key parts that could be NULL
sql/log_event.cc:
Log SET TIMESTAMP before all queries
sql/mysqlbinlog.cc:
Incremented version number
sql/mysqld.cc:
change errmsg -> my_errmsg (portability issue)
Always accept --skip-gemeni, --skip-bdb and --skip-innobase
sql/slave.cc:
cleanup
sql/sql_base.cc:
cleanup
sql/sql_db.cc:
cleanup
support-files/my-huge.cnf.sh:
Remove usage of # at end of line
support-files/my-large.cnf.sh:
Remove usage of # at end of line
support-files/my-medium.cnf.sh:
Remove usage of # at end of line
support-files/my-small.cnf.sh:
Remove usage of # at end of line
updated manual about table lock counter
fixed coredump in DROP DATABASE with long bogus name by non-root user
fixed bug in handling STOP immediately after ROTATE
added test case for buffer overrun on DROP DATABASE by non-root user
added test case for the STOP bug in replication
Docs/manual.texi:
updates for Table_locks_immediate and Table_locks_waited
include/thr_lock.h:
fixes suggested by Monty to lock counts
mysql-test/r/status.result:
clean up of result for changes in the test case
mysql-test/t/status.test:
make it produce the same results if the had been some activity on the server already
mysys/thr_lock.c:
fixes suggested by Monty
sql/mysqld.cc:
fixes suggested by Monty
sql/slave.cc:
fixed bug in processing STOP event after rotate
sql/sql_base.cc:
fixes suggested by Monty
sql/sql_parse.cc:
fixed coredump in drop database with long name by a non-root user
sql/sql_repl.cc:
better status message
Changed 'static inline' to 'inline' for SCO new's compiler
Docs/manual.texi:
Lots of changes in "Debugging a MySQL server" and in Log files handling
mysys/hash.c:
Changed 'static inline' to 'inline'
sql/hostname.cc:
Changed 'static inline' to 'inline'
sql/item.cc:
Changed 'static inline' to 'inline'
sql/net_serv.cc:
Changed 'static inline' to 'inline'
sql/password.c:
Changed 'static inline' to 'inline'
sql/slave.cc:
Changed 'static inline' to 'inline'
sql/sql_acl.cc:
Changed 'static inline' to 'inline'
sql/sql_base.cc:
Changed mysql_list_field() to convert field names again
sql/sql_parse.cc:
Changed 'static inline' to 'inline'
sql/sql_repl.cc:
fixed typo
fixed sync bugs in three test cases
added offset argument to sync_with_master to mysqltest to be able to fix sync bugs
added a test case for slave startup with existing master.info
expanded mysql-test-run.sh to be able to run pre-start shell script initializations
client/mysqltest.c:
added offset argument to sync_with_master
mysql-test/mysql-test-run.sh:
added option to run master or slave initialization shell script
mysql-test/r/rpl000016.result:
fixed bug in test case
mysql-test/t/rpl000012.test:
fixed syncronization bug
mysql-test/t/rpl000013.test:
fixed sync bug
mysql-test/t/rpl000016.test:
fixed ambiguous show slave status.
sql/slave.cc:
fixed bug that broke slave server start with existing master.info,
Monty's optimization was not chopping off newline from logname.
slave will skip the first SQL_SLAVE_SKIP_COUNTER events on start -
this is needed to recover from broken replication when the next log
event(s) should just be skipped.
Rotate binlogs when max_binlog_size is reached
include/my_sys.h:
added my_snprintf()
include/mysqld_error.h:
more error messages
mysql-test/r/rpl000014.result:
updated results for new SHOW SLAVE STATUS format
mysql-test/r/rpl000015.result:
update for SHOW SLAVE STATUS
mysql-test/r/rpl000016.result:
update for additions to the test
mysql-test/t/rpl000016.test:
test max_binlog_size and slave_skip_counter
mysys/my_vsnprintf.c:
added my_snprintf()
sql/gen_lex_hash.cc:
old values could not do it
sql/lex.h:
updates for SQL_SLAVE_SKIP_COUNTER
sql/log.cc:
rotate binlogs when max_binlog_size is reached
sql/mysqld.cc:
added max_binlog_size
sql/share/czech/errmsg.txt:
new errors
sql/share/danish/errmsg.txt:
new errors
sql/share/dutch/errmsg.txt:
new errors
sql/share/english/errmsg.txt:
new errors
sql/share/estonian/errmsg.txt:
new errors
sql/share/french/errmsg.txt:
new errors
sql/share/german/errmsg.txt:
new errors
sql/share/greek/errmsg.txt:
new errors
sql/share/hungarian/errmsg.txt:
new errors
sql/share/italian/errmsg.txt:
new errors
sql/share/japanese/errmsg.txt:
new errors
sql/share/korean/errmsg.txt:
new errors
sql/share/norwegian-ny/errmsg.txt:
new errors
sql/share/norwegian/errmsg.txt:
new errors
sql/share/polish/errmsg.txt:
new errors
sql/share/portuguese/errmsg.txt:
new errors
sql/share/romanian/errmsg.txt:
new errors
sql/share/russian/errmsg.txt:
new errors, translated untranslated messages
sql/share/slovak/errmsg.txt:
new errors
sql/share/spanish/errmsg.txt:
new errors
sql/share/swedish/errmsg.txt:
new errors
sql/slave.cc:
updates for slave_skip_counter and extension to show slave status
sql/slave.h:
slave_skip_counter
sql/sql_repl.cc:
use error messages from errmsg.txt
sql/sql_yacc.yy:
skip_slave_counter
added test/sanity check for master_pos_wait()
mysql-test/r/rpl000016.result:
do show slave status to test master_pos_wait()
mysql-test/t/rpl000001.test:
no sleep
mysql-test/t/rpl000002.test:
no sleep
mysql-test/t/rpl000003.test:
no sleep
mysql-test/t/rpl000007.test:
!sleep
mysql-test/t/rpl000008.test:
!sleep
mysql-test/t/rpl000009.test:
no sleep
mysql-test/t/rpl000010.test:
no sleep
mysql-test/t/rpl000011.test:
no sleep
mysql-test/t/rpl000012.test:
no sleep
mysql-test/t/rpl000013.test:
no sleep
mysql-test/t/rpl000014.test:
no sleep
mysql-test/t/rpl000015.test:
no sleep
mysql-test/t/rpl000016.test:
no sleep, test that master_pos_wait() works right
sql/slave.cc:
fixed bug in master_pos_wait()
Docs/manual.texi:
Changelog
mysql-test/mysql-test-run.sh:
Added missing --user
sql/ha_berkeley.cc:
Fixed bug in SHOW LOGS
sql/item_func.cc:
Cleanup; Fixed possible problem with NULL
sql/mini_client.cc:
cleanup
sql/slave.cc:
Cleanup
sql/sql_repl.cc:
Fixed timing problem where we could miss a broadcast
sql/sql_show.cc:
Fixed bug in SHOW LOGS when there wasn't any log files
Changed atoll -> strtoll
Extended mysql-test-run
mysql-test/t/alter_table.test:
Turn off SCCS flag
mysql-test/t/analyse.test:
Turn off SCCS flag
mysql-test/t/auto_increment.test:
Turn off SCCS flag
mysql-test/t/bdb.test:
Turn off SCCS flag
mysql-test/t/bigint.test:
Turn off SCCS flag
mysql-test/t/binary.test:
Turn off SCCS flag
mysql-test/t/case.test:
Turn off SCCS flag
mysql-test/t/comments.test:
Turn off SCCS flag
mysql-test/t/compare.test:
Turn off SCCS flag
mysql-test/t/count_distinct.test:
Turn off SCCS flag
mysql-test/t/create.test:
Turn off SCCS flag
mysql-test/t/delayed.test:
Turn off SCCS flag
mysql-test/t/delete.test:
Turn off SCCS flag
mysql-test/t/distinct.test:
Turn off SCCS flag
mysql-test/t/empty_table.test:
Turn off SCCS flag
mysql-test/t/err000001.test:
Turn off SCCS flag
mysql-test/t/explain.test:
Turn off SCCS flag
mysql-test/t/flush_table.test:
Turn off SCCS flag
mysql-test/t/foreign_key.test:
Turn off SCCS flag
mysql-test/t/fulltext.test:
Turn off SCCS flag
mysql-test/t/fulltext_multi.test:
Turn off SCCS flag
mysql-test/t/fulltext_order_by.test:
Turn off SCCS flag
mysql-test/t/func_crypt.test:
Turn off SCCS flag
mysql-test/t/func_date_add.test:
Turn off SCCS flag
mysql-test/t/func_equal.test:
Turn off SCCS flag
mysql-test/t/func_group.test:
Turn off SCCS flag
mysql-test/t/func_in.test:
Turn off SCCS flag
mysql-test/t/func_like.test:
Turn off SCCS flag
mysql-test/t/func_math.test:
Turn off SCCS flag
mysql-test/t/func_misc.test:
Turn off SCCS flag
mysql-test/t/func_op.test:
Turn off SCCS flag
mysql-test/t/func_regexp.test:
Turn off SCCS flag
mysql-test/t/func_set.test:
Turn off SCCS flag
mysql-test/t/func_str.test:
Turn off SCCS flag
mysql-test/t/func_system.test:
Turn off SCCS flag
mysql-test/t/func_test.test:
Turn off SCCS flag
mysql-test/t/func_time.test:
Turn off SCCS flag
mysql-test/t/func_timestamp.test:
Turn off SCCS flag
mysql-test/t/group_by.test:
Turn off SCCS flag
mysql-test/t/heap.test:
Turn off SCCS flag
mysql-test/t/ins000001.test:
Turn off SCCS flag
mysql-test/t/insert.test:
Turn off SCCS flag
mysql-test/t/insert_select.test:
Turn off SCCS flag
mysql-test/t/join.test:
Turn off SCCS flag
mysql-test/t/join_outer.test:
Turn off SCCS flag
mysql-test/t/key.test:
Turn off SCCS flag
mysql-test/t/key_diff.test:
Turn off SCCS flag
mysql-test/t/key_primary.test:
Turn off SCCS flag
mysql-test/t/keywords.test:
Turn off SCCS flag
mysql-test/t/limit.test:
Turn off SCCS flag
mysql-test/t/merge.test:
Turn off SCCS flag
mysql-test/t/null.test:
Turn off SCCS flag
mysql-test/t/null_key.test:
Turn off SCCS flag
mysql-test/t/odbc.test:
Turn off SCCS flag
mysql-test/t/order_by.test:
Turn off SCCS flag
mysql-test/t/outfile.test:
Turn off SCCS flag
mysql-test/t/raid.test:
Turn off SCCS flag
mysql-test/t/range.test:
Turn off SCCS flag
mysql-test/t/rename.test:
Turn off SCCS flag
mysql-test/t/replace.test:
Turn off SCCS flag
mysql-test/t/rollback.test:
Turn off SCCS flag
mysql-test/t/rpl000001.test:
Turn off SCCS flag
mysql-test/t/rpl000002.test:
Turn off SCCS flag
mysql-test/t/rpl000003.test:
Turn off SCCS flag
mysql-test/t/rpl000004.test:
Turn off SCCS flag
mysql-test/t/rpl000005.test:
Turn off SCCS flag
mysql-test/t/rpl000006.test:
Turn off SCCS flag
mysql-test/t/rpl000007.test:
Turn off SCCS flag
mysql-test/t/rpl000008.test:
Turn off SCCS flag
mysql-test/t/rpl000009.test:
Turn off SCCS flag
mysql-test/t/rpl000010.test:
Turn off SCCS flag
mysql-test/t/rpl000011.test:
Turn off SCCS flag
mysql-test/t/rpl000012.test:
Turn off SCCS flag
mysql-test/t/rpl000013.test:
Turn off SCCS flag
mysql-test/t/rpl000014.test:
Turn off SCCS flag
mysql-test/t/rpl000015.test:
Turn off SCCS flag
mysql-test/t/rpl000016.test:
Turn off SCCS flag
mysql-test/t/sel000001.test:
Turn off SCCS flag
mysql-test/t/sel000002.test:
Turn off SCCS flag
mysql-test/t/sel000003.test:
Turn off SCCS flag
mysql-test/t/sel000031.test:
Turn off SCCS flag
mysql-test/t/sel000032.test:
Turn off SCCS flag
mysql-test/t/sel000033.test:
Turn off SCCS flag
mysql-test/t/sel000100.test:
Turn off SCCS flag
mysql-test/t/select.test:
Turn off SCCS flag
mysql-test/t/select_safe.test:
Turn off SCCS flag
mysql-test/t/show_check.test:
Turn off SCCS flag
mysql-test/t/shw000001.test:
Turn off SCCS flag
mysql-test/t/tablelock.test:
Turn off SCCS flag
mysql-test/t/temp_table.test:
Turn off SCCS flag
mysql-test/t/truncate.test:
Turn off SCCS flag
mysql-test/t/type_blob.test:
Turn off SCCS flag
mysql-test/t/type_date.test:
Turn off SCCS flag
mysql-test/t/type_datetime.test:
Turn off SCCS flag
mysql-test/t/type_enum.test:
Turn off SCCS flag
mysql-test/t/type_float.test:
Turn off SCCS flag
mysql-test/t/type_ranges.test:
Turn off SCCS flag
mysql-test/t/type_time.test:
Turn off SCCS flag
mysql-test/t/type_timestamp.test:
Turn off SCCS flag
mysql-test/t/type_uint.test:
Turn off SCCS flag
mysql-test/t/type_year.test:
Turn off SCCS flag
mysql-test/t/update.test:
Turn off SCCS flag
mysql-test/t/varbinary.test:
Turn off SCCS flag
mysql-test/t/variables.test:
Turn off SCCS flag
mysql-test/t/warnings.test:
Turn off SCCS flag
BUILD/compile-alpha-cxx:
Added making of test
Docs/manual.texi:
Added more documentation to CHECK table
mysql-test/mysql-test-run.sh:
Added --local and checking if we are running as root
sql/mysqlbinlog.cc:
Changed atoll -> strtoll
sql/slave.cc:
Changed atoll -> strtoll
Split update_of_key into separate tests
Updated make_binary_distribution to generate symbol file for mysqld
Docs/manual.texi:
Update for 3.23.30
scripts/make_binary_distribution.sh:
Added sql/mysqld.sym.gz
sql-bench/Results-linux/RUN-mysql_dbug-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/RUN-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/insert-mysql-Linux_2.2.14_5.0_i686-cmp-interbase,mysql:
***MISSING WEAVE***
sql-bench/Results-linux/insert-mysql_dbug-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/insert-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results/RUN-mysql-Linux_2.2.13_SMP_alpha:
Split update_of_key into separate tests
sql-bench/Results/RUN-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Split update_of_key into separate tests
sql-bench/Results/RUN-mysql-Linux_2.2.14_my_SMP_i686:
Split update_of_key into separate tests
sql-bench/Results/RUN-mysql-SunOS_5.7_sun4m:
Split update_of_key into separate tests
sql-bench/Results/RUN-mysql-SunOS_5.8_sun4u:
Split update_of_key into separate tests
sql-bench/Results/RUN-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Split update_of_key into separate tests
sql-bench/Results/RUN-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Split update_of_key into separate tests
sql-bench/Results/insert-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql:
Split update_of_key into separate tests
sql-bench/Results/insert-msql-Linux_2.2.10_i686-cmp-msql,mysql:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-3.21-Linux_2.2.1_i686:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-HP_UX_B.10.20_9000_778:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-Linux_2.0.35_i686-cmp-adabas,mysql:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-Linux_2.2.10_i686-cmp-msql,mysql:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-Linux_2.2.13_SMP_alpha:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-Linux_2.2.14_my_SMP_i686:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-Linux_2.2.1_i686-cmp-adabas,mysql:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-NT_4.0:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-SunOS_5.7_sun4m:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-SunOS_5.8_sun4u:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-win98:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql_odbc-win98:
Split update_of_key into separate tests
sql-bench/Results/insert-oracle-Linux_2.0.36_i686-cmp-mysql,oracle:
Split update_of_key into separate tests
sql-bench/Results/insert-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle:
Split update_of_key into separate tests
sql-bench/Results/insert-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid:
Split update_of_key into separate tests
sql-bench/Results/insert-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Split update_of_key into separate tests
sql-bench/Results/insert-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid:
Split update_of_key into separate tests
sql-bench/Results/insert-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Split update_of_key into separate tests
sql-bench/Results/insert-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid:
Split update_of_key into separate tests
sql-bench/test-insert.sh:
Split update_of_key into separate tests
sql/mysqlbinlog.cc:
Fix for 2G files
sql/slave.cc:
Fix for 2G files
fixed bug that created empty result files in no-record mode
mysql-test/t/rpl000007.test
testing non-replication of load data infile when the table is excluded from replication
mysql-test/t/rpl000016.test
test purge master logs
sql/slave.cc
fix memory leaks found by purge master logs test
sql/sql_repl.cc
fixed race condition and delete before close bug in reset_slave()
Overall comments - coverage testing is a very good thing!
client/mysqltest.c:
fixed bug that created empty result files in no-record mode
mysql-test/t/rpl000007.test:
testing non-replication of load data infile when the table is excluded from replication
mysql-test/t/rpl000016.test:
test purge master logs
sql/slave.cc:
fix memory leaks found by purge master logs test
sql/sql_repl.cc:
fixed race condition and delete before close bug in reset_slave()
Remove not used BDB logs on shutdown
Don't give warnings for repair on slaves
Fixed transaction log files
Docs/manual.texi:
Updated 'known bugs'
include/my_sys.h:
Added define for checking number of bytes left in the IO_CACHE
mysql-test/mysql-test-run:
Small bug fixes
mysys/mf_iocache2.c:
Use new define
sql/filesort.cc:
Temporary fix for FULLTEXT index
sql/ha_berkeley.cc:
Fix for delete in tables with hidden primary key
Remove not used BDB logs on shutdown
sql/ha_myisam.cc:
Don't give warnings for repair on slaves
sql/hostname.cc:
Portability fix
sql/log.cc:
Fix transaction log files
sql/log_event.h:
portability fix
sql/slave.cc:
Don't give warnings for repair on slaves
sql/sql_class.h:
Cleanup
sql/sql_parse.cc:
Fixed typo
sql/log_event.h:
changed new/delete for Log_event to use my_malloc/my_free
sql/mysql_priv.h:
wait for slave to get going
sql/mysqld.cc:
wait for slave to get going in SLAVE START
sql/slave.cc:
fixed more memory leaks
sql/sql_repl.cc:
file name was not being \0 terminated in send_file
better error diagnostic in SLAVE START
sql/mini_client.cc:
if we fail to connect, we need to free the inited structure
sql/mysqld.cc:
added end_slave() for slave cleanup
sql/slave.cc:
fixed serveral memory leaks
sql/slave.h:
added end_master_info() for clean up
sql/sql_class.cc:
not changed
sql/sql_repl.cc:
initialize master info before creating slave thread in SLAVE START -
this way we can easily send an error to the client if something is
wrong in init_master_info
BitKeeper/etc/ignore:
Added BitKeeper/tmp/applied.list BitKeeper/tmp/backup.list BitKeeper/tmp/backup.sfio BitKeeper/tmp/sfile.list to the ignore list
sql/slave.cc:
log warnings from replicated load data infile
sql/sql_load.cc:
do not log load data infile from the master to update log on the slave
fixed slave to preserve temp tables on slave stop; slave start
added abort-slave-event-count option to mysqld to test the above
added a test case for temp tables with a contantly aborting slave
removed warning in sql_parse.cc
fixed thimble.cc to compile
BitKeeper/etc/ignore:
Added client/thimble support-files/mysql-3.23.29-gamma.spec to the ignore list
client/mysqltest.c:
added while, let, and echo, added fractional sec sleep support
client/thimble.cc:
fixes to make it compile
mysql-test/t/3.23/rpl000001.test:
sleep less
mysql-test/t/3.23/rpl000002.test:
sleep less
mysql-test/t/3.23/rpl000003.test:
sleep less
mysql-test/t/3.23/rpl000005.test:
sleep less
sql/mysqld.cc:
--abort-slave-event count
sql/slave.cc:
remember temp tables when slave thread termintates and restore them on
slave start
sql/slave.h:
--abort-slave-event-count
sql/sql_parse.cc:
remove warning
into mysql.sashanet.com:/home/sasha/src/bk/mysql
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
while slave thread has temp tables - not hard to fix though, but it is time to go to bed
added a new test case for temp table replication and Slave_open_temp_tables
status variable.
Misc fixes
client/mysqltest.c:
added disconnect command
mysql-test/create-test-result:
fixed bugs so it actually works
mysql-test/t/include/master-slave.inc:
establish alternate connections to master and slave
sql/mysql_priv.h:
Slave_open_temp_tables
sql/mysqlbinlog.cc:
fixed a bug in reading local binlogs
sql/mysqld.cc:
added Slave_open_temp_tables status variable
sql/slave.cc:
fixed freed memory reference in the error message
sql/sql_class.cc:
slave_proxy_id
sql/sql_class.h:
slave_proxy_id
sql/sql_parse.cc:
small optimization - reorder eval in &&
BitKeeper/etc/ignore:
Added mysql-test/r/3.23/rpl000001.b.result.reject mysql-test/r/3.23/rpl000012.result.reject to the ignore list
sql/sql_table.cc:
added THD arg to rename_temporary_table
sql/unireg.h:
the table_cache_key is now 4 bytes longer
send_file() is more stack-friendly - changed large static buffer to alloc_root()
fixed my_b_seek() to work with WRITE_CACHE
test case to make sure the slave starts correctly after being stopped
truncated words file so the replication tests will take less time
mysql-test/r/3.23/rpl000001.b.result:
truncated words file
mysql-test/r/3.23/rpl000004.b.result:
truncated words file
mysql-test/std_data/words:
truncated words file
BitKeeper/etc/ignore:
Added mysql-test/rpl000011.test mysql-test/var/lib/mysql-bin.007 sql/share/norwegian/errmsg.sys sql/share/norwegian-ny/errmsg.sys to the ignore list
mysys/mf_iocache2.c:
got my_b_seek() to work with WRITE_CACHE, at least the one used by the slave
sql/share/romanian/errmsg.sys:
accidently touched the file
sql/slave.cc:
converted FILE to IO_CACHE for master.info
sql/slave.h:
FILE -> IO_CACHE for master.info
sql/sql_repl.cc:
be nice to the stack - change a large stack buffer to be alloced with
alloc_root in send_file()
Give warning if we are using non transactional tables and do ROLLBACK
Porting of crash-me and benchmarks to FrontBase
Docs/manual.texi:
Updates for 3.23.29
include/mysqld_error.h:
New error messages
sql-bench/Data/ATIS/fconnection.txt:
Name change because 'connection' was a reserved word in FrontBase
sql-bench/bench-init.pl.sh:
Port to FrontBase
sql-bench/crash-me.sh:
Port to FrontBase
sql-bench/server-cfg.sh:
Port to FrontBase
sql-bench/test-ATIS.sh:
Port to FrontBase
sql-bench/test-alter-table.sh:
Port to FrontBase
sql-bench/test-big-tables.sh:
Port to FrontBase
sql-bench/test-connect.sh:
Port to FrontBase
sql-bench/test-create.sh:
Port to FrontBase
sql-bench/test-insert.sh:
Port to FrontBase
sql-bench/test-select.sh:
Port to FrontBase
sql-bench/test-wisconsin.sh:
Port to FrontBase
sql/ha_berkeley.cc:
All statements are now run in a sub transaction
sql/ha_berkeley.h:
All statements are now run in a sub transaction
sql/handler.cc:
All statements are now run in a sub transaction
sql/handler.h:
All statements are now run in a sub transaction
sql/mysql_priv.h:
Moved QUERY_NO.. flags to unique numbers
sql/mysqld.cc:
All statements are now run in a sub transaction
sql/net_pkg.cc:
Added send_warning
sql/share/czech/errmsg.sys:
New error messages
sql/share/czech/errmsg.txt:
New error messages
sql/share/danish/errmsg.sys:
New error messages
sql/share/danish/errmsg.txt:
New error messages
sql/share/dutch/errmsg.sys:
New error messages
sql/share/dutch/errmsg.txt:
New error messages
sql/share/english/errmsg.sys:
New error messages
sql/share/english/errmsg.txt:
New error messages
sql/share/estonian/errmsg.sys:
New error messages
sql/share/estonian/errmsg.txt:
New error messages
sql/share/french/errmsg.sys:
New error messages
sql/share/french/errmsg.txt:
New error messages
sql/share/german/errmsg.sys:
New error messages
sql/share/german/errmsg.txt:
New error messages
sql/share/greek/errmsg.sys:
New error messages
sql/share/greek/errmsg.txt:
New error messages
sql/share/hungarian/errmsg.sys:
New error messages
sql/share/hungarian/errmsg.txt:
New error messages
sql/share/italian/errmsg.sys:
New error messages
sql/share/italian/errmsg.txt:
New error messages
sql/share/japanese/errmsg.sys:
New error messages
sql/share/japanese/errmsg.txt:
New error messages
sql/share/korean/errmsg.sys:
New error messages
sql/share/korean/errmsg.txt:
New error messages
sql/share/norwegian-ny/errmsg.txt:
New error messages
sql/share/norwegian/errmsg.txt:
New error messages
sql/share/polish/errmsg.sys:
New error messages
sql/share/polish/errmsg.txt:
New error messages
sql/share/portuguese/errmsg.sys:
New error messages
sql/share/portuguese/errmsg.txt:
New error messages
sql/share/romanian/errmsg.txt:
New error messages
sql/share/russian/errmsg.sys:
New error messages
sql/share/russian/errmsg.txt:
New error messages
sql/share/slovak/errmsg.sys:
New error messages
sql/share/slovak/errmsg.txt:
New error messages
sql/share/spanish/errmsg.sys:
New error messages
sql/share/spanish/errmsg.txt:
New error messages
sql/share/swedish/errmsg.OLD:
New error messages
sql/share/swedish/errmsg.sys:
New error messages
sql/share/swedish/errmsg.txt:
New error messages
sql/slave.cc:
All statements are now run in a sub transaction
sql/sql_class.cc:
All statements are now run in a sub transaction
sql/sql_class.h:
All statements are now run in a sub transaction
sql/sql_delete.cc:
Remember if we are using a non transactional table
sql/sql_insert.cc:
Remember if we are using a non transactional table
sql/sql_load.cc:
Remember if we are using a non transactional table
sql/sql_parse.cc:
All statements are now run in a sub transaction
sql/sql_select.cc:
Remember if we are using a non transactional table
sql/sql_table.cc:
All statements are now run in a sub transaction
sql/sql_update.cc:
All statements are now run in a sub transaction
sql/sql_yacc.yy:
All statements are now run in a sub transaction
cleanup - remove unneeded daeamon restarts
sql/log_event.cc
fixed bug - do not confuse confused slaves even further if they try to
read less than LOG_EVENT_HEADER_LEN before the end of file
sql/mysqlbinlog.cc
give error if constructor fails
sql/mysqld.cc
--disconnect-slave-event-count for replication debugging
sql/slave.cc
--disconnect-slave-event-count
cleanup to remove unneeded sleeps when things go wrong - sleep only
when we have to
sql/slave.h
--disconnect-slave-event-count
test cases for ALTER TABLE ORDER BY and replication offset off by 22
confusion mystery bug (both pass)
mysql-test/mysql-test-run:
cleanup - remove unneeded daeamon restarts
sql/log_event.cc:
fixed bug - do not confuse confused slaves even further if they try to
read less than LOG_EVENT_HEADER_LEN before the end of file
sql/mysqlbinlog.cc:
give error if constructor fails
sql/mysqld.cc:
--disconnect-slave-event-count for replication debugging
sql/slave.cc:
--disconnect-slave-event-count
cleanup to remove unneeded sleeps when things go wrong - sleep only
when we have to
sql/slave.h:
--disconnect-slave-event-count
sql/sql_repl.cc:
added unknown error
added gdb support, mysqld options per test, and other cool stuff to mysql-test-run
added --replicate-wild-do/ignore-table
more test cases
client/mysqltest.c:
fixed a reject file bug
mysql-test/mysql-test-run:
support for gdb and running only one test case
sql/mysql_priv.h:
wild_compare needs to be global
sql/mysqld.cc:
--replicate-wild-do/ignore-table
sql/slave.cc:
wild,wild
sql/slave.h:
wild fixes
sql/sql_class.cc:
fixed compiler warning
sql/sql_string.cc:
wild stuff needs to be global
BitKeeper/etc/ignore:
Added BitKeeper/tmp/gone mysql-test/r/3.23/rpl mysql-test/r/3.23/rpl.reject mysql-test/var/lib/bar/bar.frm mysql-test/var/lib/bar/bar.MYD mysql-test/var/lib/bar/bar.MYI mysql-test/var/lib/foo/foo.frm mysql-test/var/lib/foo/foo.MYD mysql-test/var/lib/foo/foo.MYI mysql-test/var/lib/test/bar.frm mysql-test/var/lib/test/bar.MYD mysql-test/var/lib/test/bar.MYI mysql-test/var/lib/test/choo.frm mysql-test/var/lib/test/choo.MYD mysql-test/var/lib/test/choo.MYI mysql-test/var/slave-data/bar/bar.frm mysql-test/var/slave-data/bar/bar.MYD mysql-test/var/slave-data/bar/bar.MYI mysql-test/var/slave-data/foo/foo.frm mysql-test/var/slave-data/foo/foo.MYD mysql-test/var/slave-data/foo/foo.MYI mysql-test/var/slave-data/test/bar.frm mysql-test/var/slave-data/test/bar.MYD mysql-test/var/slave-data/test/bar.MYI mysql-test/var/slave-data/test/choo.frm mysql-test/var/slave-data/test/choo.MYD mysql-test/var/slave-data/test/choo.MYI mysql-test/var/tmp/README to the ignore list
public test suite now tests replication code as well
mysql-test/mybin/mysql-test_install_db:
fixes to test replication with two daemons on one machine
mysql-test/mysql-test-run:
fixes for replication tests -- still need to test gcov, the rest works
mysql-test/t/include/master-slave.inc:
include file for replication tests
sql/slave.cc:
fixed bug for the case when the slave loses connection after it has read Int_var event but before Query
sql/sql_insert.cc:
reset error in delayed thread
slave converts delayed insert to regular
Docs/manual.texi:
Updated links and added more examples
client/mysql.cc:
Added --timeout + merge of Jani:s changes
isam/_dynrec.c:
Fixed bug when making big rows 1 byte smaller
scripts/mysqlhotcopy.sh:
Added regexp handling of filenames
sql-bench/test-insert.sh:
More order by tests
sql/mf_iocache.cc:
Cleanup
sql/mysqld.cc:
Moved my_delete() to before master thread died
sql/sql_parse.cc:
Fixed wrong comparison
fixed bug in find_first_log
sql/mysqlbinlog.cc
flose file only if we opened it
sql/slave.cc
changed spacing
sql/sql_repl.cc
fixed error message
sql/log.cc:
fixed bug in find_first_log
sql/mysqlbinlog.cc:
flose file only if we opened it
sql/slave.cc:
changed spacing
sql/sql_repl.cc:
fixed error message
BitKeeper/etc/ignore:
Added repl-tests/test-repl/foo-dump-slave.master. repl-tests/test-repl/sum-wlen-slave.master. repl-tests/test-repl/sum-wlen-slave.master.re to the ignore list
fixed bug - mutex was not being released if master.info could not be read
sql/slave.cc:
fixed bug - mutex was not being released if master.info could not be read
this file needs to be deleted
sql/log_event.cc
fixed warnings
sql/log_event.h
fixed () #define bug
sql/mysqlbinlog.cc
fixed length argument - was supposed to be one less
sql/mysqld.cc
replicate-do/ignore-table now works, wild does not yet
sql/mysql_priv.h
updating argument to add_table_to_list() -- needed for replicate-do/ignore table
sql/slave.cc
changes fore replicate-do/ignore-table
close the socket before going to sleep sleeping after error
bad event was being freed too early
sql/slave.h
changes for replicate-do/ignore-table
sql/sql_class.cc
slave_thread variable to THD
sql/sql_class.h
added slave_thread to THD, fixed bug in end_time()
sql/sql_parse.cc
updating argument to add_tables_to_list()
sql/sql_table.cc
fixed bug in mysql_rm_table()
sql/sql_yacc.yy
fixed up add_table_to_list() calls to accept updating argument
sql/table.h
added updating to TABLE_LIST
repl-tests/test-repl-ts/repl-timestamp.master.reject:
this file needs to be deleted
sql/log_event.cc:
fixed warnings
sql/log_event.h:
fixed () #define bug
sql/mysql_priv.h:
updating argument to add_table_to_list() -- needed for replicate-do/ignore table
sql/mysqlbinlog.cc:
fixed length argument - was supposed to be one less
sql/mysqld.cc:
replicate-do/ignore-table now works, wild does not yet
sql/slave.cc:
changes fore replicate-do/ignore-table
close the socket before going to sleep sleeping after error
bad event was being freed too early
sql/slave.h:
changes for replicate-do/ignore-table
sql/sql_class.cc:
slave_thread variable to THD
sql/sql_class.h:
added slave_thread to THD, fixed bug in end_time()
sql/sql_parse.cc:
updating argument to add_tables_to_list()
sql/sql_table.cc:
fixed bug in mysql_rm_table()
sql/sql_yacc.yy:
fixed up add_table_to_list() calls to accept updating argument
sql/table.h:
added updating to TABLE_LIST
BUILD/compile-pentium-debug:
added -DEXTRA_DEBUG
sql/Makefile.am:
added slave.h
sql/log_event.h:
max_buf -> event_len in read_log_event
sql/mysql_priv.h:
moved the slave part to slave.h
sql/mysqld.cc:
changes for replcate_do/ignore_table ( does not work yet)
sql/slave.cc:
removed the stuff covered by slave.h
sql/sql_class.h:
moved slave stuff to slave.h
sql/sql_repl.h:
removed stuff covered by slave.h
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
fixed coredump in concat_ws
sql/item_strfunc.h
fixed coredump in concat_ws
sql/mini_client.cc
added mc_mysql_error()
sql/mini_client.h
added mc_mysql_errno()
sql/mysqlbinlog.cc
fixed bug in --postion for local files
sql/slave.cc
more verbose message on bad net reads
sql/sql_repl.cc
send errno on error in mysql_binlog_send
sql/item_strfunc.cc:
fixed coredump in concat_ws
sql/item_strfunc.h:
fixed coredump in concat_ws
sql/mini_client.cc:
added mc_mysql_error()
sql/mini_client.h:
added mc_mysql_errno()
sql/mysqlbinlog.cc:
fixed bug in --postion for local files
BitKeeper/etc/ignore:
Added client/.mysqladmin.c.swp to the ignore list
sql/slave.cc:
more verbose message on bad net reads
sql/sql_repl.cc:
send errno on error in mysql_binlog_send
mutex now initialized in the constructor
sql/sql_class.h
intialize MASTER_INFO mutex in the constructor
sql/sql_repl.cc
fixed typo in error message
if the user does not specify offset in CHANGE MASTER TO, set it to skip magic number
repl-tests/test-repl-ts/repl-timestamp.master.reject
New BitKeeper file ``repl-tests/test-repl-ts/repl-timestamp.master.reject''
BitKeeper/etc/ignore:
Added repl-tests/test-repl-ts/repl-timestamp.master.reject to the ignore list
sql/slave.cc:
mutex now initialized in the constructor
sql/sql_class.h:
intialize MASTER_INFO mutex in the constructor
sql/sql_repl.cc:
fixed typo in error message
if the user does not specify offset in CHANGE MASTER TO, set it to skip magic number
keep vio from being freed twice when we are low on memory
mysys/safemalloc.c
changes for --safemalloc-mem-limit
sql/mini_client.cc
keep vio from being freed twice
sql/mysqld.cc
changes for --safemalloc-mem-limit
sql/slave.cc
prevent closing connection twice
sql/sql_string.h
shrink() did not work right when my_realloc() failed
BitKeeper/etc/ignore:
Added .gdb_history to the ignore list
libmysql/libmysql.c:
keep vio from being freed twice when we are low on memory
mysys/safemalloc.c:
changes for --safemalloc-mem-limit
sql/mini_client.cc:
keep vio from being freed twice
sql/mysqld.cc:
changes for --safemalloc-mem-limit
sql/slave.cc:
prevent closing connection twice
sql/sql_string.h:
shrink() did not work right when my_realloc() failed
workaround for SCO realpath() bug
sql/slave.cc
fixed memory leak when slave runs bad query
mysys/mf_format.c:
workaround for SCO realpath() bug
sql/slave.cc:
fixed memory leak when slave runs bad query
replication updates
sql/opt_range.h
fixed compiler warning
sql/slave.cc
fixed handling of long usernames
fixed insert_id + query log event processing atomicity in the case
of slave death
fix edcharset coversion to not be global to all threads
sql/sql_class.h
fix to make insert_id event and the subsequent query event be still processed
atomically if slave dies in the middle
sql/sql_select.cc
temp fix to make it compile
repl-tests/test-auto-inc/run.test@1.1
New BitKeeper file ``repl-tests/test-auto-inc/run.test''
repl-tests/test-auto-inc/x.master@1.1
New BitKeeper file ``repl-tests/test-auto-inc/x.master''
Docs/manual.texi:
replication updates
sql/opt_range.h:
fixed compiler warning
sql/slave.cc:
fixed handling of long usernames
fixed insert_id + query log event processing atomicity in the case
of slave death
fix edcharset coversion to not be global to all threads
sql/sql_class.h:
fix to make insert_id event and the subsequent query event be still processed
atomically if slave dies in the middle
sql/sql_select.cc:
temp fix to make it compile
Added magic number to binlog
sql/log_event.cc
distinquish bogus data from truncated logs
sql/log_event.h
added magic number
added LOG_READ_TRUNC error
sql/mysqlbinlog.cc
fixed to handle magic number
added O_BINARY to my_fopen
sql/mysqld.cc
added code for replicate-rewrite-db
sql/slave.cc
replicate-rewrite-db
O_BINARY
handle magic
sql/sql_class.h
added i_string_pair class
sql/sql_repl.cc
added magic
better error messages
support-files/magic
added magic for binlog
Added test case for replication of queries with error
sql/log.cc:
Added magic number to binlog
sql/log_event.cc:
distinquish bogus data from truncated logs
sql/log_event.h:
added magic number
added LOG_READ_TRUNC error
sql/mysqlbinlog.cc:
fixed to handle magic number
added O_BINARY to my_fopen
sql/mysqld.cc:
added code for replicate-rewrite-db
sql/slave.cc:
replicate-rewrite-db
O_BINARY
handle magic
sql/sql_class.h:
added i_string_pair class
sql/sql_repl.cc:
added magic
better error messages
support-files/magic:
added magic for binlog
added error_code to query event, and checking to see if we get the
expected error on the slave
removed obsolete code from slave.cc
sql/log_event.cc:
added mutex as an argument to FILE read_log_event functions
sql/log_event.h:
added error_code for the query event
sql/mysqlbinlog.cc:
fix for new form of read_log_event
sql/slave.cc:
removed obsolte code with fetch nx table
added check to see if the query runs with the same error on the slave
as it did on the master
sql/sql_repl.cc:
fixed mutex problem around read_log_event
kill zombie COM_BINLOG_DUMP with the same server id on connect
sql/mysql_priv.h:
made kill_one_thread global scope
sql/slave.cc:
skip updates with the same server id as self
fixed compiler warning
sql/sql_parse.cc:
COM_BINLOG_DUMP is followed by a simulation of COM_QUIT for proper thread clean up
sql/sql_repl.cc:
kill zombie COM_BINLOG_DUMP with the same server id on connect,
more verbose binlog_send process status
sql_repl.* will push this one, since the replication code now works
repl-tests/test-dump/run.test:
added slave/master reset
sql/Makefile.am:
added sql_repl.*
sql/log_event.cc:
moved #defines to log_event.h
sql/log_event.h:
moved #defines from log_event.cc
sql/mysql_priv.h:
added LOCK_server_id
sql/mysqlbinlog.cc:
added server id
sql/mysqld.cc:
added mutex_init for LOCK_server_id
sql/slave.cc:
added server_id to COM_BINLOG_DUMP
sql/sql_base.cc:
moved replication code to sql_repl.*
sql/sql_parse.cc:
moved replication code to sql_repl.*
added server id, mostly working
added --skip-slave-start, working
added --replicate-rewrite-db - just in the cmd line parses, currently noop
sql/log_event.cc:
added server id
sql/log_event.h:
added server id
sql/mysql_priv.h:
server id
sql/mysqlbinlog.cc:
server id
sql/mysqld.cc:
server id, --skip-slave-start, --replicate-rewrite-db
sql/share/romanian/errmsg.sys:
somehow got touched and bk thinks it is modified
sql/slave.cc:
server id, fixed typo in error message, cleaned up
sql/sql_class.cc:
server id in THD
sql/sql_class.h:
server id in THD
in FULLTEXT indexes.
Docs/manual.texi:
Removed some @ifset nushere tags which crashed the manual
when using emacs
client/mysql-test.c:
***MISSING WEAVE***
heap/hp_test2.c:
Removed compiler warnings
isam/pack_isam.c:
Removed compiler warnings
isam/update.c:
Removed compiler warnings
myisam/ft_parser.c:
cleanup
myisam/ft_update.c:
Fixed crash when inserting a blob which was NULL
myisam/mi_check.c:
-e continues checking of other keys on error
myisam/mi_rkey.c:
cleanup
myisam/myisamchk.c:
cleanup
myisam/myisamlog.c:
Added use of rnd to make things more predictable
myisammrg/myrg_rkey.c:
Removed compiler warnings
mysys/mf_pack.c:
cleanup
mysys/my_fstream.c:
cleanup
sql/ha_berkeley.cc:
cleanup
sql/handler.cc:
cleanup
sql/item_func.cc:
cleanup
sql/item_func.h:
cleanup
sql/net_serv.cc:
cleanup
sql/slave.cc:
cleanup
sql/sql_class.cc:
cleanup
sql/sql_show.cc:
cleanup
fixed typo in the error message
sql/sql_base.cc
fixed bugs in reopen_name_locked_table() after talking to Monty
added a test case for restore + select
sql/slave.cc:
fixed typo in the error message
sql/sql_base.cc:
fixed bugs in reopen_name_locked_table() after talking to Monty
include/myisam.h:
Don't assume too big tempoary disks
myisam/mi_check.c:
Don't assume too big tempoary disks
myisam/mi_static.c:
Don't assume too big tempoary disks
myisam/myisamdef.h:
Fix type
sql/ha_myisam.cc:
Set myisamchk to use MySQL temporary disk space
sql/slave.cc:
Fix parameters
sql/sql_lex.h:
Added backup_dir
RESTORE TABLE FROM 'directory'
log on slave when it connects to the master
include/mysql_com.h:
Added COM_CONNECT_OUT so we can log on the slave when
connects to the master
sql/ha_myisam.cc:
added restore() and backup()
sql/ha_myisam.h:
Added restore() and backup()
sql/handler.cc:
restore()/backup()
sql/handler.h:
restore()/backup()
sql/lex.h:
BACKUP/RESTORE
sql/mysql_priv.h:
gave global ( non-static) scope to generate_table()
added mysql_backup_table()/mysql_restore_table()
sql/slave.cc:
Log when slave connects to the master on the slave
sql/sql_delete.cc:
changed the scope of generate_table() from static to global
sql/sql_lex.h:
changes for BACKUP TABLE/RESTORE TABLE
sql/sql_parse.cc:
Changes for BACKUP TABLE/RESTORE TABLE
sql/sql_table.cc:
Changes for BACKUP TABLE/RESTORE TABLE
sql/sql_yacc.yy:
BACKUP TABLE/ RESTORE TABLE