1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-10 02:01:19 +03:00
Alexey Kopytov 3df8e88dd8 Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:

Text conflict in mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
Text conflict in sql/log.cc
Text conflict in sql/set_var.cc
Text conflict in sql/sql_class.cc
2010-04-03 21:35:51 +04:00
..
2008-04-01 13:18:31 +02:00
2006-12-06 21:47:29 +04:00
2007-12-23 11:18:46 +02:00
2007-12-23 11:18:46 +02:00
2008-03-28 23:39:47 +03:00
2010-02-24 13:15:34 +04:00
2009-10-12 11:22:53 +05:00
2009-10-12 11:22:53 +05:00
2007-12-12 18:19:24 +01:00
ndb
2005-09-30 12:19:15 +02:00
2003-09-25 00:14:46 +02:00