Commit graph

19001 commits

Author SHA1 Message Date
unknown
03c42246a5 WL#2472:
Renamed Table_filter to Rpl_filter
Eliminated very annoying memory leak


sql/Makefile.am:
  Renamed Table_filter to Rpl_filter
sql/log.cc:
  Renamed Table_filter to Rpl_filter
sql/log_event.cc:
  Renamed Table_filter to Rpl_filter
sql/mysqld.cc:
  Renamed Table_filter to Rpl_filter
  Eliminated very annoying memory leak
sql/repl_failsafe.cc:
  Renamed Table_filter to Rpl_filter
sql/slave.cc:
  Renamed Table_filter to Rpl_filter
sql/slave.h:
  Renamed Table_filter to Rpl_filter
sql/sql_acl.h:
  Renamed Table_filter to Rpl_filter
sql/sql_parse.cc:
  Renamed Table_filter to Rpl_filter
sql/sql_repl.cc:
  Renamed Table_filter to Rpl_filter
sql/rpl_filter.cc:
  Renamed Table_filter to Rpl_filter
sql/rpl_filter.h:
  Renamed Table_filter to Rpl_filter
sql/sql_repl.h:
  Renamed Table_filter to Rpl_filter
2005-03-21 22:09:42 +01:00
unknown
f532a8f0ce WL#2472: Addendum: Fixes after Mats review 2005-03-10 14:36:48 +01:00
unknown
4b3caa85c4 WL#2472: Refactoring of replication and binlog filtering.
Needed to be able to have multiple masters connected 
to same slave server with different filters.


sql/Makefile.am:
  Add table_filter.cc
sql/log.cc:
  Use Table_filter
sql/log_event.cc:
  Use Table_filter
sql/mysql_priv.h:
  Use Table_filter
sql/mysqld.cc:
  Use Table_filter
sql/repl_failsafe.cc:
  Use Table_filter
sql/slave.cc:
  Use Table_filter
sql/slave.h:
  Use Table_filter
sql/sql_acl.cc:
  Use Table_filter
sql/sql_class.h:
  Use const since they should not be changed
sql/sql_parse.cc:
  Use Table_filter
sql/sql_repl.cc:
  Use Table_filter
sql/sql_repl.h:
  Use Table_filter
2005-03-08 21:12:35 +01:00
unknown
ceaacb741a mysqld.cc - remove extra #endif
sql/mysqld.cc:
  remove extra #endif
2005-02-07 12:06:55 +01:00
unknown
0d55cb70cf Merge build.mysql.com:/users/tulin/mysql-5.0
into build.mysql.com:/users/tulin/mysql-5.1


configure.in:
  Auto merged
2005-01-20 13:05:22 +01:00
unknown
59a68b8964 errmsg.txt:
Adding Shift-JIS error messages
  for Japanese Windows distributions.
  Thanks to Serg for help with a perl program 
  to merge 4.1 messages into 5.0 format :)


sql/share/errmsg.txt:
  Adding Shift-JIS error messages
  for Japanese Windows distributions.
  Thanks Serg for help :)
2005-01-20 15:33:21 +04:00
unknown
f4d40b1bcb Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2005-01-20 12:30:15 +01:00
unknown
d07dc11fa4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-20 12:27:33 +01:00
unknown
2ac6a8f757 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-01-20 12:21:10 +01:00
unknown
877ed48b3d bug#8010 - ndb
release connections when last op was simple read


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  bug#8010
    release connections when last op was simple read
2005-01-20 12:19:48 +01:00
unknown
933d80d4ff Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-01-20 12:09:17 +01:00
unknown
89a24f9335 - Improved Do-rpm to perform RPM builds inside of a chrooted build
environment (using "build" on SUSE Linux)


Build-tools/Do-rpm:
  - added functionality to perform RPM builds inside of a chrooted build
    environment (using "build" on SUSE Linux) - see "--help" for more details
2005-01-20 12:07:44 +01:00
unknown
0a91d24f45 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0
2005-01-20 14:36:40 +04:00
unknown
af23c2b34a Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-20 10:47:42 +01:00
unknown
9ff491503e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-20 10:12:48 +01:00
unknown
25d215aa24 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-20 10:12:26 +01:00
unknown
968c24761a Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0


BitKeeper/deleted/.del-errmsg.txt~31abf77f9e7b9211:
  Auto merged
2005-01-20 13:12:16 +04:00
unknown
a242d57436 errmsg.txt:
Minor fix after character set conversion.


sql/share/japanese-sjis/errmsg.txt:
  Minor fix after character set conversion.
2005-01-20 13:08:16 +04:00
unknown
80e5a7e8cf Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
2005-01-20 11:57:30 +03:00
unknown
dd7f5decb8 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-20 09:55:09 +01:00
unknown
118a85563c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-20 09:53:29 +01:00
unknown
0df88dd6da configure.in:
Auto-merge fix:
  removing this file: error messages are done
  in a different way in 5.0.
.del-errmsg.txt~31abf77f9e7b9211:
  Delete: sql/share/japanese-sjis/errmsg.txt


BitKeeper/deleted/.del-errmsg.txt~31abf77f9e7b9211:
  Delete: sql/share/japanese-sjis/errmsg.txt
