mariadb

Tree: dc803c99d0

Author	SHA1	Message	Date
Vladislav Vaintroub	dc803c99d0	merge	16 years ago
Vladislav Vaintroub	e378fa5be0	Bug #49811 : inconsistent usage of SAFEMALLOC in debug compilation on windows Remove per-project SAFEMALLOCs definitions, as they result in malloc/free mismatches.	16 years ago
Mikael Ronstrom	29c60cd5b7	BUG#49591, Fixed version string in SHOW CREATE TABLE to accomodate for column list partitioning and new function to_seconds	16 years ago
Martin Hansson	f9a7ac0664	Backport of fix for bug#35020	16 years ago
Jonathan Perkin	7e458c5812	Merge up to mysql-next-mr-bugfixing	16 years ago
Jonathan Perkin	d456e4470d	Fix previous merge: 'kill -0' (check PID exists) was changed to 'kill -9', meaning a '/etc/init.d/mysql stop' would actually cause mysqld_safe to relaunch mysqld rather than shut it down.	16 years ago
Alexander Nozdrin	5098a2bc69	Auto-merge (empty) from mysql-trunk-bugfixing.	16 years ago
Alexander Nozdrin	2389aee456	Auto-merge from mysql-next-mr.	16 years ago
Alexander Nozdrin	a7073e53a4	Auto-merge from mysql-trunk.	16 years ago
Alexander Nozdrin	b3d9906907	Update version in mysql-next-mr. According to new numbering scheme mysql-next-mr does not have its own version. Some version placeholder is used instead. It's been agreed that 5.5.99 will be used as a placeholder.	16 years ago
Alexander Nozdrin	642f075569	Auto-merge from mysql-trunk.	16 years ago
Alexander Nozdrin	2ae8acc294	Remove .cvsignore files (attempt #2 ).	16 years ago
Mattias Jonsson	f3ff6e7788	merge	16 years ago
Mattias Jonsson	2cb6f123b6	post push patch of bug#49369 updating test by removing select of platform dependend variable.	16 years ago
Mattias Jonsson	3e4afe7dbd	merge	16 years ago
Mattias Jonsson	a39a91112e	merge (and including the fix for bug#48939 since that was not included in mysql-trunk-bugfixing).	16 years ago
Alexander Nozdrin	5bbdda5ebe	Null-merge from mysql-trunk-bugfixing (backporting revisions).	16 years ago
Alexander Nozdrin	0b1a15e9a7	Backporing patch for Bug#48351 (Inconsistent library names for semisync plugin) from mysql-next-mr-bugfixing to mysql-trunk-bugfixing. Original revision: ------------------------------------------------------------ revision-id: zhenxing.he@sun.com-20091127084945-wng7gakygduv3q8k committer: He Zhenxing <zhenxing.he@sun.com> branch nick: 5.1-rep-semisync timestamp: Fri 2009-11-27 16:49:45 +0800 message: Bug#48351 Inconsistent library names for semisync plugin The semisync plugin library names on Unix like systems were prefixed with 'lib', which did not follow the conventions. Fix the problem by removing the 'lib' prefix on Unix systems. ------------------------------------------------------------	16 years ago
Alexander Nozdrin	7688c7369c	Backporting a patch for Bug#49170 (Inconsistent placement of semisync plugin prevents it from getting tested) from mysql-next-mr-bugfixing to mysql-trunk-bugfixing. Original revision: ------------------------------------------------------------ revision-id: zhenxing.he@sun.com-20091204014339-2m06r42vajhm9vke committer: He Zhenxing <zhenxing.he@sun.com> branch nick: 5.1-rep-semisync timestamp: Fri 2009-12-04 09:43:39 +0800 message: Bug#49170 Inconsistent placement of semisync plugin prevents it from getting tested Add $basedir/lib/plugin to the search paths for semisync plugins. ------------------------------------------------------------	16 years ago
Alexander Nozdrin	25f365f610	Backporting patch for Bug#47756 from mysql-next-mr-bugfixing into mysql-trunk-bugfixing. NOTE: the "utf8_phone_ci" collation does not exist in mysql-trunk yet, so another collation with 2-byte collation ID is used: "utf8_test_ci". This patch will be null-merged to mysql-next-mr-bugfixing. Original revision: ------------------------------------------------------------ revision-id: bar@mysql.com-20091207121153-hs3bqbmr0719ws21 committer: Alexander Barkov <bar@mysql.com> branch nick: mysql-next-mr.b47756 timestamp: Mon 2009-12-07 16:11:53 +0400 message: Bug#47756 Setting 2byte collation ID with 'set names' crashes the server The problem is not actually related to 2byte collation IDs. The same crash happens if you change the collation ID in mysql-test/str_data/Index.xml to a value smaller than 256. Crash happened in SQL parser, because the "ident_map" and "state_map" arrays were not initialized in loadable utf8 collations. Fix: adding proper initialization of the "ident_map" and "state_map" members for loadable utf8 collations. ------------------------------------------------------------	16 years ago
Alexander Nozdrin	efaa28abb4	Post-merge fix.	16 years ago
Alexander Nozdrin	83aa3cf4e3	Post-merge fix (binlog_unsafe).	16 years ago
Evgeny Potemkin	5466618420	Post-merge fix.	16 years ago
Alexander Nozdrin	bc2d4e620a	Manual merge from mysql-trunk-merge. Conflicts: - extra/comp_err.c - mysql-test/collections/default.experimental - mysql-test/r/archive.result - mysql-test/r/select.result - mysql-test/suite/binlog/r/binlog_unsafe.result - mysql-test/suite/binlog/t/binlog_unsafe.test - mysql-test/suite/rpl/t/disabled.def - mysql-test/t/archive.test - mysql-test/t/select.test - sql/item.cc - sql/item.h - sql/item_timefunc.cc - sql/sql_base.cc - sql/sql_delete.cc - sql/sql_load.cc - sql/sql_partition.cc - sql/sql_table.cc - storage/innobase/handler/ha_innodb.cc - vio/vio.c	16 years ago
Alexander Nozdrin	69cfd5c8ec	Manual merge from mysql-trunk. Conflicts: - client/mysqltest.cc - mysql-test/collections/default.experimental - mysql-test/suite/rpl/t/disabled.def - sql/mysqld.cc - sql/opt_range.cc - sql/sp.cc - sql/sql_acl.cc - sql/sql_partition.cc - sql/sql_table.cc	16 years ago
Horst.Hunger	b3eb974ac7	Fix for bug#46117: This test is replaced by plugin.test also containing a CRESTE TABLE on example db. Example DB only exists as plugin.	16 years ago
Alexander Nozdrin	713ed2d243	Auto-merge (empty) from mysql-5.1.	16 years ago
Alexander Nozdrin	963e7fc7b6	Auto-merge (empty) from mysql-trunk-bugfixing.	16 years ago
Alexander Nozdrin	12e505fd9e	Auto-merge from mysql-next-mr.	16 years ago
Alexander Nozdrin	bd1f8f5bfa	Auto-merge from mysql-trunk.	16 years ago
Alexander Nozdrin	b097816d69	Auto-merge from mysql-trunk.	16 years ago
Alexander Nozdrin	2757eab544	Remove BitKeeper dir and .cvsignore.	16 years ago
Alexander Nozdrin	cfce3d0eb1	Auto-merge (empty) from mysql-next-mr.	16 years ago
Alexander Nozdrin	43f1f37cfc	Auto-merge (empty) from mysql-trunk-bugfixing.	16 years ago
Alexander Nozdrin	0631ce8dd8	Auto-merge (empty) from mysql-next-mr.	16 years ago
Alexander Nozdrin	633536871c	Auto-merge (empty) from mysql-trunk.	16 years ago
Alexander Nozdrin	de06a06afa	Auto-merge (empty) from mysql-trunk.	16 years ago
Alexander Nozdrin	bbea46f1f0	Auto-merge from mysql-next-mr-bugfixing.	16 years ago
Alexander Nozdrin	b8aace9485	Auto-merge from mysql-trunk-bugfixing.	16 years ago
Alexander Nozdrin	3a33af89d8	Auto-merge from mysql-next-mr-bugfixing.	16 years ago
Alexander Nozdrin	28bc3aa791	Auto-merge (empty) from mysql-trunk-bugfixing.	16 years ago
Alexander Nozdrin	fcbbac8b37	Auto-merge (empty) from mysql-trunk.	16 years ago
Alexander Nozdrin	324e1a9dbc	Auto-merge from mysql-next-mr.	16 years ago
Sergey Vojtovich	31c1efdb32	After merge fix: pthread_mutext_[un]lock -> mysql_mutex_[un]lock.	16 years ago
Sergey Vojtovich	a806fd134d	Merge mysql-next-mr to mysql-next-mr-svoj.	16 years ago
Sergey Vojtovich	1e2abc8f29	An addition to backport of WL#3951 - MyISAM: Additional Error Logs for Data Corruption Fixed partition_repair_myisam.test.	16 years ago
Magne Mahre	c24ef7e929	Bug#35589 SET PASSWORD caused a crash Bug#35591 FLUSH PRIVILEGES caused a crash A race condition on the privilege hash tables (proc_priv_hash and func_priv_hash) caused one thread to try to delete elements that had already been deleted by another thread. The bug was caused by reading and saving the pointers to the hash tables outside mutex protection. This led to an inconsistency where a thread copied a pointer to a hash, another thread did the same, the first thread then deleted the hash, and the second then crashed when it in turn tried to delete the deleted hash. The fix is to ensure that operations on the shared hash structures happens under mutex protection (moving the locking up a little)	16 years ago
V Narayanan	1e224eb257	merging with mysql-next-mr-svoj	16 years ago
sunanda.menon@sun.com	d6e7402d42	Null-merge from mysql-5.1.40sp1-release	16 years ago
V Narayanan	44a3c5cb93	merging with mysql-next-mr-svoj	16 years ago

1 2 3 4 5 ...

59788 Commits (dc803c99d0dcf4b6f2e8ed8fed18fda643c383ac) All Branches Search

59788 Commits (dc803c99d0dcf4b6f2e8ed8fed18fda643c383ac)

All Branches