mirror of
https://github.com/MariaDB/server.git
synced 2026-05-11 01:20:15 +02:00
Fix wrong memory allocation in SHOW OPEN TABLES
BUILD/compile-alpha-cxx: Fix for Alpha ccc configure.in: Remove not used libraries mysql-test/r/innodb.result: Fix test case sql/sql_base.cc: Fix wrong memory allocation in SHOW OPEN TABLES.
This commit is contained in:
parent
b6287ade89
commit
8c02fad253
4 changed files with 12 additions and 5 deletions
|
|
@ -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
|
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
|
make -j2
|
||||||
rm */.deps/*
|
find . -name ".deps" | xargs rm -r
|
||||||
make
|
make
|
||||||
if [ $? = 0 ]
|
if [ $? = 0 ]
|
||||||
then
|
then
|
||||||
|
|
|
||||||
|
|
@ -2254,7 +2254,8 @@ AC_SUBST(server_scripts)
|
||||||
# Some usefull subst
|
# Some usefull subst
|
||||||
AC_SUBST(CC)
|
AC_SUBST(CC)
|
||||||
AC_SUBST(GXX)
|
AC_SUBST(GXX)
|
||||||
AC_SUBST(TOOLS_LIBS)
|
#Remove TOOLS_LIBS, because this is included in LIBRARIES
|
||||||
|
#AC_SUBST(TOOLS_LIBS)
|
||||||
|
|
||||||
# Output results
|
# Output results
|
||||||
AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile \
|
AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile \
|
||||||
|
|
|
||||||
|
|
@ -818,6 +818,12 @@ a
|
||||||
1
|
1
|
||||||
2
|
2
|
||||||
4
|
4
|
||||||
|
alter table t1 add b int;
|
||||||
|
select * from t1;
|
||||||
|
a b
|
||||||
|
1 NULL
|
||||||
|
2 NULL
|
||||||
|
4 NULL
|
||||||
drop table t1;
|
drop table t1;
|
||||||
create table t1
|
create table t1
|
||||||
(
|
(
|
||||||
|
|
|
||||||
|
|
@ -160,7 +160,7 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *wild)
|
||||||
if (table)
|
if (table)
|
||||||
continue;
|
continue;
|
||||||
if (!(*start_list = (OPEN_TABLE_LIST *)
|
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
|
open_list=0; // Out of memory
|
||||||
break;
|
break;
|
||||||
|
|
@ -587,7 +587,7 @@ bool close_temporary_table(THD *thd, const char *db, const char *table_name)
|
||||||
table= *prev;
|
table= *prev;
|
||||||
*prev= table->next;
|
*prev= table->next;
|
||||||
close_temporary(table);
|
close_temporary(table);
|
||||||
if(thd->slave_thread)
|
if (thd->slave_thread)
|
||||||
--slave_open_temp_tables;
|
--slave_open_temp_tables;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue