Commit cf09e606 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
parents 20cf8f82 57fa3270

mysql-test/r/innodb-replace.result

+1 −0
Original line number Diff line number Diff line 
drop table if exists t1;

create table t1 (c1 char(5) unique not null, c2 int, stamp timestamp) engine=innodb;

select * from t1;

c1	c2	stamp

mysql-test/t/innodb-replace.test

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 
# embedded server ignores 'delayed', so skip this

-- source include/not_embedded.inc



--disable_warnings

drop table if exists t1;

--enable_warnings



#

# Bug #1078

#

sql/mysqld.cc

+1 −0
Original line number Diff line number Diff line
@@ -1492,6 +1492,7 @@ void end_thread(THD *thd, bool put_in_cache) 
      thd=thread_cache.get();

      thd->real_id=pthread_self();

      (void) thd->store_globals();

      thd->thr_create_time= time(NULL);

      threads.append(thd);

      pthread_mutex_unlock(&LOCK_thread_count);

      DBUG_VOID_RETURN;

sql/share/english/errmsg.txt

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ character-set=latin1 
"Column '%-.64s' cannot be null",

"Unknown database '%-.64s'",

"Table '%-.64s' already exists",

"Unknown table '%-.180s'",

"Unknown table '%-.100s'",

"Column '%-.64s' in %-.64s is ambiguous",

"Server shutdown in progress",

"Unknown column '%-.64s' in '%-.64s'",