c9fd775777
merged
2004-07-21 23:32:11 +02:00
a1b6f6db0e
LEX initialization fixed
2004-07-21 22:44:12 +03:00
9336d36cf8
VIEW
...
two TABLE_LIST copy eliminated
2004-07-16 01:15:55 +03:00
5b3c418b48
After merge fixes
...
Note: The following tests fails
- fulltext (Sergei has promised to fix)
- rpl_charset (Guilhem should fix)
- rpl_timezone (Dimitray has promised to fix)
Sanja needs to check out the calling of close_thread_tables() in sp_head.cc
2004-07-15 04:19:07 +03:00
fa7f63d46d
After merge fixes
2004-07-12 07:43:38 +03:00
1e31199995
Merge with 4.1.3-beta
2004-07-07 11:29:39 +03:00
130740248b
aggregate functions check during substitution made only for single row subselects (BUG#4400)
...
restoring current senect pointer before PS rexecution (backport from 5.0)
removed spaces at lines ends
2004-07-04 08:46:28 +03:00
24a8dc2337
fixed WHERE condition optimisation in PS
2004-07-01 01:52:05 +03:00
4092635155
fixed EXPLAIN behaviour with prepared statements (BUG#4271)
2004-06-25 11:37:43 +03:00
29b88ff539
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-4030
2004-06-24 19:09:31 +04:00
a30fcdc690
Fix for Bug#4030 "Client side conversion string -> date type doesn't
...
work (prepared statements)" and after-review fixes:
- str_to_TIME renamed to str_to_datetime to pair with str_to_time
- functions str_to_time and str_to_TIME moved to sql-common
- send_data_str now supports MYSQL_TYPE_TIME, MYSQL_TIME_DATE,
MYSQL_TIME_DATETIME types of user input buffers.
- few more comments in the client library
- a test case added.
2004-06-24 19:08:36 +04:00
79739b30e2
- fixed a compile error on Windows (incompatible cast)
2004-06-23 16:57:34 +02:00
cb0f607c5e
Merge
2004-06-22 12:38:23 +03:00
b793142c8f
Unused variables removed (many files).
2004-06-21 20:39:19 +04:00
d2c585df31
fixed field resolving mode fo INSERT/REPLACE and CRETE with SELECT (BUG#4090)
2004-06-13 22:39:09 +03:00
f3e018f833
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-4026
2004-06-09 03:22:55 +04:00
dc11d3cfa1
Proposed fix for Bug#4026 "Microseconds part of TIME/DATETIME types
...
is broken (prepared statements)": fixed date handling in many places
of prepared statements code.
2004-06-09 03:21:50 +04:00
26a5650d1b
SQL Syntax for Prepared Statements: post-merge fixes
2004-06-08 00:43:03 +04:00
916579e3fd
Merged
2004-06-07 12:21:26 +04:00
1e05e6cb82
Post review fixes for "SQL Syntax for Prepared Statements".
2004-06-07 12:09:10 +04:00
231ec66652
More comments in prepared statements code.
2004-06-06 00:33:16 +04:00
dc38512390
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-06-01 17:29:13 +04:00
e3b03d7a08
* New, binlog-aware character sets support in SQL Syntax for Prepared statements.
...
* The prepared statement query is put into binary log on execution only if it is an update query.
2004-06-01 17:27:40 +04:00
71eddc362e
Merging 4.1 to 5.0.
2004-05-26 17:04:45 +02:00
4eaac5fa56
changed comment for LONG_DATA_COMMAND
2004-05-25 19:52:05 +04:00
d7dd97089e
Manually merged, requirees more merging
2004-05-25 08:15:50 +04:00
f207b33a7b
Support for character set conversion in binary protocol: another go
...
after Monty's review.
- Item_param was rewritten.
- it turns out that we can't convert string data to character set of
connection on the fly, because they first should be written to the binary
log.
To support efficient conversion we need to rewrite prepared statements
binlogging code first.
2004-05-25 02:03:49 +04:00
700adb9ae9
Added support for PREPARE stmt1 FROM @var,
...
Fixed the problem of previous patch with replication,
More post-review fixes
2004-05-24 21:08:22 +04:00
f75b1adece
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-05-21 04:31:07 +04:00
fb17025b3e
WL#1622 "SQL Syntax for Prepared Statements": Post-review fixes (1 of 2)
2004-05-21 04:27:50 +04:00
c7396f8d20
PS and SP made compatible in mechanism used for preparing query for rexecutions (Bug #2266 )
2004-05-20 02:02:49 +03:00
3a7e3f0612
embedded library: fix for sending of parameters to stored procedure.
...
using of methods like sint2korr() doesn't work on Bigendian machines
2004-05-18 19:13:21 +05:00
e18cd2ea9f
Fixes for #3371 , #3372 , #3374 , #3375 , #3376
2004-05-15 17:07:44 +05:00
bf45960eef
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
67ad78cb5d
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-05-06 23:02:32 +04:00
b58df2e9d4
mysql_stmt_reset now expects ok/error packet from server.
2004-05-06 22:44:00 +04:00
963ae8a9a7
WL#1622: Post-merge fixes
2004-05-05 19:11:40 +04:00
4d8235b849
Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hegel.local:/home/miguel/bk/mysql-4.1
2004-05-05 10:55:39 -03:00
634a024fa9
Fixes for prior commit
2004-05-05 10:54:11 -03:00
fdfcadc735
Manual merge for WL#1622 code, will need fixes
2004-05-05 16:10:16 +04:00
104fdf607d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-05-05 12:40:59 +03:00
82c50dc49d
Delete Items created during Prepared Stat (memory leak bug) (Bug #3451 )
2004-05-05 12:40:33 +03:00
8d1480f7c5
Windows fixes for VC++ compiler compability
2004-05-05 02:59:17 -03:00
2c30359aa4
Manual merge of bugfix for Bug #1664 .
2004-05-04 19:13:18 +04:00
c7fbcbca7a
Fix for remaining issues described in Bug #1664
...
"mysql_send_long_data() API call is completely broken".
Now we are resetting some members (long_data_supplied/null_value...) of Item_param to its
initial state after each execution of prepared statement. We also manipulating
Item_param::maybe_null/null_value only via Item_param::set_* setters which makes code a bit
more robust.
2004-05-04 19:08:19 +04:00
1eb588215b
More small WL#1622 fixes: Allocate name of Prepared Statement on PS's mem_root.
2004-04-30 20:44:46 +04:00
b55d59fe2f
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-04-30 19:24:57 +04:00
07eaf18642
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-u2
2004-04-30 03:00:55 +04:00
aec8522569
Fix for Bug#3035 "Prepared statement integer inserts": now unsigned
...
flag is sent to server with placeholder types.
There were no need to extend the protocol as one additional byte
was reserved for placeholder code, when placeholder code is in range 0-255.
So this byte is now used for flags. Post-review fixes added.
2004-04-30 03:00:19 +04:00
42c00f2aed
Post-merge fixes
2004-04-14 22:20:19 +04:00
