diff options
| author | unknown <serg@serg.mysql.com> | 2001-10-10 18:22:14 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-10-10 18:22:14 +0200 |
| commit | c20a4e6e026bdb4f5aed1402ea582ce4a2c5a393 (patch) | |
| tree | e653ab85c004942486ac67e01503e235b0a37894 /merge | |
| parent | 2031478ad9792cb0694108d461eaa1efa8f1d31c (diff) | |
| parent | d6ae6b017bb73b55bc6b22575031a3a8e7b75d41 (diff) | |
| download | mariadb-git-c20a4e6e026bdb4f5aed1402ea582ce4a2c5a393.tar.gz | |
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
include/my_global.h:
Auto merged
sql/handler.h:
Auto merged
sql/lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'merge')
0 files changed, 0 insertions, 0 deletions