1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Commit Graph

2838 Commits

Author SHA1 Message Date
unknown
7bf5eb91f0 Added slave log event to record the master position in of slave thread
in slave binlog - needed for synchronization slave during recovery


sql/log.cc:
  slave log event
sql/log_event.cc:
  slave log event
sql/log_event.h:
  slave log event
sql/slave.cc:
  slave log event
sql/sql_class.h:
  slave log event
2001-06-14 14:12:40 -06:00
sasha@mysql.sashanet.com
7ce33f90fb Added slave log event to record the master position in of slave thread
in slave binlog - needed for synchronization slave during recovery
2001-06-14 14:12:40 -06:00
unknown
2cf8889f57 do not show user/pass for slave unless running with show-slave-auth-info
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
2001-06-01 21:15:15 -06:00
sasha@mysql.sashanet.com
ad0b92f941 do not show user/pass for slave unless running with show-slave-auth-info
cleanup of register_slave_on_master()
2001-06-01 21:15:15 -06:00
unknown
20763b0dbc sql/slave.cc
fixed bad merge


sql/slave.cc:
  fixed bad merge
2001-06-01 17:53:52 -06:00
sasha@mysql.sashanet.com
c230df24dd sql/slave.cc
fixed bad merge
2001-06-01 17:53:52 -06:00
unknown
e587f1cbe6 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
sql/slave.cc:
  Auto merged
2001-06-01 16:08:40 -06:00
sasha@mysql.sashanet.com
390ea98f2d Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-06-01 16:08:40 -06:00
unknown
9f0b7b7cf7 merge
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
2001-06-01 23:51:23 +02:00
monty@work.mysql.com
ef8d161dea merge 2001-06-01 23:51:23 +02:00
unknown
3be9c739c1 worked around one bug in the new symlink code, but hit another
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
2001-06-01 15:13:02 -06:00
sasha@mysql.sashanet.com
ef11c1032c worked around one bug in the new symlink code, but hit another
test case included ( drop) - currently fails, along with rpl000009
2001-06-01 15:13:02 -06:00
unknown
7c077e68f6 Fixed bug that caused client to hang because mysqld never did send an
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.
2001-06-02 00:03:16 +03:00
monty@hundin.mysql.fi
e30ff2ece1 Fixed bug that caused client to hang because mysqld never did send an
error message if the table open or the index creation failed.
Updated portuguese error messages.
Fix for OS/2 that affected CHECK TABLE.
2001-06-02 00:03:16 +03:00
unknown
2085b1950d Merge work.mysql.com:/home/bk/mysql
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
2001-06-01 03:13:02 +02:00
monty@work.mysql.com
e595fe3b34 Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0
2001-06-01 03:13:02 +02:00
unknown
7032533d4c Added ER_SAFE() for cases when the error message could be out of bands
sql/slave.cc:
  Cleanup up indentation.
  Change to use ER_SAFE() instead of ER().
sql/unireg.h:
  Added ER_SAFE()
2001-06-01 04:10:53 +03:00
monty@hundin.mysql.fi
683a46a38b Added ER_SAFE() for cases when the error message could be out of bands 2001-06-01 04:10:53 +03:00
unknown
18da1d3f31 deal with errno out of range when reading it from the master
sql/slave.cc:
  print expected error number
sql/unireg.h:
  sanity check for errno range in ER(X)
2001-05-31 13:56:57 -06:00
sasha@mysql.sashanet.com
6d75659b42 deal with errno out of range when reading it from the master 2001-05-31 13:56:57 -06:00
unknown
ecba786861 A slave now can optionally register with the master providing the
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
2001-05-30 18:50:56 -06:00
sasha@mysql.sashanet.com
a817bd3862 A slave now can optionally register with the master providing the
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
2001-05-30 18:50:56 -06:00
unknown
704becf228 updates for LOAD DATA FROM MASTER + some cleanup of replication code
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
2001-05-28 19:18:23 -06:00
sasha@mysql.sashanet.com
8f6b34f950 updates for LOAD DATA FROM MASTER + some cleanup of replication code 2001-05-28 19:18:23 -06:00
unknown
d6ad4beed3 better error message in replication when packet is too large
sql/mini_client.cc:
  pass along ER_NET_PACKET_TOO_LARGE
