diff --git a/BUILD/compile-alpha-cxx b/BUILD/compile-alpha-cxx index 971b8b4ab3ace319791d5f58b1dc879edc773929..250b092fe2a52c14e8b6ec943e9b91b55fcbee4f 100755 --- a/BUILD/compile-alpha-cxx +++ b/BUILD/compile-alpha-cxx @@ -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 diff --git a/configure.in b/configure.in index d2f5eee5c232c3a72c982b2fe194631514404ea4..e4dc902f6e4e8adf6dd80e12123ee80f632dfba7 100644 --- a/configure.in +++ b/configure.in @@ -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 \ diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 20874981840935df8e6e9bed90e24d72158892e5..f569f2ea4053ed1c3f21b3ea3458dc0595c1fef4 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -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 ( diff --git a/sql/sql_base.cc b/sql/sql_base.cc index d16998e158166af92f2229eae1c39dc4b5c36653..56063a33d6895425db5281eaf3959dca98541f2f 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -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; @@ -587,7 +587,7 @@ bool close_temporary_table(THD *thd, const char *db, const char *table_name) table= *prev; *prev= table->next; close_temporary(table); - if(thd->slave_thread) + if (thd->slave_thread) --slave_open_temp_tables; return 0; }