Commit graph

11 commits

Author SHA1 Message Date
unknown
8f232cb75f Portability fixes.
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
2002-09-11 06:40:08 +03:00
unknown
1e0f2b7a42 Ugly merge! But I am not done yet - there are a number of things I need to fix
before I can push


BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
include/my_sys.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
mysys/mf_iocache2.c:
  Auto merged
mysys/thr_mutex.c:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/mini_client.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/structs.h:
  Auto merged
mysql-test/r/rpl000014.result:
  merge
mysql-test/r/rpl000015.result:
  merge
mysql-test/r/rpl000016.result:
  merge
mysql-test/r/rpl_log.result:
  merge
sql/log.cc:
  merge
sql/log_event.cc:
  merge
sql/log_event.h:
  merge
sql/mysqld.cc:
  merge
sql/slave.cc:
  merge
sql/slave.h:
  merge
sql/sql_class.h:
  merge
sql/sql_parse.cc:
  merge
sql/sql_repl.cc:
  merge
sql/sql_yacc.yy:
  merge
2002-01-19 22:46:25 -07:00
unknown
5df61c3cdc Here comes a nasty patch, although I am not ready to push it yet. I will
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
2002-01-19 19:16:52 -07:00
unknown
8f05035c27 Lots of portability fixes.
Fixed shutdown on HPUX.
Fixed bug in query cache.


Docs/manual.texi:
  Changelog
configure.in:
  Fixes for HPUX
include/m_string.h:
  Fixes for Purify
include/my_pthread.h:
  Fixes for HPUX
include/raid.h:
  Portability fix.
innobase/include/univ.i:
  Portability fix.
mysql-test/mysql-test-run.sh:
  Added --manual-gdb
mysql-test/r/rpl_log.result:
  Portability fix
mysql-test/t/rpl_log.test:
  Portability fix
mysys/my_pthread.c:
  Portability fix (HPUX)
mysys/raid.cc:
  Portability fix
mysys/thr_mutex.c:
  Portability fix
scripts/mysql_install_db.sh:
  Clean up install message
sql-bench/test-alter-table.sh:
  Fix testsuite
sql/ha_innobase.cc:
  Fixed stack overwrite.
sql/log_event.cc:
  Fixed purify warning
sql/mysqld.cc:
  Added patch from FreeBSD port.
  Fixed shutdown on HPUX.
sql/slave.cc:
  Cleanup
sql/sql_cache.cc:
  Binary search in 'step' searching
  Check maximal block in bin
  Limit of comparasions number in list of memory blocks.
  Fixed bug in pack()
sql/sql_cache.h:
  Binary search in 'step' searching
  Check maximal block in bin
  Limit of comparasions number in list of memory blocks.
  Fixed bug in pack()
sql/sql_parse.cc:
  Optimize
tools/mysqlmanager.c:
  Portability fix
2001-12-17 03:02:58 +02:00
unknown
6a5f89c9b1 --replace_result in mysqltest can now use variables
client/mysqltest.c:
  --replace_result can now use variables
mysql-test/r/rpl000014.result:
  Fix to use new replace
mysql-test/r/rpl000015.result:
  Fix to use new replace
mysql-test/r/rpl000016.result:
  Fix to use new replace
mysql-test/r/rpl_log.result:
  Fix to use new replace
mysql-test/t/join.test:
  Fix to use new replace
mysql-test/t/rpl000014.test:
  Fix to use new replace
mysql-test/t/rpl000015.test:
  Fix to use new replace
mysql-test/t/rpl000016.test:
  Fix to use new replace
mysql-test/t/rpl_log.test:
  Fix to use new replace
readline/rltty.c:
  Add missing function
2001-12-15 04:41:20 +02:00
unknown
5a18acf35f fixed slave to clean up load data infile temp files
instrumented the server with DBUG_SYNC_POINT() macro


mysql-test/t/rpl_log.test:
  no change
sql/item_func.cc:
  debug_sync_point()
sql/log_event.cc:
  clead load data file tmpdir on slave on start/stop events
sql/mysql_priv.h:
  DBUG_SYNC_POINT
