mariadb

Tree: 94e70aff64

Author	SHA1	Message	Date
Kristofer Pettersson	94e70aff64	post commit fix: missing result file.	16 years ago
Kristofer Pettersson	2d6a356abf	Bug#38551 query cache can still consume [very little] cpu time even when it is off. When the query cache is disabled, the server shouldn't attempt to take the query cache mutex. By using the command line option --query_cache_type=0, the user can disable (backport from mysql-pe)	16 years ago
Alexander Nozdrin	800ba382d9	Fix automerge: s/hash_search/my_hash_search/.	16 years ago
Alexander Nozdrin	ac7ba1bcaa	Merge from mysql-next-mr.	16 years ago
Alexander Nozdrin	273a0a4f97	Automerge from mysql-next-mr.	16 years ago
Alexander Nozdrin	7c9f6e6f3b	Fix default.conf.	16 years ago
Alexander Nozdrin	f89b2496ff	Test postfix for Bug#43138 (DROP DATABASE failure does not clean up message list).	16 years ago
He Zhenxing	c841979de4	disable rpl_spec_variables due to it fails constantly on HPUX	16 years ago
Alexander Barkov	02fff878cc	A postfix for WL#1349 Fixing locale name: en_US.UTF-8 -> en_US.utf8	16 years ago
Alexander Barkov	7a22056abb	A postfix for WL#1349: Fixing test failire problems on HP-UX	16 years ago
Luis Soares	78172f9e21	automerge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge.	16 years ago
Luis Soares	ec9aa90ad9	post-push fixes Disabled rpl_cross_version (instead of setting it experimental). Fixed outstanding warning fix in main.debug_sync.	16 years ago
He Zhenxing	42743de67d	Auto merge 5.1-rep-semisync to 5.1-rep+2-delivery1	16 years ago
He Zhenxing	f09129c6be	Skip semisync test if the plugin-dir is not set to semisync plugin dir	16 years ago
Alexander Nozdrin	069d78c067	Merge from mysql-next-mr.	16 years ago
Luis Soares	9ef305232f	Added rpl_heartbeat_2slaves to experimental list.	16 years ago
Luis Soares	aa12c04656	post-push fix: Preserving warning codes from mysql-next-mr. Updated result files. Warnings affected: - WARN_NON_ASCII_SEPARATOR_NOT_IMPLEMENTED - ER_TOO_LONG_FIELD_COMMENT	16 years ago
Alexander Barkov	46f554e5b4	Postfix for WL#1349. Don't do character set autodetection when running mysql from mysql_fix_privilege_tables.	16 years ago
Alexander Barkov	e17d05cdc7	A postfix for WL#1349. Fixed problems: - "mtr --mem mysql_locale_posix" could fail because of wrong temporary directory name: var/tmp/ -> $MYSQLTEST_VARDIR/tmp/ - "mtr federated_debug" could fail because of not compiled-in locale character set. Always run mysqladmin with latin1.	16 years ago
He Zhenxing	240dbc28f7	Postfix of previews commit, add missing file	16 years ago
He Zhenxing	b6529a140b	Add semi-sync support for Windows	16 years ago
Luis Soares	ea858f1857	post-merge fixes: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge rpl.rpl_heartbeat_basic and rpl.rpl_cross_version set as experimental.	16 years ago
Luis Soares	58e2fde011	manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge Conflicts ========= Text conflict in .bzr-mysql/default.conf Text conflict in libmysqld/CMakeLists.txt Text conflict in libmysqld/Makefile.am Text conflict in mysql-test/collections/default.experimental Text conflict in mysql-test/extra/rpl_tests/rpl_row_sp006.test Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result Text conflict in mysql-test/suite/rpl/r/rpl_row_create_table.result Text conflict in mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result Text conflict in mysql-test/t/mysqlbinlog.test Text conflict in sql/CMakeLists.txt Text conflict in sql/Makefile.am Text conflict in sql/log_event_old.cc Text conflict in sql/rpl_rli.cc Text conflict in sql/slave.cc Text conflict in sql/sql_binlog.cc Text conflict in sql/sql_lex.h 21 conflicts encountered. NOTE ==== mysql-5.1-rpl-merge has been made a mirror of mysql-next-mr: - "mysql-5.1-rpl-merge$ bzr pull ../mysql-next-mr" This is the first cset (merge/...) committed after pulling from mysql-next-mr.	16 years ago
Alexander Nozdrin	08ecfb9a8b	Automerge from mysql-next-mr.	16 years ago
Alexander Nozdrin	2f5413ebc5	Merge from mysql-trunk.	16 years ago
Alexander Nozdrin	4b8eb9891c	Fix default.conf.	16 years ago
Alexander Nozdrin	40c0ae8129	Adding forgotten files for test case for Bug#43138.	16 years ago
Alexander Nozdrin	9d7d67d436	Fix build failure on Linux.	16 years ago
Alexander Nozdrin	4be6228ce8	Automerge from mysql-next-mr-runtime.	16 years ago
Alexander Nozdrin	67dbff680e	Backporting a patch for Bug#43138. That patch had been already backported to 5.1 partially. This patch brings what was left to mysql-next-mr. Original revisions in 6.0: ------------------------------------------------------------ revno: 2617.31.26 committer: Alexander Nozdrin <alik@sun.com> branch nick: 6.0-rt-bug43138.3 timestamp: Thu 2009-04-30 19:31:30 +0400 message: Fix for Bug#43138: DROP DATABASE failure does not clean up message list. The problem was that the high-level function mysql_rm_db() invoked low-level mysql_rm_table_part2(), which reported low-level error (Unknown table) if SE refused to delete a table. Also when mysql_rm_table_part2() reported an error, it didn't add corresponding warning into the list (because it is used from other places where such behaviour is required). The fix is to 1. Remove no_warnings_for_error usage from sql_table.cc 2. Improve internal error handler support in THD, so that a stack of error handlers is allowed. 3. Create an internal error handler (Drop_table_error_handler) to silence useless warnings. 4. Use the handler in DROP DATABASE and DROP TABLE statements. ------------------------------------------------------------ revno: 2617.69.38 committer: Alexander Nozdrin <alik@sun.com> branch nick: mysql-next-bugfixing-bug37431 timestamp: Mon 2009-08-24 21:52:09 +0400 message: A test case for Bug#37431 (DROP TABLE does not report errors correctly). ------------------------------------------------------------ revno: 2617.31.29 committer: Dmitry Lenev <dlenev@mysql.com> branch nick: mysql-6.0-runtime timestamp: Fri 2009-05-01 17:37:34 +0400 message: Follow-up for fix for bug "Bug#43138: DROP DATABASE failure does not clean up message list". Fixed drop.test failure under non-debug server by moving part of test dependent on debug-only feature to separate .test file, which won't be run for non-debug versions of server. ------------------------------------------------------------ revno: 2617.45.17 committer: Sergei Golubchik <serg@mysql.com> branch nick: 6.0-maria timestamp: Wed 2009-05-13 20:08:58 +0200 message: followup for bug#43138 if delete fails with a permission denied error, we want to show it ------------------------------------------------------------ The patch was backported to 5.1 in scope of Bug#42364 by the following revision: ------------------------------------------------------------ revno: 2497.975.3 committer: Sergey Glukhov <Sergey.Glukhov@sun.com> branch nick: mysql-5.1-bugteam timestamp: Fri 2009-07-03 13:22:06 +0500 message: Bug#42364 SHOW ERRORS returns empty resultset after dropping non existent table enabled message storing into error message list for 'drop table' command ------------------------------------------------------------	16 years ago
Alexander Nozdrin	09195da31e	Backporting patches for Bug#38347 (ALTER ROUTINE privilege allows SHOW CREATE TABLE) from 6.0. Original revisions: ------------------------------------------------------------ revno: 2617.31.8 committer: Alexander Nozdrin <alik@sun.com> branch nick: 6.0-rt-bug38347 timestamp: Thu 2009-03-26 09:08:24 +0300 message: Patch for Bug#38347: ALTER ROUTINE privilege allows SHOW CREATE TABLE. If a user has any of the following privileges for a table (or the database if the table), he should be able to issue SHOW CREATE TABLE for the table: - CREATE - DROP - ALTER - DELETE - INDEX - INSERT - SELECT - UPDATE - TRIGGER - REFERENCES - GRANT OPTION - CREATE VIEW - SHOW VIEW Any other privilege (even SUPER) should not allow SHOW CREATE TABLE. ------------------------------------------------------------ revno: 2617.31.11 committer: Alexander Nozdrin <alik@sun.com> branch nick: 6.0-rt timestamp: Fri 2009-03-27 21:36:34 +0300 message: Additional patch for Bug#38347 (ALTER ROUTINE privilege allows SHOW CREATE TABLE). The problem was that information_schema.test, information_schema_parameters.test and information_schema_routines.test failed with the first patch. That happened due to limitation in check_access(): it allows only SELECT_ACL privilege for INFORMATION_SCHEMA tables. The patch is to request only SELECT_ACL privilege for INFORMATION_SCHEMA tables. ------------------------------------------------------------	16 years ago
Konstantin Osipov	11f8ddc7b3	Merge with next-mr-runtime.	16 years ago
Bjorn Munch	2f0c4678e5	null upmerge from trunk-mtr	16 years ago
Bjorn Munch	23e557d48a	new merge from next-mr	16 years ago
Bjorn Munch	8aee8bd2c7	null merge from 5.1	16 years ago
Bjorn Munch	6756d64b81	new merge from trunk	16 years ago
Alexander Nozdrin	7e30baaa71	Merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	8d953ecef1	Pass --vardir to MTR in mysql-trunk.push.	16 years ago
Alexander Nozdrin	c0718f032b	Disable the test in mysql-trunk because of Bug#46931 instead of making it experimental.	16 years ago
Konstantin Osipov	d4632dff5a	Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, 2630.39.1, 2630.28.29, 2630.34.3, 2630.34.2, 2630.34.1, 2630.29.29, 2630.29.28, 2630.31.1, 2630.28.13, 2630.28.10, 2617.23.14 and some other minor revisions. This patch implements: WL#4264 "Backup: Stabilize Service Interface" -- all the server prerequisites except si_objects.{h,cc} themselves (they can be just copied over, when needed). WL#4435: Support OUT-parameters in prepared statements. (and all issues in the initial patches for these two tasks, that were discovered in pushbuild and during testing). Bug#39519: mysql_stmt_close() should flush all data associated with the statement. After execution of a prepared statement, send OUT parameters of the invoked stored procedure, if any, to the client. When using the binary protocol, send the parameters in an additional result set over the wire. When using the text protocol, assign out parameters to the user variables from the CALL(@var1, @var2, ...) specification. The following refactoring has been made: - Protocol::send_fields() was renamed to Protocol::send_result_set_metadata(); - A new Protocol::send_result_set_row() was introduced to incapsulate common functionality for sending row data. - Signature of Protocol::prepare_for_send() was changed: this operation does not need a list of items, the number of items is fully sufficient. The following backward incompatible changes have been made: - CLIENT_MULTI_RESULTS is now enabled by default in the client; - CLIENT_PS_MULTI_RESUTLS is now enabled by default in the client.	16 years ago
Alexander Nozdrin	1ea4a9f371	Update errmsg-utf8.txt after automerge.	16 years ago
Alexander Barkov	99eae48a97	WL#1349 Use operating system localization to send it as a default client character set	16 years ago
Alexander Barkov	344ddc85fa	Merging mysql-next-mr-merge to mysql-next-mr.	16 years ago
Bjorn Munch	b738a5e57e	merge from next-mr	16 years ago
Alexander Nozdrin	479b602fd6	Merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	9787943c5e	Mark rpl.rpl_innodb_bug28430 experimental unconditionally.	16 years ago
Alexander Nozdrin	d950f6568b	Merge from mysql-trunk-merge.	16 years ago
Kristofer Pettersson	d18a9e5f54	Bug#27145 EXTRA_ACL troubles Post merge fix for embedded server.	16 years ago
Satya B	0ddb2ca740	Fix the windows Build failure due to the changes to CMakelists by r2910. Remove the extra line which try to use the name INNOBASE again. The IF ELSE loop above declares the library name based on the version of mysql	16 years ago
Bjorn Munch	d25a26268c	merge 48149	16 years ago

1 2 3 4 5 ...

59008 Commits (94e70aff6449748ac107c9445a8dd1e2aa36874f) All Branches Search

59008 Commits (94e70aff6449748ac107c9445a8dd1e2aa36874f)

All Branches