mariadb

mirror of https://github.com/MariaDB/server.git synced 2025-08-30 11:22:14 +03:00

Files

unknown 1875f3155c Merge mysql.com:/usr/local/mysql/tmp_merge

into  mysql.com:/usr/local/mysql/merge-5.1


mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/trigger-grant.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger-grant.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
server-tools/instance-manager/options.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
server-tools/instance-manager/options.cc:
  Manual merge
sql/item_func.cc:
  Manual merge
sql/mysql_priv.h:
  Manual merge
sql/sp_head.cc:
  Manual merge
sql/sql_table.cc:
  Manual merge

2006-05-18 11:56:50 +02:00

init_db.sql

fix for bug#16415 Events names are case sensitive

2006-03-24 17:45:52 +01: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: