database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
into mysql.com:/home/my/mysql-4.1
This commit is contained in:
monty@mysql.com
2005-04-26 21:09:42 +03:00
parent 6f95cf02ab 220a01a838
commit 3ca23bd918
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/r/innodb-replace.result
View File

@ -1,3 +1,4 @@
drop table if exists t1;
create table t1 (c1 char(5) unique not null, c2 int, stamp timestamp) engine=innodb; create table t1 (c1 char(5) unique not null, c2 int, stamp timestamp) engine=innodb;
select * from t1; select * from t1;
c1 c2 stamp c1 c2 stamp

4
mysql-test/t/innodb-replace.test
View File

@ -2,6 +2,10 @@
# embedded server ignores 'delayed', so skip this # embedded server ignores 'delayed', so skip this
-- source include/not_embedded.inc -- source include/not_embedded.inc
--disable_warnings
drop table if exists t1;
--enable_warnings
# #
# Bug #1078 # Bug #1078
# #

1
sql/mysqld.cc
View File

@ -1492,6 +1492,7 @@ void end_thread(THD *thd, bool put_in_cache)
thd=thread_cache.get(); thd=thread_cache.get();
thd->real_id=pthread_self(); thd->real_id=pthread_self();
(void) thd->store_globals(); (void) thd->store_globals();
thd->thr_create_time= time(NULL);
threads.append(thd); threads.append(thd);
pthread_mutex_unlock(&LOCK_thread_count); pthread_mutex_unlock(&LOCK_thread_count);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;

2
sql/share/english/errmsg.txt
View File

@ -67,7 +67,7 @@ character-set=latin1
"Column '%-.64s' cannot be null", "Column '%-.64s' cannot be null",
"Unknown database '%-.64s'", "Unknown database '%-.64s'",
"Table '%-.64s' already exists", "Table '%-.64s' already exists",
"Unknown table '%-.180s'", "Unknown table '%-.100s'",
"Column '%-.64s' in %-.64s is ambiguous", "Column '%-.64s' in %-.64s is ambiguous",
"Server shutdown in progress", "Server shutdown in progress",
"Unknown column '%-.64s' in '%-.64s'", "Unknown column '%-.64s' in '%-.64s'",