sql/sql_repl.cc:
  DBUG_SYNC_POINT in Create_file_event
2001-10-03 13:55:31 -06:00
unknown
bb9da6021c SHOW NEW MASTER FOR SLAVE WITH ...
include/mysqld_error.h:
  new error message
mysql-test/r/rpl_log.result:
  updated results
mysql-test/t/rpl_log.test:
  test show new master for slave
sql/lex.h:
  show new master for slave
sql/share/czech/errmsg.txt:
  new error
sql/share/danish/errmsg.txt:
  new error
sql/share/dutch/errmsg.txt:
  new error
sql/share/english/errmsg.txt:
  new error
sql/share/estonian/errmsg.txt:
  new error
sql/share/french/errmsg.txt:
  new error
sql/share/german/errmsg.txt:
  new error
sql/share/greek/errmsg.txt:
  new error
sql/share/hungarian/errmsg.txt:
  new error
sql/share/italian/errmsg.txt:
  new error
sql/share/japanese/errmsg.txt:
  new error
sql/share/korean/errmsg.txt:
  new error
sql/share/norwegian-ny/errmsg.txt:
  new error
sql/share/norwegian/errmsg.txt:
  new error
sql/share/polish/errmsg.txt:
  new error
sql/share/portuguese/errmsg.txt:
  new error
sql/share/romanian/errmsg.txt:
  new error
sql/share/russian/errmsg.txt:
  new error
sql/share/slovak/errmsg.txt:
  new error
sql/share/spanish/errmsg.txt:
  new error
sql/share/swedish/errmsg.txt:
  new error
sql/sql_lex.h:
  show new master for slave
sql/sql_parse.cc:
  show new master for slave
sql/sql_repl.cc:
  show new master for slave
sql/sql_repl.h:
  show new master for slave
sql/sql_yacc.yy:
  show new master for slave
2001-07-04 17:14:31 -06:00
unknown
bd286b23f9 support for eval_result and let $var = query syntax in mysql-test
fixes for rpl_log test to make it config-independent


BitKeeper/etc/ignore:
  Added mysql-test/r/rpl_log.eval to the ignore list
client/mysqltest.c:
  support for eval_result and let $var = `query` syntax
mysql-test/Makefile.am:
  import more variables into mysql-test-run
mysql-test/mysql-test-run.sh:
  if we got wrong result on eval_result test case, diff against the
  expanded result, not the template
mysql-test/r/rpl_log.result:
  change config-dependent parts of the result to dynamic variables
mysql-test/t/rpl_log.test:
  get server version from the server
  remove obsoleted replace hack to solve port problem - use eval_result
  instead
2001-06-30 13:08:35 -06:00
unknown
bcc51cb0a3 show master forced rotate info in SHOW BINLOG EVENTS
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
2001-06-23 19:37:24 -06:00
unknown
d26e8c3944 merged new 3.23 errors
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
2001-06-22 08:35:18 -06:00
unknown
5eefda7a85 added SHOW BINLOG EVENTS
fixed log sequence bugs
fixed bugs in handling Slave event
added test case with SHOW BINLOG EVENTS
have not fixed all the bugs - found some that are also in 3.23,
will fix them there first, then do pull and cleanup

will not push this changeset


include/mysqld_error.h:
  new error
mysql-test/mysql-test-run.sh:
  use quotes in expr
sql/lex.h:
  SHOW BINLOG EVENTS
sql/log.cc:
  fixed log sequence bugs
sql/log_event.cc:
  SHOW BINLOG EVENTS
  fixed bugs Slave event handling
sql/log_event.h:
  SHOW BINLOG EVENTS
sql/share/english/errmsg.txt:
  SHOW BINLOG EVENTS
sql/sql_lex.h:
  SHOW BINLOG EVENTS
sql/sql_parse.cc:
  SHOW BINLOG EVENTS
sql/sql_repl.cc:
  SHOW BINLOG EVENTS
sql/sql_repl.h:
  SHOW BINLOG EVENTS
sql/sql_yacc.yy:
  SHOW BINLOG EVENTS
2001-06-21 13:19:24 -06:00