diff options
| author | unknown <kostja@bodhi.(none)> | 2007-10-08 02:05:10 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-10-08 02:05:10 +0400 |
| commit | ded7fe7fd16d35b0a63a7a417b67fdd31df5033d (patch) | |
| tree | f4b4f76a55ded111308cad01bf89cd645eae2663 /mysql-test/t/warnings-master.opt | |
| parent | 03bef972d3b508013cfcad2de294569ecdf16158 (diff) | |
| parent | c215e78d1607a9afc55df3df3d5499d283ffed63 (diff) | |
| download | mariadb-git-ded7fe7fd16d35b0a63a7a417b67fdd31df5033d.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
mysql-test/include/mix1.inc:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
libmysql/libmysql.c:
Manual merge.
Diffstat (limited to 'mysql-test/t/warnings-master.opt')
0 files changed, 0 insertions, 0 deletions