mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage
History
Alexander Nozdrin 5f0c09dd72 Manual merge from mysql-trunk-merge. 
Conflicts:
  - include/my_no_pthread.h
  - mysql-test/r/sp-ucs2.result
  - sql/log.cc
  - sql/sql_acl.cc
  - sql/sql_yacc.yy
2009-12-16 21:02:21 +03:00
..
archive Manual merge from mysql-trunk-merge. 2009-12-12 23:38:59 +03:00
blackhole WL#2360 Performance schema 2009-12-04 18:26:15 -07:00
csv Merge mysql-next-mr to mysql-next-mr-svoj. 2009-12-09 15:03:34 +04:00
example WL#2360 Performance schema 2009-12-04 18:26:15 -07:00
federated WL#2360 Performance schema 2009-12-04 18:26:15 -07:00
heap Auto-merge from mysql-trunk. 2009-12-16 11:25:21 +03:00
ibmdb2i merging with mysql-5.1-bugteam 2009-12-11 17:27:12 +05:30
innobase Manual merge from mysql-trunk-merge. 2009-12-16 21:02:21 +03:00
myisam Auto-merge from mysql-trunk. 2009-12-16 11:25:21 +03:00
myisammrg Auto-merge from mysql-trunk. 2009-12-16 11:25:21 +03:00
ndb merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091104182209-iui387z35159aoyw 2009-11-30 14:34:39 +02:00
Makefile.am Backport WL#3653 to 5.1 to enable bundled innodb plugin. 2009-06-10 10:59:49 +02:00
mysql_storage_engine.cmake WL#4903 Plugin Service API part I 2009-11-02 21:05:42 +01:00