diff options
author | unknown <hf@deer.mysql.r18.ru> | 2003-01-21 09:46:07 +0400 |
---|---|---|
committer | unknown <hf@deer.mysql.r18.ru> | 2003-01-21 09:46:07 +0400 |
commit | a109d180c15d8e2b7908cf7833ee2ea245ae18f0 (patch) | |
tree | 8b24c166544177198dcdcd0ca14516e5e3cd544f /sql/sql_prepare.cc | |
parent | 65aa88236cc1e310baa69cfed7281ce029859aed (diff) | |
parent | 3ffd7865b02a37569f955e40505f2f6b46cbe7a0 (diff) | |
download | mariadb-git-a109d180c15d8e2b7908cf7833ee2ea245ae18f0.tar.gz |
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.w1
sql/ha_innodb.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'sql/sql_prepare.cc')
-rw-r--r-- | sql/sql_prepare.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 2c5b049e51b..0e1cdbe824f 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -30,7 +30,11 @@ Prepare: - Without executing the query, return back to client the total number of parameters along with result-set metadata information (if any) in the following format: - [STMT_ID:4][Columns:2][Param_count:2][Columns meta info][Params meta info] + [STMT_ID:4] + [Column_count:2] + [Param_count:2] + [Columns meta info] (if Column_count > 0) + [Params meta info] (if Param_count > 0 ) (TODO : 4.1.1) Prepare-execute: |