diff options
| author | unknown <sergefp@mysql.com> | 2005-10-29 02:36:57 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-10-29 02:36:57 +0400 |
| commit | 2f6bb04f9e952970528f43124942e3b533e7969a (patch) | |
| tree | 45ae3ddd001a6f4023a0be5975954ff46ec00ea3 /sql/item.h | |
| parent | ed9a29f1573a6ad9c0b8a934b957cf43ea7d5ffd (diff) | |
| parent | d5bb660640c9cb968469f38e2fa5a971782cf254 (diff) | |
| download | mariadb-git-2f6bb04f9e952970528f43124942e3b533e7969a.tar.gz | |
4.1->5.0 merge
include/config-netware.h:
Merged
innobase/row/row0ins.c:
BUG#10511: Per alexi's instructions, the changes in innobase/row/row0ins.c are not
propagated to 5.x
mysql-test/r/create.result:
Auto Merged
mysql-test/t/create.test:
Auto Merged
sql/field.cc:
Auto Merged
sql/field.h:
Manual Merge
sql/sql_table.cc:
Auto Merged
Diffstat (limited to 'sql/item.h')
0 files changed, 0 insertions, 0 deletions