diff options
| author | unknown <monty@narttu.mysql.fi> | 2007-10-20 01:33:12 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2007-10-20 01:33:12 +0300 |
| commit | 301ee8d9a37eebcced4d6e44ac669200731c9f75 (patch) | |
| tree | 065cc5f84dd28f31db7f48793402cc17d0b2ae27 /mysys/my_error.c | |
| parent | 13d53bf657060acaecf055107e5e6cc7045f351e (diff) | |
| parent | 1cede43268dec2baa2d80cff591da517d6500f74 (diff) | |
| download | mariadb-git-301ee8d9a37eebcced4d6e44ac669200731c9f75.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into mysql.com:/home/my/mysql-maria
include/my_sys.h:
Auto merged
mysql-test/r/maria.result:
Auto merged
mysql-test/t/maria.test:
Auto merged
sql/handler.h:
Auto merged
sql/mysqld.cc:
Auto merged
storage/maria/ha_maria.cc:
Auto merged
storage/maria/ma_bitmap.c:
Auto merged
storage/maria/ma_blockrec.c:
Auto merged
storage/maria/ma_loghandler.c:
Auto merged
storage/maria/ma_pagecache.c:
Auto merged
storage/maria/ma_test1.c:
Auto merged
storage/maria/ma_test_recovery.expected:
Auto merged
storage/maria/ma_test_recovery:
Auto merged
sql/mysql_priv.h:
manual merge
storage/maria/ma_recovery.c:
manual merge
storage/maria/ma_test2.c:
manual merge
Diffstat (limited to 'mysys/my_error.c')
0 files changed, 0 insertions, 0 deletions