mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-01 20:55:32 +02:00
Code Issues Projects Releases Packages Wiki Activity
mariadb/include/mysql
History
Alexey Kopytov 5d407d0c1a Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 
Conflicts:

Text conflict in mysql-test/r/partition_innodb.result
Text conflict in sql/field.h
Text conflict in sql/item.h
Text conflict in sql/item_cmpfunc.h
Text conflict in sql/item_sum.h
Text conflict in sql/log_event_old.cc
Text conflict in sql/protocol.cc
Text conflict in sql/sql_select.cc
Text conflict in sql/sql_yacc.yy
2010-03-20 23:23:42 +03:00
..
plugin.h Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-03-20 23:23:42 +03:00
plugin.h.pp WL#4903 Plugin Service API part I 2009-11-02 21:05:42 +01:00
service_my_snprintf.h unit tests for my_vsnprintf, 2009-11-04 00:15:16 +01:00
service_thd_alloc.h WL#4903 Plugin Service API part I 2009-11-02 21:05:42 +01:00
services.h WL#4903 Plugin Service API part I 2009-11-02 21:05:42 +01:00