diff options
| author | unknown <kostja@bodhi.local> | 2006-11-29 02:44:12 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-11-29 02:44:12 +0300 |
| commit | 15584161e22595559cd3883aebe3b35793fba153 (patch) | |
| tree | f9f728e4fd94cdcf8bc3f5ea8270ee291aa94890 /libmysqld/lib_sql.cc | |
| parent | cf9038e97973f8bbe387887af9b9f489316b3629 (diff) | |
| parent | 00fec63a38f90d873a18e849cf0dc191d1ad42eb (diff) | |
| download | mariadb-git-15584161e22595559cd3883aebe3b35793fba153.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.local:/opt/local/work/mysql-5.0-runtime
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/t/wait_for_socket.sh:
Manual merge.
sql/sql_cache.cc:
Manual merge.
Diffstat (limited to 'libmysqld/lib_sql.cc')
| -rw-r--r-- | libmysqld/lib_sql.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 93b1ed5c81d..97bcb9d87ca 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -100,6 +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; + thd->current_stmt= stmt; thd->store_globals(); // Fix if more than one connect /* |