diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-10-24 17:50:46 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-10-24 17:50:46 +0500 |
| commit | 81dac08b5205a7ef81c80ea824a487df95cb8f51 (patch) | |
| tree | c4c71cb7f6f5f3a018f0d7133ef2b4cab0271e47 /libmysqld | |
| parent | ab133655360a284567b74be79765031493823479 (diff) | |
| parent | 6c4aa883ce15b6b5193d34caf72025548da56175 (diff) | |
| download | mariadb-git-81dac08b5205a7ef81c80ea824a487df95cb8f51.tar.gz | |
Merge mysql.com:/home/hf/work/0current_stmt/my41-current_stmt
into mysql.com:/home/hf/work/current_stmt/my50-current_stmt
include/mysql.h:
merging
libmysqld/lib_sql.cc:
merging
sql/sql_class.h:
merging
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 40966be46a5..a88c0b135db 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -100,7 +100,7 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command, mysql->affected_rows= ~(my_ulonglong) 0; mysql->field_count= 0; net->last_errno= 0; - mysql->current_stmt= stmt; + thd->current_stmt= stmt; thd->store_globals(); // Fix if more than one connect /* |