diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-11-23 01:28:32 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-11-23 01:28:32 +0200 |
| commit | aa06123f83d764c94f52bb7d53673ea98fcc8c42 (patch) | |
| tree | ace720b23945432863b582bf907eecdaa87fc638 /sql/watchdog_mysqld | |
| parent | a2c26aa7109182ede0ad1d06f53b46cc3b41e2c2 (diff) | |
| parent | 164ce4c5cd8b18c6fe8f376ae7475622ce1cdb09 (diff) | |
| download | mariadb-git-aa06123f83d764c94f52bb7d53673ea98fcc8c42.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug7-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/r/sp.result:
merge
sql/share/errmsg.txt:
merge
Diffstat (limited to 'sql/watchdog_mysqld')
0 files changed, 0 insertions, 0 deletions