diff options
| author | unknown <holyfoot/hf@deer.(none)> | 2006-10-24 17:53:15 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@deer.(none)> | 2006-10-24 17:53:15 +0500 |
| commit | c0a46e71d7ee71b5930a1c905bf24147f9e0a058 (patch) | |
| tree | da38a680803981a2ddc812b9958a5873cf415f34 /libmysqld | |
| parent | 9852dfbcf5d3bfb5eec4316977b3d0d37761520e (diff) | |
| parent | 81dac08b5205a7ef81c80ea824a487df95cb8f51 (diff) | |
| download | mariadb-git-c0a46e71d7ee71b5930a1c905bf24147f9e0a058.tar.gz | |
Merge mysql.com:/home/hf/work/current_stmt/my50-current_stmt
into mysql.com:/home/hf/work/current_stmt/my51-current_stmt
include/mysql.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
sql/sql_class.h:
Auto merged
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 5ac2c163c4e..a3edc310677 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 /* |