database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-22 17:44:29 +03:00
Code Activity

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

Browse Source 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
This commit is contained in:
unknown
2004-08-01 16:35:35 +02:00
parent 93f773aa47 2919d44260
commit 12bdc04b29
21 changed files with 187 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/ha_innodb.cc
View File

@@ -3642,11 +3642,19 @@ ha_innobase::create(
}
if (current_thd->query != NULL) {
error = row_table_add_foreign_constraints(trx,
current_thd->query, norm_name);
error = convert_error_code_to_mysql(error, NULL);
LEX_STRING q;
if (thd->convert_string(&q, system_charset_info,
current_thd->query,
current_thd->query_length,
current_thd->charset())) {
error = HA_ERR_OUT_OF_MEM;
} else {
error = row_table_add_foreign_constraints(trx,
q.str, norm_name);
error = convert_error_code_to_mysql(error, NULL);
}
if (error) {
innobase_commit_low(trx);