mariadb

Tree: af26b2b87e

Author	SHA1	Message	Date
unknown	af26b2b87e	WL#3629 - Replication of Invocation and Invoked Features This patch corrects errors that occurred in a local manual merge. It adds the originator column in the results of the SHOW EVENTS command for a series of tests. The only code change is to correct references to the classname in enums. mysql-test/r/events.result: WL#3629 - Replication of Invocation and Invoked Features This patch corrects errors that occurred in a local manual merge. It adds the originator column in the results of the SHOW EVENTS command. mysql-test/r/events_bugs.result: WL#3629 - Replication of Invocation and Invoked Features This patch corrects errors that occurred in a local manual merge. It adds the originator column in the results of the SHOW EVENTS command. mysql-test/r/events_time_zone.result: WL#3629 - Replication of Invocation and Invoked Features This patch corrects errors that occurred in a local manual merge. It adds the originator column in the results of the SHOW EVENTS command. mysql-test/r/mysqldump.result: WL#3629 - Replication of Invocation and Invoked Features This patch corrects errors that occurred in a local manual merge. It adds the originator column in the results of the SHOW EVENTS command. mysql-test/r/ps.result: WL#3629 - Replication of Invocation and Invoked Features This patch corrects errors that occurred in a local manual merge. It adds the originator column in the results of the SHOW EVENTS command. mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result: WL#3629 - Replication of Invocation and Invoked Features This patch corrects errors that occurred in a local manual merge. It adds the originator column in the results of the SHOW EVENTS command. sql/event_data_objects.cc: WL#3629 - Replication of Invocation and Invoked Features This patch corrects errors that occurred in a local manual merge. It adds the classname to the enums appearing in another patch.	19 years ago
unknown	4a0f5887b7	Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl into mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl mysql-test/t/events.test: Auto merged sql/event_queue.cc: Auto merged sql/events.cc: Auto merged sql/lex.h: Auto merged sql/slave.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. BitKeeper/deleted/.del-mysql_create_system_tables.sh: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. mysql-test/r/events.result: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. mysql-test/r/events_grant.result: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. mysql-test/r/events_restart_phase1.result: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. mysql-test/r/system_mysql_db.result: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. mysql-test/t/events_restart_phase1.test: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. scripts/mysql_system_tables.sql: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. scripts/mysql_system_tables_fix.sql: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. sql/event_data_objects.cc: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. sql/event_data_objects.h: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. sql/event_db_repository.cc: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. sql/event_db_repository.h: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. sql/sql_udf.cc: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches.	19 years ago
unknown	7e43b1f586	Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl into mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629 sql/slave.cc: Auto merged	19 years ago
unknown	cbbb40346f	post-merge test fixes	19 years ago
unknown	75686dc73f	WL#3629 - Replication of Invocation and Invoked Features This patch corrects errors that occurred in a local manual merge as a result of updating the local repository and includes changes necessary to correct problems found during the recalculation of next execution of events in RBR. mysql-test/include/rpl_events.inc: WL#3629 - Replication of Invocation and Invoked Features This patch changes the rpl_events test to be more comprehensive in catching errors as a result of RBR. Changes include clarification of SELECTs with WHERE clauses and synchronization with master and slave. mysql-test/r/rpl_events.result: WL#3629 - Replication of Invocation and Invoked Features This patch changes the results for the rpl_events test to accomodate the changes in the test. scripts/mysql_system_tables.sql: WL#3629 - Replication of Invocation and Invoked Features This patch adds the originator column and a new enum value to the mysql.event table. This change was necessary to accomodate changes as a result of other patches. sql/event_data_objects.cc: WL#3629 - Replication of Invocation and Invoked Features This patch corrects an error in merging that occurred during manual merge. The status check was changed to include either ENABLED or DISABLED in the gate to change the status to SLAVESIDE_DISABLED for events replicated to the slave. This patch also includes an update to correct a problem encountered during testing after the local merge. The update_timing_fields method is replicating the timing changes in RBR to the slave thereby over writing the change to the status column in the process. This code includes a check to turn off the next binlog event if in RBR. sql/event_queue.cc: WL#3629 - Replication of Invocation and Invoked Features This patch corrects an error in merging that occurred during manual merge. The code was corrected to include both types of disabled status enums (DISABLED, SLAVESIDE_DISABLED) in the create_event and update_event methods. sql/sql_show.cc: WL#3629 - Replication of Invocation and Invoked Features This patch corrects an error in merging that occurred during manual merge. It corrects the order in which the originator column appears in the show structures. The error caused incorrect output on SHOW EVENTS commands.	19 years ago
unknown	aae14104b0	Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge sql/mysqld.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_select.cc: Auto merged	19 years ago
unknown	c033e15e9b	Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge client/mysqlbinlog.cc: Auto merged mysql-test/extra/binlog_tests/binlog.test: Auto merged mysql-test/r/binlog_row_binlog.result: Auto merged mysql-test/r/binlog_stm_binlog.result: Auto merged mysql-test/t/disabled.def: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/lock.cc: Auto merged sql/mysqld.cc: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_select.cc: Auto merged sql/table.h: Auto merged mysql-test/r/rpl_ndb_log.result: Manual merge main->rpl 5.1 mysql-test/r/rpl_truncate_7ndb.result: Manual merge main->rpl 5.1 sql/log.cc: Manual merge main->rpl 5.1 sql/log_event.cc: Manual merge main->rpl 5.1	19 years ago
unknown	e420488ee6	Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge sql/mysqld.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_select.cc: Auto merged	19 years ago
unknown	5de36f391f	Merge mysql.com:/home/bar/mysql-5.0.b27079 into mysql.com:/home/bar/mysql-5.1-new-rpl	19 years ago
unknown	ee0475bf5d	Code layout fix for bug N 27079 Thanks to Gluh for suggestion.	19 years ago
unknown	6370f6226f	Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl into mysql.com:/home/bar/mysql-5.0.b27079	19 years ago
unknown	39104456f5	Merge mysql.com:/home/bar/mysql-5.0.b22378 into mysql.com:/home/bar/mysql-5.1-new-rpl strings/ctype-utf8.c: Auto merged BUILD/compile-pentium-debug-max: After merge fix	19 years ago
unknown	dbc12e4aac	Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl into mysql.com:/home/bar/mysql-5.0.b22378	19 years ago
unknown	e3d3f3028f	Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch	19 years ago
unknown	5f7d12e440	Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl into romeo.(none):/home/bkroot/mysql-5.1-rpl	19 years ago
unknown	8de46d0d53	Eliminating some warnings. sql/field.h: Using my_ptrdiff_t for offset instead of uint. sql/log_event.cc: Removing debug code that generated warnings on Windows build.	19 years ago
unknown	c9371f2558	Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl into dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bugBug27015-s_query_q_append	19 years ago
unknown	88d2792a42	Merge mysql.com:/home/bar/mysql-5.0.b25946 into mysql.com:/home/bar/mysql-5.1.b25946 client/mysql.cc: Auto merged	19 years ago
unknown	cd36f9cf94	Bug#27015 s_query.q_append() called without s_query.reserve()? there is a way to miss allocation for the punctuation marks, namely if (q == EOF) is true inside of append_identifier(), i.e in case names are not quoted (not by default). Replacing q_append with the method with reallocation if needed. sql/sql_base.cc: changing the method that uses reallocation if necessary	19 years ago
unknown	ceffe745ae	Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch mysql-test/mysql-test-run.pl: Auto merged	19 years ago
unknown	0e6256921c	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user	19 years ago
unknown	0e9a844fee	Eliminating a warning for unused variable in non-debug build.	19 years ago
unknown	04c0f3cb6a	Eliminating some compiler warnings. sql/log_event.cc: Adding non-reachable return statement at end of function to keep compiler happy. sql/slave.cc: In order to keep compiler happy: using variable only used in debug code instead of recalling virtual function.	19 years ago
unknown	47d5ed7f2b	BUG#22583 (RBR between MyISAM and non-MyISAM tables containing a BIT field does not work): Enabling previously disabled test. mysql-test/t/disabled.def: Enabling test rpl_multi_engine.	19 years ago
unknown	32b9ab07de	BUG#27441 (There is no COLS bitmap for the after image of an update rows event): Adding a after image COLS bitmap to Update_rows_log_event (for telling what columns that are present in the after image of each row update). Also fixing case where Rows_log_event length was not correctly computed (happened when the number of columns in a table was more than 251). mysql-test/r/rpl_row_inexist_tbl.result: Result change. sql/log_event.cc: Extending Rows_log_event with two new fields: m_bitbuf_ai and m_cols_ai. These fields are only used for the Update_rows_log_event. Adding implementation of Update_rows_log_event destructor. Using new after image fields inside the Update_rows_log_event. Factoring out common constructor bodies into Update_rows_log_event::init() function. Fixing case where length of Rows_log_event was not correctly computed (for tables with more than 251 columns). sql/log_event.h: Moving implementation of Rows_log_event::get_data_size() into .cc file. Adding Update_rows_log_event constructor accepting both before image and after image COLS vector. Adding Update_rows_log_vector destructor. Adding fields m_bitbuf_ai and m_cols_ai to Rows_log_event. Fixing is_valid() to look at m_cols_ai as well.	19 years ago
unknown	b1c23f112f	Bug#22378 Make error, strings/ctype-utf8.c, uni_plane undeclared - Fixing utf8_general_cs according to recent changes. - Compiling utf8_general_cs in pentium-debug-max configuration to avoid these problems in the future. BUILD/compile-pentium-debug-max: Enable compiling of experimental collations in compile-pentium-debug-max config/ac-macros/character_sets.m4: Adding hidden flag --with-experimental-collations, not seen in "configure --help". strings/ctype-utf8.c: Compilation failure changes: catching up with previous character set changes: - uni_plane is now not a global variables - adding new parameter into my_strnncollsp_utf8_cs - adding my_strnxfrm_len into MY_COLLATION_HANDLER for utf8_general_cs	19 years ago
unknown	143151229f	Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 into trift-lap.fambruehe:/MySQL/M51/push-5.1 mysql-test/t/query_cache_sql_prepare.test: Auto merged	19 years ago
unknown	27b333b75c	Bug#25946 Namespace not include for xsi usage within --xml output with null/nil values Fix: adding namespace reference into "mysql --xml" output, to make it work similary to "mysqldump --xml". client/mysql.cc: Adding namespace reference. mysql-test/r/client_xml.result: Fixing test results	19 years ago
unknown	916245f9c4	Bug#27079 Crash while grouping empty ucs2 strings Problem: GROUP BY on empty ucs2 strings crashed server. Reason: sometimes mi_unique_hash() is executed with ptr=null and length=0, which means "empty string". The branch of code handling UCS2 character set was not safe against ptr=null and fell into and endless loop even if length=0 because of poiter arithmetic overflow. Fix: adding special check for length=0 to avoid pointer arithmetic overflow. mysql-test/r/ctype_uca.result: Adding test case mysql-test/t/ctype_uca.test: Adding test case strings/ctype-uca.c: Fix my_uca_scanner_init_ucs2 to be safe against strings with length=0 and ptr=0.	19 years ago
unknown	e33f3709c8	Making sure thar archive is inited for info AUTO call. storage/archive/ha_archive.cc: Adding init for HA_STATUS_AUTO call	19 years ago
unknown	ac8c78bbca	Merge piggy:/home/brian/mysql-5.1-arch into zim.(none):/home/brian/mysql/pread-archive-5.1 storage/archive/ha_archive.cc: Auto merged	19 years ago
unknown	ba63bc6841	Centralized init logic for starting a scan.	19 years ago
unknown	aaef396b5a	Adjusting locks for concurrency issue (not found, but suspect). storage/archive/ha_archive.cc: Adjusted lock positions to handle possible concurrency condition	19 years ago
unknown	2dab445783	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user	19 years ago
unknown	7734122613	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user	19 years ago
unknown	cdbe7302d7	correction of manual merge	19 years ago
unknown	b339b30c55	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb	19 years ago
unknown	cba5f9d95d	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user storage/ndb/include/ndbapi/NdbRecAttr.hpp: Auto merged storage/ndb/src/ndbapi/NdbRecAttr.cpp: Auto merged sql/ha_ndbcluster.cc: manual merge storage/ndb/test/src/NDBT_Table.cpp: manual merge	19 years ago
unknown	d24dab182f	correct medium int printout correct cit printout correct bit store retrieve ndb/include/ndbapi/NdbRecAttr.hpp: correct medium int printout ndb/src/ndbapi/NdbRecAttr.cpp: correct cit printout sql/ha_ndbcluster.cc: correct bit store retrieve	19 years ago
unknown	ff1d6b2252	Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl into mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629 BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8: Auto merged BitKeeper/deleted/.del-mysql_create_system_tables.sh: Auto merged scripts/mysql_system_tables_fix.sql: Auto merged sql/event_data_objects.cc: Auto merged sql/slave.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/event_data_objects.h: Manual merge. sql/event_queue.cc: Manual merge. sql/events.cc: Manual merge.	19 years ago
unknown	05a352bb99	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb	19 years ago
unknown	e3f3c6f0b6	Bug #26986 BIT(33) for ndb is broken on solaris. - always store lsw first in ndb	19 years ago
unknown	f28a7a0674	Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb into clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug24028	19 years ago
unknown	8866750e6c	Merge zim.(none):/home/bk/mysql-5.1-arch into zim.(none):/home/brian/mysql/slap-5.1 client/mysqlslap.c: Auto merged	19 years ago
unknown	1517e2c456	Added pre and post option to test run (allows me to adjust an engine once all of the data has been loaded). Kinda obvious that this was going to come up ;) client/client_priv.h: New options client/mysqlslap.c: Added option for pre/post run mysql-test/r/mysqlslap.result: Updated tests mysql-test/t/mysqlslap.test: Updated test	19 years ago
unknown	df4d3039c3	remove warning	19 years ago
unknown	0234a14e75	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/test/ndbapi/testNodeRestart.cpp: Auto merged	19 years ago
unknown	73ad31953e	Merge mysqldev@production.mysql.com:my/mysql-5.1-release into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/test/ndbapi/testNodeRestart.cpp: Auto merged	19 years ago
unknown	dbe5fadea0	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb storage/ndb/tools/restore/Restore.cpp: manual merge	19 years ago
unknown	d37fc3ce1f	Bug #26900 ndb_restore printout option does not give structured data - set sizes for data	19 years ago

1 2 3 4 5 ...

44606 Commits (af26b2b87efe108fbaa19c83506411a43a005b33) All Branches Search

44606 Commits (af26b2b87efe108fbaa19c83506411a43a005b33)

All Branches