diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-10-28 02:36:19 +0300 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-10-28 02:36:19 +0300 |
| commit | 1b574f5bdf347ddfeea3b6b704f1089ebb99ea98 (patch) | |
| tree | 15e24b28ea84bf971a840e358e58bfdcfb90ebe9 /mysys | |
| parent | 7911c50718fa27c2fa56e99d765b54267481a8d2 (diff) | |
| download | mariadb-git-1b574f5bdf347ddfeea3b6b704f1089ebb99ea98.tar.gz | |
Merge 4.1 - 5.0
mysql-test/r/insert_select.result:
Merge from 4.1 to 5.0.
mysql-test/r/select.result:
Merge from 4.1 to 5.0.
mysql-test/t/insert_select.test:
Merge from 4.1 to 5.0.
mysys/my_handler.c:
Merge from 4.1 to 5.0.
sql/item.cc:
Merge from 4.1 to 5.0.
sql/item_timefunc.cc:
Imported bug fix from 4.1 to 5.0. (Bug#14016)
sql/item_timefunc.h:
Imported bug fix from 4.1 to 5.0. (Bug#14016)
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_handler.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_handler.c b/mysys/my_handler.c index a2c55153b32..56f2298a9f0 100644 --- a/mysys/my_handler.c +++ b/mysys/my_handler.c @@ -514,8 +514,8 @@ HA_KEYSEG *ha_find_null(HA_KEYSEG *keyseg, uchar *a) else a= end; break; - case HA_KEYTYPE_VARTEXT: - case HA_KEYTYPE_VARBINARY: + case HA_KEYTYPE_VARTEXT1: + case HA_KEYTYPE_VARBINARY1: { int a_length; get_key_length(a_length, a); |