mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
This commit is contained in:
commit
de1ff0698b
4 changed files with 11 additions and 4 deletions
|
@ -538,7 +538,12 @@ else
|
|||
MYSQLD="$VALGRIND $BASEDIR/bin/mysqld"
|
||||
fi
|
||||
CLIENT_BINDIR="$BASEDIR/bin"
|
||||
TESTS_BINDIR="$BASEDIR/bin"
|
||||
if test -d "$BASEDIR/tests"
|
||||
then
|
||||
TESTS_BINDIR="$BASEDIR/tests"
|
||||
else
|
||||
TESTS_BINDIR="$BASEDIR/bin"
|
||||
fi
|
||||
MYSQL_TEST="$CLIENT_BINDIR/mysqltest"
|
||||
MYSQL_DUMP="$CLIENT_BINDIR/mysqldump"
|
||||
MYSQL_BINLOG="$CLIENT_BINDIR/mysqlbinlog"
|
||||
|
|
|
@ -98,9 +98,9 @@ else
|
|||
if test -x "$basedir/libexec/mysqld"
|
||||
then
|
||||
execdir="$basedir/libexec"
|
||||
elif test -x "@libexecdir@/mysqld"
|
||||
elif test -x "$basedir/sbin/mysqld"
|
||||
then
|
||||
execdir="@libexecdir@"
|
||||
execdir="$basedir/sbin"
|
||||
else
|
||||
execdir="$basedir/bin"
|
||||
fi
|
||||
|
|
|
@ -123,6 +123,7 @@ public:
|
|||
}
|
||||
virtual bool eq_def(Field *field);
|
||||
virtual uint32 pack_length() const { return (uint32) field_length; }
|
||||
virtual uint32 pack_length_in_rec() const { return pack_length(); }
|
||||
virtual void reset(void) { bzero(ptr,pack_length()); }
|
||||
virtual void reset_fields() {}
|
||||
virtual void set_default()
|
||||
|
@ -1237,6 +1238,7 @@ public:
|
|||
{ get_key_image(buff, length, itRAW); }
|
||||
uint32 pack_length() const
|
||||
{ return (uint32) field_length + (bit_len > 0); }
|
||||
uint32 pack_length_in_rec() const { return field_length; }
|
||||
void sql_type(String &str) const;
|
||||
field_cast_enum field_cast_type() { return FIELD_CAST_BIT; }
|
||||
char *pack(char *to, const char *from, uint max_length=~(uint) 0);
|
||||
|
|
|
@ -1467,7 +1467,7 @@ int ha_myisam::create(const char *name, register TABLE *table_arg,
|
|||
fieldpos <= minpos)
|
||||
{
|
||||
/* skip null fields */
|
||||
if (!(temp_length= (*field)->pack_length()))
|
||||
if (!(temp_length= (*field)->pack_length_in_rec()))
|
||||
continue; /* Skip null-fields */
|
||||
if (! found || fieldpos < minpos ||
|
||||
(fieldpos == minpos && temp_length < length))
|
||||
|
|
Loading…
Reference in a new issue