sql/slave.cc:
  better error message when the packet is too large in slave thread
2001-05-03 17:27:35 -06:00
sasha@mysql.sashanet.com
fe54369179 better error message in replication when packet is too large 2001-05-03 17:27:35 -06:00
unknown
70f585cbd6 reversed virtual master
BitKeeper/deleted/.del-binlog-backup-restore.test~d5b0b9bd83738a9f:
  Delete: mysql-test/t/binlog-backup-restore.test
BitKeeper/deleted/.del-binlog-backup-restore.result~605de78abda64d27:
  Delete: mysql-test/r/binlog-backup-restore.result
2001-05-03 11:46:49 -06:00
sasha@mysql.sashanet.com
c8fdb95815 reversed virtual master 2001-05-03 11:46:49 -06:00
unknown
dc394cb9b5 fixed redundant repetition of use db in mysqlbinlog
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
2001-04-24 17:39:26 -06:00
sasha@mysql.sashanet.com
be8f18e020 fixed redundant repetition of use db in mysqlbinlog
added support for virtual master ( replicating from a directory with binlogs)
test case for backup/restore with virtual master
2001-04-24 17:39:26 -06:00
unknown
4a7af05c7f Portability fixes
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
2001-04-20 15:18:46 +03:00
monty@donna.mysql.fi
5e8c4b76d5 Portability fixes 2001-04-20 15:18:46 +03:00
unknown
c164b35345 Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
sql/slave.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-11 20:23:31 +03:00
monty@donna.mysql.fi
dc933ad9d6 Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql 2001-04-11 20:23:31 +03:00
unknown
9bf58f4fac Fixed bug in REGEXP for Linux Alpha
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
2001-04-11 20:19:52 +03:00
monty@donna.mysql.fi
d2dc65f1b4 Fixed bug in REGEXP for Linux Alpha 2001-04-11 20:19:52 +03:00
unknown
0969368d13 do not log the drop internal temporary tables into the binary log
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
2001-04-10 20:56:54 -06:00
sasha@mysql.sashanet.com
102c1945eb do not log the drop internal temporary tables into the binary log
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
2001-04-10 20:56:54 -06:00
unknown
5e90d39db9 changed signal by fd close to signal by vio_close
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
2001-03-13 23:07:12 -07:00
sasha@mysql.sashanet.com
0dd0d88e8f changed signal by fd close to signal by vio_close
added support for kill expr
fixed coredump in set @a := foo;
added testcase for user_var
added testcase for kill
2001-03-13 23:07:12 -07:00
unknown
f87b3ee44d untested changes to close socket on slave stop for OS's that do not
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
2001-03-12 20:17:32 -07:00
sasha@mysql.sashanet.com
a2b6410965 untested changes to close socket on slave stop for OS's that do not
interrupt I/O after thr_alarm_kill()

test case for order by desc coredump
2001-03-12 20:17:32 -07:00
unknown
5151b5520e Fixed test cases for innobase
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
2001-03-07 23:50:44 +02:00
monty@donna.mysql.fi
98c70da357 Fixed test cases for innobase
Fixed bug introduced with last ORDER BY optimization
Changed log position to longlong to avoid warnings.
2001-03-07 23:50:44 +02:00
unknown
1dad86e075 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


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
2001-02-26 23:09:53 -07:00
sasha@mysql.sashanet.com
62db48e4b8 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
2001-02-26 23:09:53 -07:00
unknown
6532b525f7 sql/slave.cc
merged


sql/slave.cc:
  merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-02-26 22:32:06 -07:00
sasha@mysql.sashanet.com
00c87c1bc7 sql/slave.cc
merged
2001-02-26 22:32:06 -07:00
unknown
9e459e16d2 ulonglong -> uint32 for log offset
more verbose messages when slave thread exits


sql/slave.cc:
  ulonglong -> uint32 for log offset
sql/slave.h:
  ulonglong -> uint32 for log offset
2001-02-26 22:27:20 -07:00
sasha@mysql.sashanet.com
4b9fdfc3f2 ulonglong -> uint32 for log offset
more verbose messages when slave thread exits
2001-02-26 22:27:20 -07:00