configure.in:
  Auto-merge fix:
  removing this file: error messages are done
  in a different way in 5.0.
2005-01-20 12:44:33 +04:00
unknown
21753feca0 Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0


configure.in:
  Auto merged
2005-01-20 12:42:08 +04:00
unknown
026bf61e99 configure.in:
Add SJIS version of Japanese error messages.
  Windows version should include this new file,
  instead of the EUC-JP version.


configure.in:
  Add SJIS version of Japanese error messages.
  Windows version should include this new file,
  instead of the EUC-JP version.
2005-01-20 12:39:46 +04:00
unknown
41e6f84d8a errmsg.txt:
new file
2005-01-20 12:37:02 +04:00
unknown
246df068df Merge mysql.com:/dbdata/psergey/mysql-4.1-bug7885
into mysql.com:/dbdata/psergey/mysql-5.0-bug7885


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item_subselect.cc:
  Auto merged
2005-01-19 23:11:50 +03:00
unknown
c8343423c2 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug7885
2005-01-19 23:02:28 +03:00
unknown
0c20ad6c15 Merge mysql.com:/home/jimw/my/mysql-5.0-7632
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-19 11:19:21 -08:00
unknown
8db5237bba Build federated storage engine as part of max builds.
BUILD/SETUP.sh:
  Add --with-federated-storage-engine to max_configs
2005-01-19 10:40:39 -08:00
unknown
ca80eb7385 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean


BitKeeper/deleted/.del-compile-amd64-debug-max:
  Delete: BUILD/compile-amd64-debug-max
BUILD/SETUP.sh:
  Auto merged
BitKeeper/deleted/.del-compile-amd64-max:
  Delete: BUILD/compile-amd64-max
2005-01-19 10:27:18 -08:00
unknown
fa0935dead Merge mysql.com:/home/jimw/my/mysql-4.1-build
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-19 10:26:03 -08:00
unknown
98713d6482 Fix all BUILD/*max* scripts to use -DBIG_TABLES, like our real Max builds do.
(Simpler fix than last commit -- no need to mess with base_cxxflags.)


BUILD/compile-amd64-max:
  use $max_cflags
BUILD/compile-pentium-debug-max:
  use $max_cflags
BUILD/compile-pentium-debug-max-no-embedded:
  use $max_cflags
BUILD/compile-pentium-max:
  use $max_cflags
BUILD/compile-pentium-valgrind-max:
  use $max_cflags
BUILD/compile-ppc-debug-max:
  use $max_cflags
BUILD/compile-ppc-max:
  use $max_cflags
BUILD/compile-amd64-debug-max:
  use $max_cflags, remove unnecessary base_cxxflags stuff
2005-01-19 10:24:51 -08:00
unknown
5af0ea4315 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2005-01-19 18:33:35 +01:00
unknown
4bd96dd11d ndb - make sure scan recevier pointers are aligned
ndb/src/ndbapi/NdbScanOperation.cpp:
  align pointers
2005-01-19 18:32:34 +01:00
unknown
f2af63442f Merge mysql.com:/home/jimw/my/mysql-5.0-7920
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-19 07:52:02 -08:00
unknown
cbe8b9e76f Merge build.mysql.com:/users/tulin/mysql-5.0
into build.mysql.com:/users/tulin/mysql-5.1
2005-01-19 15:10:26 +01:00
unknown
6ed3ff49fc MgmtSrvr.cpp:
corrected erroneous comparison boolean < 0


ndb/src/mgmsrv/MgmtSrvr.cpp:
  corrected erroneous comparison boolean < 0
2005-01-19 15:03:34 +01:00
unknown
58d7968665 removed compiler warnings 2005-01-19 14:56:40 +01:00
unknown
3980ae5a5d Merge build.mysql.com:/users/tulin/mysql-5.0
into build.mysql.com:/users/tulin/mysql-5.1


configure.in:
  Auto merged
2005-01-19 14:20:29 +01:00
unknown
3234eb5687 added configure option to set extra ndb cc-flags 2005-01-19 14:20:26 +01:00
unknown
ff99f5925d Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-01-19 16:20:25 +03:00
unknown
6130a3ad7c View field names should be case insensitive 2005-01-19 16:19:10 +03:00
unknown
f321a60b97 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-19 14:07:00 +01:00
unknown
69d7cf6756 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
2005-01-19 10:07:18 +01:00
unknown
da8a9e2f20 ndb compiler warning, c++ style comment in c-file
ndb/include/ndb_constants.h:
  remove // from .h-file
2005-01-19 10:07:15 +01:00
unknown
1226cf25ab Merge build.mysql.com:/users/tulin/mysql-5.0
into build.mysql.com:/users/tulin/mysql-5.1


configure.in:
  Auto merged
2005-01-19 10:07:14 +01:00
unknown
21d24f34a6 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/include/kernel/AttributeHeader.hpp:
  Auto merged
ndb/include/ndb_global.h.in:
  Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
2005-01-19 10:07:14 +01:00
unknown
7893b8dfaa Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-19 10:07:13 +01:00
unknown
628804d934 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/tulin/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
2005-01-19 10:07:13 +01:00
unknown
49ab428c8d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-19 10:07:12 +01:00