mariadb

Tree: 94e70aff64

Author	SHA1	Message	Date
Bjorn Munch	684b1d39ac	merge 48149	16 years ago
Bjorn Munch	e00d636494	merge 48149	16 years ago
Alexander Nozdrin	5f255b44e3	Merge from mysql-trunk-merge.	16 years ago
Satya B	bca54639b6	Merge a CMakeLists.txt change from Innodb plugin 1.0.5	16 years ago
Alexander Nozdrin	356efddad6	A fix for innodb_bug44369.test due to Bug#47233 (Innodb calls push_warning(MYSQL_ERROR::WARN_LEVEL_ERROR)). The Signal/Resignal patch changes the push_warning() API: now it silently downgrades WARN_LEVEL_ERROR to WARN_LEVEL_WARN. This patch should be rolled back when Bug#47233 is fixed.	16 years ago
Alexander Nozdrin	583d724e64	Automerge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	01a9db0621	Automerge from mysql-trunk.	16 years ago
Bjorn Munch	23ef842e03	Bug #48149 MTR should automatically skip SSL tests if SSL not supported Knowledge of no SSL support is not used Skip tests the same way e.g. innodb tests are Does not refer to have_ssl_communication.inc, will add this when merging to 6.0-codebase	16 years ago
Alexander Nozdrin	3fd2f50b6c	Merge from mysql-trunk-merge.	16 years ago
Bjorn Munch	a47a167492	merge 48130 and 48133	16 years ago
Alexander Nozdrin	b930b18ec3	Merge from mysql-5.1.	16 years ago
Alexander Nozdrin	4ed388a5b4	Merge from mysql-5.1.	16 years ago
Alexander Nozdrin	f3457a73d6	Merge from mysql-5.1.	16 years ago
Bjorn Munch	542ffe5e87	merge 48130 and 48133 from 5.1	16 years ago
Bjorn Munch	3e43817fca	merge 48130 and 48133 from 5.1	16 years ago
Alexander Nozdrin	af9de4ff6b	Null-merge up to revno:3163 from mysql-5.1 (InnoDB changes).	16 years ago
Kristofer Pettersson	4a494eeb52	Automerge	16 years ago
Kristofer Pettersson	b5559f5305	Bug#27145 EXTRA_ACL troubles The flag EXTRA_ACL is used in conjugation with our access checks, yet it is not clear what impact this flag has. This is a code clean up which replaces use of EXTRA_ACL with an explicit function parameter. The patch also fixes privilege checks for: - SHOW CREATE TABLE: The new privilege requirement is any privilege on the table-level. - CHECKSUM TABLE: Requires SELECT on the table level. - SHOW CREATE VIEW: Requires SHOW_VIEW and SELECT on the table level (just as the manual claims) - SHOW INDEX: Requires any privilege on any column combination.	16 years ago
Alexander Barkov	1b26332898	Bug#46633 Obsolete Serbian locale name - Renaming sr_YU to sr_RS - Adding test case	16 years ago
He Zhenxing	f71b836e50	Postfix of bug#45674 rpl_semi_sync_master_wait_sessions was reset by FLUSH STATUS, which could cause the master fail to wake up waiting sessions and result in master timeout waiting for slave reply. rpl_semi_sync_master_wait_session should not be reset, this problem is fixed by this patch.	16 years ago
Bjorn Munch	6c68019899	Bug #48133 MTR should not dump entire history of mysqld log when failing to start server Don't print entire log, but use extract_server_log() introduced by 46007	16 years ago
Bjorn Munch	423dacf3c6	merge from next-mr	16 years ago
Bjorn Munch	2bbe4cc882	merge from trunk	16 years ago
Bjorn Munch	264c330fd0	Bug #48130 Expected failures should not count towards max-test-fail Test batches may be terminated too early Avoid counting exp-fail tests	16 years ago
Bjorn Munch	6c9cb9ba22	merge from 5.1 main	16 years ago
Timothy Smith	813d8ff6dc	Merge from mysql-5.4.3-beta-release	16 years ago
Timothy Smith	6d569306b4	Update _libdir/plugin to _libdir/mysql/plugin in a few places	16 years ago
Timothy Smith	e1c54dd9ad	Work around a problem in IBM compiler (on aix / i5os) that doesn't use function prototypes from header in conjunction with K&R-style function definitions. The symptom is a type mismatch between int and wchar_t.	16 years ago
Alexander Nozdrin	519f1aee78	Pull from mysql-next-mr-runtime.	16 years ago
Alexander Nozdrin	27adfa0777	Backporting a patch for Bug#47421 from 6.0: revno: 2617.68.41 committer: Alexander Nozdrin <alik@sun.com> branch nick: mysql-6.0-codebase-bugfixing-bug47421 timestamp: Wed 2009-09-23 17:48:11 +0400 message: A patch for Bug#47421 (Server crash from - SELECT SUM ( DISTINCT <char_column>) in azalea). The problem was that DBUG_RETURN() macro should have been used instead the 'return' operator.	16 years ago
Konstantin Osipov	2b91a639cc	Backport of: ---------------------------------------------------------- revno: 2630.22.11 committer: Konstantin Osipov <konstantin@mysql.com> branch nick: mysql-6.0-records timestamp: Mon 2008-08-11 16:40:09 +0400 message: Move read_record related functions to a new header - records.h	16 years ago
Alexander Nozdrin	1c7be450f4	Backporting revision from 6.0: revno: 2617.56.25 committer: Alexander Nozdrin <alik@sun.com> branch nick: azalea-bugfixing timestamp: Thu 2009-07-09 20:30:43 +0400 message: Add a comment in the source (Bug#40358).	16 years ago
Alexander Nozdrin	4ebb631f3a	Backporting patch for Bug#38992 from 6.0. Original revision: revno: 2617.55.2 committer: Alexander Nozdrin <alik@sun.com> branch nick: azalea-bf-bug38992 timestamp: Fri 2009-06-19 16:41:16 +0400 message: Fix for Bug#38992: Server crashes sporadically with 'waiting for initial ...' msg on windows. The problem is that connection timeout is too small for busy windows box. The fix is to - add support for connect_timeout command line argument to mysqltest; - set default value of the connect_timeout option to 120 seconds.	16 years ago
Konstantin Osipov	2ae359db4a	Backport of: ---------------------------------------------------------- revno: 2630.13.6 committer: Konstantin Osipov <konstantin@mysql.com> branch nick: mysql-6.0-3288 timestamp: Fri 2008-07-11 20:22:44 +0400 message: WL#3288, step 1: ensure that the SQL layer always closes an open cursor (rnd or index read) before closing a handler.	16 years ago
Joerg Bruehe	ee56b111a0	Upmerge merge changesets.	16 years ago
Konstantin Osipov	8441517b52	Backport of 2617.65.4 from 6.0-codebase. A fix and a test case for Bug#34898 "mysql_info() reports 0 warnings while mysql_warning_count() reports 1" Review the patch by Chad Miller, implement review comments (since Chad left) and push the patch. This bug is actually not a bug. At least according to Monty. See Bug#841 "wrong number of warnings" reported back in July 2003 and closed as "not a bug". mysql_info() was printing the number of truncated columns, not the number of warnings. But since the message of mysql_info() was "Warnings: <number of truncated columns>", people would expect to get the number of warnings in it, not the number of truncated columns. So a possible fix would be to change the message of mysql_info() to say Rows changed: <n>, truncated: <m>. Instead, put the number of warnings there. That is, remove the feature that thd->cuted_fields (the number of truncated fields) is exposed to the client. The number of truncated columns can be calculated on the client, by analyzing SHOW WARNINGS output, and in future we may remove thd->cuted_fields altogether. So let's have one less thing to worry about.	16 years ago
Joerg Bruehe	9cabf98cb0	Merge a compile fix.	16 years ago
Joerg Bruehe	5c95f2363a	Upmerge the Windows compile fix from 5.0 to 5.1	16 years ago
Konstantin Osipov	efc27b5ffb	Merge with next-mr-runtime	16 years ago
Joerg Bruehe	f359b258ee	Merge 5.0-bugteam (compile fix) into main 5.0	16 years ago
Joerg Bruehe	11d4eb352d	Merge the Windows compile fix into the push tree.	16 years ago
Joerg Bruehe	9ceeabd9b2	Compile fix for Windows: Use "#ifdef", not plain "#if".	16 years ago
Satya B	a0e12ec269	Merging Innodb plugin 1.0.5 revisions from 5.1-main from revisions 3149 to 3163 also merged missing Innodb plugin revisions r5636,r5635 manually	16 years ago
Konstantin Osipov	311fe126c5	Fix a windows build failure (next-mr-runtime).	16 years ago
Joerg Bruehe	9c76415a03	Upmerge a merge changeset - no contents change.	16 years ago
Bjorn Munch	d30c25ce14	merge 46007 from 5.1->trunk	16 years ago
Georgi Kodinov	757e641dea	merge	16 years ago
Bjorn Munch	b21c62bedd	merge 46007 from 5.1	16 years ago
Alexander Barkov	ac2a0348a2	A postfix for WL#751	16 years ago
Georgi Kodinov	6b81bff83c	Revert the fix for bug #47123 until test suite failures are resolved.	16 years ago

1 2 3 4 5 ...

59008 Commits (94e70aff6449748ac107c9445a8dd1e2aa36874f) All Branches Search

59008 Commits (94e70aff6449748ac107c9445a8dd1e2aa36874f)

All Branches