diff options
| author | unknown <kostja@bodhi.local> | 2007-01-12 22:01:53 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2007-01-12 22:01:53 +0300 |
| commit | 31e01f0a74dd4988ab0628ff0d1b832a190340fe (patch) | |
| tree | e37d1b41f2f7e00e10396bc533ecb0fdbb1593e8 /sql/set_var.h | |
| parent | fc681ea7017b9f61039eab15f73f1547801a4f52 (diff) | |
| parent | 5f9a8075626db75e770d679eae4ae0dd52e1400e (diff) | |
| download | mariadb-git-31e01f0a74dd4988ab0628ff0d1b832a190340fe.tar.gz | |
Merge bodhi.local:/opt/local/work/mysql-4.1-runtime
into bodhi.local:/opt/local/work/mysql-5.0-runtime
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
VC++Files/mysql.dsw:
Auto merged
VC++Files/mysqldemb/mysqldemb.dsp:
Auto merged
VC++Files/sql/mysqld.dsp:
Auto merged
VC++Files/sql/mysqldmax.dsp:
Auto merged
innobase/buf/buf0buf.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/ha/ha0ha.c:
Auto merged
innobase/include/hash0hash.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/log/log0recv.c:
Auto merged
mysys/my_read.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
support-files/MySQL-shared-compat.spec.sh:
Auto merged
Diffstat (limited to 'sql/set_var.h')
0 files changed, 0 insertions, 0 deletions