diff options
author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-05-24 18:42:38 +0500 |
---|---|---|
committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-05-24 18:42:38 +0500 |
commit | a27fd67b512bace048a8c9b0cce7faf5cbbd1373 (patch) | |
tree | 0401bcb60f1e6b2c481bcd342442874cbb7edf64 /include/violite.h | |
parent | ab4a5f9cfa72f3ed93f1184ecc2832681ac1061e (diff) | |
parent | 5b3b80b44f413925a33580bd4229a14b0d6836fa (diff) | |
download | mariadb-git-a27fd67b512bace048a8c9b0cce7faf5cbbd1373.tar.gz |
Merge mysql.com:/home/ram/work/b28464.new/b28464.new.5.0
into mysql.com:/home/ram/work/b28464.new/b28464.new.5.1
mysql-test/t/limit.test:
Auto merged
sql/item.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/item.cc:
SCCS merged
Diffstat (limited to 'include/violite.h')
0 files changed, 0 insertions, 0 deletions