- 16 May, 2008 6 commits
-
-
unknown authored
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570 mysql-test/suite/rpl/t/rpl_sp.test: Auto merged mysql-test/suite/rpl/r/rpl_sp.result: Use local. Needs re-recording.
-
unknown authored
mysql-test/r/ctype_cp932_binlog_stm.result: New offsets because of quote marks. mysql-test/r/mysqlbinlog.result: Re-add variables removed in merge at file-vers 1.47. mysql-test/suite/binlog/r/binlog_database.result: create_string() output changes the quoting and inserts newlines. mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result: Change in quoting. mysql-test/suite/rpl/r/rpl_sp.result: Adds quotes and newlines in creation of routines in binlog.
-
unknown authored
master also, so that we can visually see the slave is the same. mysql-test/r/rpl_sp.result: SHOW CREATE on master also. mysql-test/t/rpl_sp.test: SHOW CREATE on master also.
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570 mysql-test/suite/rpl/t/rpl_sp.test: Auto merged mysql-test/suite/rpl/r/rpl_sp.result: manual merge.
-
unknown authored
mysql-test/r/rpl_sp.result: Add binlog results to show that they're written correctly. mysql-test/t/rpl_sp.test: Add binlog results to show that they're written correctly.
-
- 15 May, 2008 3 commits
-
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570 BitKeeper/deleted/.del-binlog_innodb.result: Auto merged sql/sp_head.cc: Auto merged mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result: need to re-record. mysql-test/suite/rpl/r/rpl_sp.result: need to re-record. mysql-test/r/mysqlbinlog.result: manual merge. mysql-test/suite/rpl/t/rpl_sp.test: manual merge. sql/sp.cc: manual merge. sql/sp_head.h: manual merge.
-
unknown authored
slave The stored-routine code took the contents of the (lowest) parser and copied it directly to the binlog, which causes problems if there is a special case of interpretation at the parser level -- which there is, in the "/*!VER */" comments. The trailing "*/" caused errors on the slave, naturally. Now, since by that point we have /properly/ created parse-tree (as the rest of the server should do!) for the stored-routine CREATE, we can construct a perfect statement from that information, instead of writing uncertain information from an unknown parser state. Fortunately, there's already a function nearby that does exactly that. --- Update for Bug#36570. Qualify routine names with db name when writing to the binlog ONLY if the source text is qualified. mysql-test/r/binlog_innodb.result: Offsets changed due to quoting. --- New offset to account for db-qualified names. mysql-test/r/ctype_cp932_binlog.result: Offsets changed due to quoting. --- Qualify routine names with DB. Offsets change also. mysql-test/r/mysqlbinlog.result: Case changed in result due to interpretation of data instead of literal recitation. --- Qualify procedure name with db. mysql-test/r/rpl_sp.result: Offsets changed due to quoting. Added tests. --- Qualify routine names with DB if qualified in query. Offsets change also. mysql-test/t/rpl_sp.test: Add version-limiting quotes to exercise bug#36570. Test that backtick-quoted identifiers and labels work also. --- Use different db to show qualification works. Qualify routine names with DB if qualified in query. sql/sp.cc: In create_string, we may not have a sp_name parameter yet, so instead pass the char* and length of the only member we'd get out of it. Having done that, we can use the same function to write the CREATE (FUNC|TRIG|PROC) statement to the binlog as we always used to display the statement to the user. --- Make the db name part of the CREATE string if it is specified. Specify it in part of writing to the binlog when creating a new routine. sql/sp_head.cc: Set the sp_head m_explicit_name member as the sp_name member is set. We can not peek at this later, as the sp_name is gone by then. sql/sp_head.h: Add a member to track whether the name is qualified with the database.
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570 BitKeeper/deleted/.del-binlog_innodb.result: Auto merged mysql-test/r/mysqlbinlog.result: need to record. mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result: need to record. mysql-test/suite/rpl/r/rpl_sp.result: need to record. mysql-test/suite/rpl/t/rpl_sp.test: manual merge. sql/sp.cc: Manual merge
-
- 14 May, 2008 1 commit
-
-
unknown authored
slave The stored-routine code took the contents of the (lowest) parser and copied it directly to the binlog, which causes problems if there is a special case of interpretation at the parser level -- which there is, in the "/*!VER */" comments. The trailing "*/" caused errors on the slave, naturally. Now, since by that point we have /properly/ created parse-tree (as the rest of the server should do!) for the stored-routine CREATE, we can construct a perfect statement from that information, instead of writing uncertain information from an unknown parser state. Fortunately, there's already a function nearby that does exactly that. mysql-test/r/binlog_innodb.result: Offsets changed due to quoting. mysql-test/r/ctype_cp932_binlog.result: Offsets changed due to quoting. mysql-test/r/mysqlbinlog.result: Case changed in result due to interpretation of data instead of literal recitation. mysql-test/r/rpl_sp.result: Offsets changed due to quoting. Added tests. mysql-test/t/rpl_sp.test: Add version-limiting quotes to exercise bug#36570. Test that backtick-quoted identifiers and labels work also. sql/sp.cc: In create_string, we may not have a sp_name parameter yet, so instead pass the char* and length of the only member we'd get out of it. Having done that, we can use the same function to write the CREATE (FUNC|TRIG|PROC) statement to the binlog as we always used to display the statement to the user.
-
- 12 May, 2008 3 commits
-
-
unknown authored
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-bugteam libmysqld/lib_sql.cc: manual merge.
-
unknown authored
SHOW commands fail in embedded mode because schema_table array doesn't correspond to enum_schema_tables. This patch implements a dummy implementation of the abstract fill_table function to be used when the event scheduler (or other core feature) isn't part of the build. libmysqld/lib_sql.cc: Fixed type conversion warning. sql/sql_show.cc: Leave entry for EVENTS to keep array consistent but set the fill_table function pointer to a dummy function instead.
-
unknown authored
- a 64 bit compile warning in embedded - disabled the new (and failing tests for Bug#36522 libmysqld/lib_sql.cc: Fixed: win64 warning mysql-test/t/disabled.def: Disabled the new (and failing) tests for 36522
-
- 10 May, 2008 1 commit
-
-
unknown authored
Addresses the following bugs: Change the fix for Bug#32440 to show bytes instead of kilobytes in INFORMATION_SCHEMA.TABLES.DATA_FREE. branches/5.1: Fix bug#29507 TRUNCATE shows to many rows effected In InnoDB, the row count is only a rough estimate used by SQL optimization. InnoDB is now return row count 0 for TRUNCATE operation. branches/5.1: Fix bug#35537 - Innodb doesn't increment handler_update and handler_delete Add the calls to ha_statistic_increment() in ha_innobase::delete_row() and ha_innobase::update_row(). Fix Bug#36169 create innodb compressed table with too large row size crashed Sometimes it is possible that row_drop_table_for_mysql(index->table_name, trx, FALSE); is invoked in row_create_index_for_mysql() when the index object is freed so copy the table name to a safe place beforehand and use the copy. Fix Bug#36434 ha_innodb.so is installed in the wrong directory Change pkglib_LTLIBRARIES with pkgplugin_LTLIBRARIES which has been forgotten in this commit: http://lists.mysql.com/commits/40206 mysql-test/r/innodb.result: Apply InnoDB snapshot innodb-5.1-ss2438. Revision r2420: branches/5.1: Fix bug#29507 TRUNCATE shows to many rows effected In InnoDB, the row count is only a rough estimate used by SQL optimization. InnoDB is now return row count 0 for TRUNCATE operation. Revision r2421: branches/5.1: Fix bug#35537 - Innodb doesn't increment handler_update and handler_delete Add the calls to ha_statistic_increment() in ha_innobase::delete_row() and ha_innobase::update_row(). mysql-test/t/innodb.test: Apply InnoDB snapshot innodb-5.1-ss2438. Revision r2420: branches/5.1: Fix bug#29507 TRUNCATE shows to many rows effected In InnoDB, the row count is only a rough estimate used by SQL optimization. InnoDB is now return row count 0 for TRUNCATE operation. Revision r2421: branches/5.1: Fix bug#35537 - Innodb doesn't increment handler_update and handler_delete Add the calls to ha_statistic_increment() in ha_innobase::delete_row() and ha_innobase::update_row(). storage/innobase/Makefile.am: Apply InnoDB snapshot innodb-5.1-ss2438. Revision r2429: branches/5.1: * Use INNODB_CFLAGS insead of cluttering CFLAGS with InnoDB specific flags. CFLAGS are used to compile every file in the MySQL source tree. * Add INNODB_DYNAMIC_CFLAGS to the flags of the dynamic plugin and use -prefer-non-pic to make the dynamic plugin faster on i386. Approved by: Sunny Revision r2437: branches/5.1: Fix Bug#36434 ha_innodb.so is installed in the wrong directory Change pkglib_LTLIBRARIES with pkgplugin_LTLIBRARIES which has been forgotten in this commit: http://lists.mysql.com/commits/40206 Revision r2430: branches/5.1: Use CFLAGS instead of INNODB_CFLAGS to avoid having incompatible flags inserted in CFLAGS and INNODB_CFLAGS and to avoid compiling mysql and innodb with different flags. Discussed with: Sunny Revision r2434: branches/5.1: Merge changes from MySQL: ChangeSet@1.2645, 2007-12-19 13:24:43+00:00, jperkin@chorlton.adsl.perkin.org.uk +14 -0 Add new pkgplugindir handling to seperate plugins from libraries, and allow override for binary distributions. Extend mysql_config to print compiled-in plugin location for third-party plugins to use. Resolves bug#31736. and ChangeSet@1.2646, 2008-01-02 13:00:46+00:00, jperkin@chorlton.adsl.perkin.org.uk +11 -0 Use pkglibdir to simplify pkgplugindir, and fix the path in a couple of Makefiles. Continuation of the fix for bug#31736. Revision r2436: branches/5.1: Non-functional white space change in Makefile.am: Use tabs for indentation and be consistent about spaces around the equal sign. storage/innobase/handler/ha_innodb.cc: Apply InnoDB snapshot innodb-5.1-ss2438. Revision r2419: branches/5.1: Change the fix for Bug#32440 to show bytes instead of kilobytes in INFORMATION_SCHEMA.TABLES.DATA_FREE. Suggested by: Domas Mituzas <domas@mysql.com> Approved by: Heikki Revision r2435: branches/5.1: Merge change from MySQL: ChangeSet@1.2563, 2008-03-18 19:42:04+04:00, gluh@mysql.com +1 -0 Bug#35406 5.1-opt crashes on select from I_S.REFERENTIAL_CONSTRAINTS added intialization of f_key_info.referenced_key_name for the case when referenced table is dropped Revision r2420: branches/5.1: Fix bug#29507 TRUNCATE shows to many rows effected In InnoDB, the row count is only a rough estimate used by SQL optimization. InnoDB is now return row count 0 for TRUNCATE operation. Revision r2421: branches/5.1: Fix bug#35537 - Innodb doesn't increment handler_update and handler_delete Add the calls to ha_statistic_increment() in ha_innobase::delete_row() and ha_innobase::update_row(). storage/innobase/plug.in: Apply InnoDB snapshot innodb-5.1-ss2438. Revision r2429: branches/5.1: * Use INNODB_CFLAGS insead of cluttering CFLAGS with InnoDB specific flags. CFLAGS are used to compile every file in the MySQL source tree. * Add INNODB_DYNAMIC_CFLAGS to the flags of the dynamic plugin and use -prefer-non-pic to make the dynamic plugin faster on i386. Approved by: Sunny Revision r2432: branches/5.1: Non-functional change: use tabs for indentation in plug.in. Revision r2431: branches/5.1: Fix r2430, it should be CFLAGS="$CFLAGS ..." not CFLAGS="..." Revision r2430: branches/5.1: Use CFLAGS instead of INNODB_CFLAGS to avoid having incompatible flags inserted in CFLAGS and INNODB_CFLAGS and to avoid compiling mysql and innodb with different flags. Discussed with: Sunny Revision r2433: branches/5.1: Add vim modeline to hint it that plug.in is a config file so it can be colorized. storage/innobase/row/row0mysql.c: Apply InnoDB snapshot innodb-5.1-ss2438. Revision r2422: branches/5.1: Fix Bug#36169 create innodb compressed table with too large row size crashed Sometimes it is possible that row_drop_table_for_mysql(index->table_name, trx, FALSE); is invoked in row_create_index_for_mysql() when the index object is freed so copy the table name to a safe place beforehand and use the copy. Approved by: Sunny storage/innobase/row/row0sel.c: Apply InnoDB snapshot innodb-5.1-ss2438. Revision r2388: branches/5.1: Swap the order in which mysql_thd, mysql_query_str and *mysql_query_str are checked for non-NULL. Suggested by: Marko
-
- 09 May, 2008 6 commits
-
-
unknown authored
into hh-nb.hungers:/work/merge/mysql-5.1-36522
-
unknown authored
Enable previously disabled test cases which were tested against the embedded build. The test cases are modified so that they require non-embedded build. mysql-test/t/disabled.def: Re-enabled event_scheduler_basic and event_scheduler_func since these tests aren't suppose to work in embedded build anyway. mysql-test/t/event_scheduler_basic.test: Require that this test isn't run on embedded build mysql-test/t/event_scheduler_func.test: Require that this test isn't run on embedded build
-
unknown authored
Missing file: include/is_embedded.inc This file was left out of the initial changeset by misstake. mysql-test/include/is_embedded.inc: Missing file patch: include/is_embedded.inc
-
unknown authored
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-bugteam
-
unknown authored
The event scheduler was not designed to work in embedded mode. This patch disables and excludes the event scheduler when the server is compiled for embedded build. libmysqld/Makefile.am: Reduce the amount of event code in an embedded build. mysql-test/t/events_trans.test: Disable test if run in embedded mode. sql/Makefile.am: Introduce definition HAVE_EVENT_SCHEDULER and one new source file. sql/event_data_objects.cc: Refactor Event_parse_data to new file. sql/event_data_objects.h: Refactor Event_parse_data to new file. Move global definitions to new file. sql/event_queue.cc: Move all parsed items to Event_parse_data for easier modularization. sql/events.cc: Move all parsed items to Event_parse_data for easier modularization. sql/mysqld.cc: Disable the event schedular subsystem if the server is compiled in embedded mode. sql/set_var.cc: Disable the event schedular subsystem if the server is compiled in embedded mode. sql/set_var.h: Disable the event schedular subsystem if the server is compiled in embedded mode. sql/sql_db.cc: Disable the event schedular subsystem if the server is compiled in embedded mode. sql/sql_parse.cc: Disable the event schedular subsystem if the server is compiled in embedded mode. sql/sql_show.cc: Disable the event schedular subsystem if the server is compiled in embedded mode. sql/sql_test.cc: Disable the event schedular subsystem if the server is compiled in embedded mode. sql/sql_yacc.yy: Only include event-code needed for parsing to reduce impact on embedded build. Move all constants to Event_parse_data class. mysql-test/r/events_embedded.result: Add test case to make sure the 'event_scheduler' can't be activated in embedded mode. mysql-test/r/is_embedded.require: Add test case to make sure the 'event_scheduler' can't be activated in embedded mode. mysql-test/t/events_embedded.test: Add test case to make sure the 'event_scheduler' can't be activated in embedded mode. sql/event_parse_data.cc: New file. Extracted Event_parse data into a new file. sql/event_parse_data.h: New file. Extracted Event_parse data into a new file.
-
unknown authored
Remove optimizations on innobase/mem/* to avoid apparent compiler bug which causes memory overruns. See also bug 19424, and probably bug 36366. This is done in 5.1+; 5.0 already has this workaround in place. storage/innobase/CMakeLists.txt: Remove optimizations on innobase/mem/* to avoid apparent compiler bug which causes memory overruns. See bug 34297, bug 19424, and probably bug 36366.
-
- 08 May, 2008 5 commits
-
-
unknown authored
BitKeeper/etc/ignore: Added mysql-test/bug36522-64.tar mysql-test/bug36522.tar mysql-test/t.log mysql-test/tps.log to the ignore list
-
unknown authored
test change for 5.1+ (show create view adds two columns in 5.1) Patch only for 5.1+ mysql-test/suite/rpl/r/rpl_sp.result: restored the original 5.1 test result mysql-test/suite/rpl/r/rpl_view.result: Bug#32575: Parse error of stmt with extended comments on slave side Updated test result for show create view in 5.0 to 5.1
-
unknown authored
into client-10-129-10-147.upp.off.mysql.com:/Users/mattiasj/clones/topush-51-bugteam mysql-test/suite/rpl/r/rpl_sp.result: Auto merged mysql-test/suite/rpl/t/rpl_view.test: Auto merged sql/sql_view.cc: This was already fixed in 5.1 mysql-test/suite/rpl/r/rpl_view.result: manual merge
-
unknown authored
into client-10-129-10-147.upp.off.mysql.com:/Users/mattiasj/clones/topush-50-bugteam
-
unknown authored
Problem was that mysql_create_view did not remove all comments characters when writing to binlog, resulting in parse error of stmt on slave side. Solution was to use the recreated select clause and add a generated CHECK OPTION clause if needed. mysql-test/r/rpl_sp.result: Bug#32575 - Parse error of stmt with extended comments on slave side Updated test result mysql-test/r/rpl_view.result: Bug#32575 - Parse error of stmt with extended comments on slave side Updated test result mysql-test/t/rpl_view.test: Bug#32575 - Parse error of stmt with extended comments on slave side Added test case sql/sql_view.cc: Bug#32575 - Parse error of stmt with extended comments on slave side Problem was that mysql_create_view did not remove all comments characters when writing to binlog, resulting in parse error of stmt on slave side. Solution was to use the recreated select clause and generate 'WITH {LOCAL|CASCADED} CHECK OPTION'.
-
- 07 May, 2008 6 commits
-
-
unknown authored
into mysql.com:/Users/davi/mysql/mysql-5.1-bugteam
-
unknown authored
into riska.(none):/home/sven/bkroot/5.1-bugteam mysql-test/suite/rpl/t/disabled.def: Auto merged
-
unknown authored
Temporarily checking in an incorrect test case. Rationale: the impact of this bug is negligible (it's almost a feature request). We need 5.1 to be stable, and making a real fix is a bit risky. So the fix is postponed to 6.0. mysql-test/suite/rpl/r/rpl_ddl.result: Updated result file. mysql-test/suite/rpl/t/disabled.def: Enabling test case rpl_ddl.test
-
unknown authored
The test suite/rpl/t/rpl_innodb_bug28430.test was disabled because of BUG#32247, but not re-enabled when BUG#32247 was fixed. I've re-enabled it. The test and result file needed to be updated too. mysql-test/suite/rpl/r/rpl_innodb_bug28430.result: Updated result file. mysql-test/suite/rpl/t/disabled.def: Enabled the rpl_innodb_bug28430 test case. mysql-test/suite/rpl/t/rpl_innodb_bug28430.test: show slave status is not needed since we have select count(*)
-
unknown authored
- Disable the "prefer full scan on clustered primary key over full scan of any secondary key" rule introduced by BUG#35850. - Update test results accordingly (bk trigger: file this for BUG#35850) mysql-test/r/innodb.result: BUG#35850 "Performance regression in 5.1.23/5.1.24" - Update test results mysql-test/r/innodb_mysql.result: BUG#35850 "Performance regression in 5.1.23/5.1.24" - Testcase - Update test results mysql-test/r/join_outer_innodb.result: BUG#35850 "Performance regression in 5.1.23/5.1.24" - Update test results mysql-test/t/innodb_mysql.test: BUG#35850 "Performance regression in 5.1.23/5.1.24" - Testcase sql/sql_select.cc: BUG#35850 "Performance regression in 5.1.23/5.1.24" - Disable the "prefer full scan on clustered primary key over full scan of any secondary key" rule introduced by BUG#35850.
-
unknown authored
has been fixed and closed. mysql-test/t/disabled.def: Re-enable test case as bug has been fixed.
-
- 06 May, 2008 9 commits
-
-
unknown authored
into mysql.com:/Users/davi/mysql/mysql-5.1-bugteam
-
unknown authored
into mysql.com:/Users/davi/mysql/mysql-5.1-bugteam
-
unknown authored
The problem is that the patch for Bug 33464 didn't update the results of the test cases which caused the problem. Dropping a stored routine also revoke privileges for all users on the stored routine and errors about missing grants are converted into warnings. Before Bug 33464 such errors could be incorrectly returned to the user, which would later trigger a assertion due to multiple errors being set. mysql-test/suite/funcs_1/r/innodb_storedproc_06.result: Update test case result, grants were already dropped. mysql-test/suite/funcs_1/r/memory_storedproc_06.result: Update test case result, grants were already dropped. mysql-test/suite/funcs_1/r/myisam_storedproc_06.result: Update test case result, grants were already dropped. mysql-test/suite/funcs_1/r/ndb_storedproc_06.result: Update test case result, grants were already dropped. mysql-test/suite/funcs_1/storedproc/storedproc_06.inc: Add comment regarding bug revealed by test case. mysql-test/suite/funcs_1/t/disabled.def: Re-enable test cases, bug has been fixed.
-
unknown authored
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-bugteam
-
unknown authored
mysql-test/r/query_cache_wlock_invalidate_func.result: Adjusted test. Query cache doesn't support multiple statements and thus using a delimiter change won't work. mysql-test/t/disabled.def: Enabled the query_cache_wlock_invalidate_func test. mysql-test/t/query_cache_wlock_invalidate_func.test: Adjusted test. Query cache doesn't support multiple statements and thus using a delimiter change won't work.
-
unknown authored
into a non-const string pointer. client/mysqltest.c: Don't use a constant string as val may be modified later.
-
unknown authored
into mysql.com:/Users/davi/mysql/mysql-5.1-bugteam
-
unknown authored
into noir.wlan.koehntopp.de:/misc/mysql/mysql-5.1-bugteam mysys/my_static.c: Auto merged mysys/my_static.h: Auto merged
-
unknown authored
-