diff options
| author | unknown <holyfoot/hf@deer.(none)> | 2006-12-08 15:49:43 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@deer.(none)> | 2006-12-08 15:49:43 +0400 |
| commit | ab4c37dcce7f82493552d839920bf979f9af3ecb (patch) | |
| tree | 3f5808c4f1df2167e359f23ff9b392810d3875f8 /sql | |
| parent | 893055bed6828ef4330b06b36ca6397cfa73fc3c (diff) | |
| parent | 298aff126768cc6fe81714b5bf8b3ae23f153444 (diff) | |
| download | mariadb-git-ab4c37dcce7f82493552d839920bf979f9af3ecb.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-opt
into mysql.com:/home/hf/work/embt/my51-embt
libmysqld/lib_sql.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/include/federated.inc:
Auto merged
mysql-test/t/flush_block_commit.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/status.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
mysql-test/r/flush_block_commit.result:
SCCS merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_func.cc | 4 | ||||
| -rw-r--r-- | sql/item_strfunc.cc | 7 | ||||
| -rw-r--r-- | sql/share/errmsg.txt | 4 |
3 files changed, 12 insertions, 3 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 08e417d8322..ac39e26c4dc 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3391,7 +3391,11 @@ longlong Item_func_release_lock::val_int() } else { +#ifdef EMBEDDED_LIBRARY + if (ull->locked && pthread_equal(current_thd->real_id,ull->thread)) +#else if (ull->locked && pthread_equal(pthread_self(),ull->thread)) +#endif { result=1; // Release is ok item_user_lock_release(ull); diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index e8c87893471..a057594706e 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1811,8 +1811,13 @@ bool Item_func_current_user::fix_fields(THD *thd, Item **ref) if (Item_func_sysconst::fix_fields(thd, ref)) return TRUE; - Security_context *ctx= (context->security_ctx + Security_context *ctx= +#ifndef NO_EMBEDDED_ACCESS_CHECKS + (context->security_ctx ? context->security_ctx : thd->security_ctx); +#else + thd->security_ctx; +#endif /*NO_EMBEDDED_ACCESS_CHECKS*/ return init(ctx->priv_user, ctx->priv_host); } diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index cfeca697692..bcf5d919318 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -78,7 +78,7 @@ ER_CANT_CREATE_TABLE cze "Nemohu vytvo-Bit tabulku '%-.64s' (chybov kd: %d)" dan "Kan ikke oprette tabellen '%-.64s' (Fejlkode: %d)" nla "Kan tabel '%-.64s' niet aanmaken (Errcode: %d)" - eng "Can't create table '%-.64s' (errno: %d)" + eng "Can't create table '%-.200s' (errno: %d)" jps "'%-.64s' e[u܂.(errno: %d)", est "Ei suuda luua tabelit '%-.64s' (veakood: %d)" fre "Ne peut crer la table '%-.64s' (Errcode: %d)" @@ -574,7 +574,7 @@ ER_ERROR_ON_RENAME cze "Chyba p-Bi pejmenovn '%-.64s' na '%-.64s' (chybov kd: %d)" dan "Fejl ved omdbning af '%-.64s' til '%-.64s' (Fejlkode: %d)" nla "Fout bij het hernoemen van '%-.64s' naar '%-.64s' (Errcode: %d)" - eng "Error on rename of '%-.64s' to '%-.64s' (errno: %d)" + eng "Error on rename of '%-.150s' to '%-.150s' (errno: %d)" jps "'%-.64s' '%-.64s' rename ł܂ (errno: %d)", est "Viga faili '%-.64s' mbernimetamisel '%-.64s'-ks (veakood: %d)" fre "Erreur en renommant '%-.64s' en '%-.64s' (Errcode: %d)" |