database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge bk@192.168.21.1:mysql-4.1

Browse Source 
into  mysql.com:/home/hf/work/mysql-4.1-mrg


include/mysql.h:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_class.h:
  Auto merged
Makefile.am:
  merging
client/mysqltest.c:
  merging
mysql-test/t/mysql_client.test:
  merging
This commit is contained in:
unknown
2006-11-16 20:44:37 +04:00
parent 6bd194d7ca e56742d7a9
commit 17c238a15b
26 changed files with 315 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_class.h
View File

@@ -686,6 +686,12 @@ public:
char *extra_data;
ulong extra_length;
String query_rest;
/*
In embedded server it points to the statement that is processed
in the current query. We store some results directly in statement
fields then.
*/
struct st_mysql_stmt *current_stmt;
#endif
NET net; // client connection descriptor
MEM_ROOT warn_root; // For warnings and errors