1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into mysql.com:/home/mysql_src/mysql-5.0-clean
This commit is contained in:
guilhem@mysql.com 2005-01-15 10:22:05 +01:00
commit de1ff0698b
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/mysql-test-run.sh
View File

@ -538,7 +538,12 @@ else
MYSQLD="$VALGRIND $BASEDIR/bin/mysqld" MYSQLD="$VALGRIND $BASEDIR/bin/mysqld"
fi fi
CLIENT_BINDIR="$BASEDIR/bin" 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_TEST="$CLIENT_BINDIR/mysqltest"
MYSQL_DUMP="$CLIENT_BINDIR/mysqldump" MYSQL_DUMP="$CLIENT_BINDIR/mysqldump"
MYSQL_BINLOG="$CLIENT_BINDIR/mysqlbinlog" MYSQL_BINLOG="$CLIENT_BINDIR/mysqlbinlog"

4
scripts/mysql_install_db.sh
View File

@ -98,9 +98,9 @@ else
if test -x "$basedir/libexec/mysqld" if test -x "$basedir/libexec/mysqld"
then then
execdir="$basedir/libexec" execdir="$basedir/libexec"
elif test -x "@libexecdir@/mysqld" elif test -x "$basedir/sbin/mysqld"
then then
execdir="@libexecdir@" execdir="$basedir/sbin"
else else
execdir="$basedir/bin" execdir="$basedir/bin"
fi fi

2
sql/field.h
View File

@ -123,6 +123,7 @@ public:
} }
virtual bool eq_def(Field *field); virtual bool eq_def(Field *field);
virtual uint32 pack_length() const { return (uint32) field_length; } 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(void) { bzero(ptr,pack_length()); }
virtual void reset_fields() {} virtual void reset_fields() {}
virtual void set_default() virtual void set_default()
@ -1237,6 +1238,7 @@ public:
{ get_key_image(buff, length, itRAW); } { get_key_image(buff, length, itRAW); }
uint32 pack_length() const uint32 pack_length() const
{ return (uint32) field_length + (bit_len > 0); } { return (uint32) field_length + (bit_len > 0); }
uint32 pack_length_in_rec() const { return field_length; }
void sql_type(String &str) const; void sql_type(String &str) const;
field_cast_enum field_cast_type() { return FIELD_CAST_BIT; } field_cast_enum field_cast_type() { return FIELD_CAST_BIT; }
char *pack(char *to, const char *from, uint max_length=~(uint) 0); char *pack(char *to, const char *from, uint max_length=~(uint) 0);

2
sql/ha_myisam.cc
View File

@ -1467,7 +1467,7 @@ int ha_myisam::create(const char *name, register TABLE *table_arg,
fieldpos <= minpos) fieldpos <= minpos)
{ {
/* skip null fields */ /* skip null fields */
if (!(temp_length= (*field)->pack_length())) if (!(temp_length= (*field)->pack_length_in_rec()))
continue; /* Skip null-fields */ continue; /* Skip null-fields */
if (! found || fieldpos < minpos || if (! found || fieldpos < minpos ||
(fieldpos == minpos && temp_length < length)) (fieldpos == minpos && temp_length < length))