diff options
| author | unknown <kostja@vajra.(none)> | 2007-04-05 15:49:46 +0400 |
|---|---|---|
| committer | unknown <kostja@vajra.(none)> | 2007-04-05 15:49:46 +0400 |
| commit | a36054f4201568fac1717b451040ffa7925900a2 (patch) | |
| tree | a91b4f984fd6317085b8bd7e94cd91134184aab6 /sql/ha_partition.cc | |
| parent | a0c4e184f80de8db3b9d1340715502454ee09ef6 (diff) | |
| parent | fa1d637e896d71932adcd1451c1564f724590189 (diff) | |
| download | mariadb-git-a36054f4201568fac1717b451040ffa7925900a2.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into vajra.(none):/opt/local/work/mysql-5.1-c1
mysql-test/r/events_bugs.result:
Auto merged
mysql-test/r/events_scheduling.result:
Auto merged
mysql-test/t/events.test:
Auto merged
mysql-test/t/events_scheduling.test:
Auto merged
sql/event_data_objects.h:
Auto merged
sql/event_db_repository.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.h:
Auto merged
sql/share/errmsg.txt:
Auto merged
mysql-test/r/events.result:
e
Use local.
mysql-test/r/events_restart_phase1.result:
Use local
mysql-test/r/events_time_zone.result:
SCCS merged
mysql-test/t/events_restart_phase1.test:
Use local
sql/event_data_objects.cc:
Use local
sql/event_db_repository.cc:
Manual merge.
sql/event_queue.cc:
Manual merge.
sql/events.cc:
Manual merge.
Diffstat (limited to 'sql/ha_partition.cc')
0 files changed, 0 insertions, 0 deletions