Commit 29c527cf authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Fix wrong memory allocation in SHOW OPEN TABLES

parent 55180ca1

BUILD/compile-alpha-cxx

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ aclocal; autoheader; aclocal; automake; autoconf 


CC=ccc CFLAGS="-fast" CXX=cxx CXXFLAGS="-fast -noexceptions -nortti" ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-non_shared --with-client-ldflags=-non_shared



make

rm */.deps/*

make -j2

find . -name ".deps" | xargs rm -r 

make

if [ $? = 0 ]

then

configure.in

+2 −1
Original line number Diff line number Diff line
@@ -2254,7 +2254,8 @@ AC_SUBST(server_scripts) 
# Some usefull subst

AC_SUBST(CC)

AC_SUBST(GXX)

AC_SUBST(TOOLS_LIBS)

#Remove TOOLS_LIBS, because this is included in LIBRARIES

#AC_SUBST(TOOLS_LIBS)



# Output results

AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile \

mysql-test/r/innodb.result

+6 −0
Original line number Diff line number Diff line
@@ -818,6 +818,12 @@ a 
1

2

4

alter table t1 add b int;

select * from t1;

a	b

1	NULL

2	NULL

4	NULL

drop table t1;

create table t1

(

sql/sql_base.cc

+2 −2
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *wild) 
    if (table)

      continue;

    if (!(*start_list = (OPEN_TABLE_LIST *)

	  sql_alloc(sizeof(*start_list)+entry->key_length)))

	  sql_alloc(sizeof(**start_list)+entry->key_length)))

    {

      open_list=0;				// Out of memory

      break;