diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-18 14:18:55 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-18 14:18:55 +0200 |
| commit | 6bfa5a40bc8619d535ac656c36d4ebc5fd18093b (patch) | |
| tree | 0f985ddfffc9a795634474887ee05e3d46ec88c9 /mysys/my_getsystime.c | |
| parent | 8a4f717dfe87219281be020cc8d5f11f16d9e8f4 (diff) | |
| parent | 5eab19d7a329af61c6c218bf192a85881b51088d (diff) | |
| download | mariadb-git-6bfa5a40bc8619d535ac656c36d4ebc5fd18093b.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
scripts/Makefile.am:
Auto merged
sql/mysql_priv.h:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
Auto merged
client/mysql_upgrade.c:
Use remote
mysql-test/r/mysql_upgrade.result:
Use remote
Makefile.am:
Merge "build scripts/ a little earlier"
include/my_global.h:
Merge
Diffstat (limited to 'mysys/my_getsystime.c')
0 files changed, 0 insertions, 0 deletions