mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage
History
unknown e54ecf09be Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525 
into  mysql.com:/home/dlenev/src/mysql-5.1-merges2


client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisammrg/myrg_queue.c:
  Auto merged
sql/sql_rename.cc:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.
sql/sql_yacc.yy:
  Manual merge.
2006-02-27 20:00:07 +03:00
..
archive Makefile.am: 2006-02-22 20:34:25 +01:00
bdb storage/bdb/dist/s_all 2005-12-23 12:46:48 +01:00
csv Makefile.am: 2006-02-22 20:34:25 +01:00
example BUG#17117: header fille "plugin.h" does not have a namespace prefix 2006-02-14 13:51:25 +04:00
heap Makefile.am: 2006-02-22 20:34:25 +01:00
innobase Merge 2006-02-12 20:45:03 +01:00
myisam This patch cleans up two tests which were a bit fragile from other failing tests. It also removes some variables associated with removed RAID support. 2006-02-24 13:20:51 -08:00
myisammrg Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525 2006-02-27 20:00:07 +03:00
ndb Merge mysql.com:/home/my/mysql-5.0 2006-02-25 21:54:34 +02:00
Makefile.am Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2005-12-22 20:06:05 -08:00