diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2008-05-15 11:08:58 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2008-05-15 11:08:58 -0400 |
| commit | 496ec47d220591453163cc303fd9bea569991e51 (patch) | |
| tree | 6e9557c5ff27df08fe2a466c8aa5f0770bc33a13 /sql/sp_head.h | |
| parent | e5cc12146cb829ff21b2e6615aa3d16efd7a862f (diff) | |
| parent | cae6079f5a93d9e2621187a4afb4b3cd3e333483 (diff) | |
| download | mariadb-git-496ec47d220591453163cc303fd9bea569991e51.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my50-bug36570
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570
BitKeeper/deleted/.del-binlog_innodb.result:
Auto merged
mysql-test/r/mysqlbinlog.result:
need to record.
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
need to record.
mysql-test/suite/rpl/r/rpl_sp.result:
need to record.
mysql-test/suite/rpl/t/rpl_sp.test:
manual merge.
sql/sp.cc:
Manual merge
Diffstat (limited to 'sql/sp_head.h')
0 files changed, 0 insertions, 0 deletions