mariadb

mirror of https://github.com/MariaDB/server.git synced 2025-05-04 06:05:05 +03:00

History

unknown 46845cf357 Merge mysql.com:/home/alik/MySQL/devel/5.0-to-be-merged

into  mysql.com:/home/alik/MySQL/devel/5.1-merged


BitKeeper/deleted/.del-im_life_cycle-im.opt:
  Delete: mysql-test/t/im_life_cycle-im.opt
BitKeeper/deleted/.del-im_utils-im.opt:
  Delete: mysql-test/t/im_utils-im.opt
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/im_daemon_life_cycle.result:
  Auto merged
mysql-test/r/im_utils.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/im_daemon_life_cycle-im.opt:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
server-tools/instance-manager/instance_map.cc:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Manually merged.
mysql-test/r/insert.result:
  Manually merged.
mysql-test/t/im_daemon_life_cycle.imtest:
  Manually merged.
mysql-test/t/im_life_cycle.imtest:
  Manually merged.
mysql-test/t/im_utils.imtest:
  Manually merged.
mysql-test/t/insert.test:
  Manually merged.
server-tools/instance-manager/guardian.cc:
  Manually merged.
server-tools/instance-manager/manager.cc:
  Manually merged.
sql/sql_insert.cc:
  Manually merged.

2006-06-20 18:28:28 +04:00

init_db.sql

Fix for bug #17394 - Events namespace is wrong

2006-05-29 10:39:45 +02:00

mtr_cases.pl

Merge

2006-03-11 01:53:30 +01:00

mtr_diff.pl

mysql-test-run.pl:

2005-03-29 07:29:38 +02:00

mtr_gcov.pl

Many files: