diff options
| author | unknown <igor@rurik.mysql.com> | 2005-12-10 23:31:03 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-12-10 23:31:03 -0800 |
| commit | 53f8fed437919b82857d4518c43e6e17065786b5 (patch) | |
| tree | 6b4057c32ab656cc8492feed92caa812a84d4f76 /COPYING | |
| parent | e324da302f39998d654b5b112a0342cad0427e35 (diff) | |
| parent | f81ed05cdcad5723c986c580cfcf3ee5e22a385c (diff) | |
| download | mariadb-git-53f8fed437919b82857d4518c43e6e17065786b5.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
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
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions