70c2256d2f
Merge with 4.0 to get fixes for netware
2004-06-02 00:09:14 +03:00
2953c23ab0
Changed --log-warnings to be integer instead of boolean. Given --skip-log-warnings
...
will disable warnings, --log-warnings will increment warning level by one, or the
level can be given as an optional argument. Default level is 1.
Changed aborted connection warning to be logged only if the level is > 1.
2004-06-01 17:29:24 +03:00
2e1ded2fe1
backport wild_compare fix from 4.1 - bug#3924
2004-05-29 17:52:20 +02: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
ef260fa754
Merge
2004-05-24 21:13:38 +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
7e93d385d4
Introduced parameter object "ALTER_INFO" for mysql_alter_table
...
to make list of parameters in mysql_alter_table shorted
to avoid warning in MSVC (windows) building
2004-05-21 19:57:03 +05: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
af39bd4125
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.ps
2004-05-19 10:28:24 +05:00
d9a6ff1125
don't try to purge closed logs
2004-05-18 10:29:20 +02:00
bbfe390afd
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.ps
2004-05-17 18:45:50 +05:00
cd3dab49cc
Merge with 4.0.20
2004-05-17 01:52:13 +03:00
e18cd2ea9f
Fixes for #3371 , #3372 , #3374 , #3375 , #3376
2004-05-15 17:07:44 +05:00
1e860400f3
Extra safety fixes (probably not needed, but can't hurt)
2004-05-15 09:08:03 +03:00
3711c98b2a
Trivial manual merge
2004-05-15 00:06:16 +04:00
02f51ccf2d
Many files:
...
Fix remaining cases of Bug #3596 : fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
2004-05-14 16:48:56 +03:00
116f61c656
Don't automaticly generate a new key for a foreign key constraint if there is already a usable key.
...
Prefer not automatic keys before automatic keys. If there is two conf
2004-05-12 00:29:52 +03: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
62fca61bc4
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1
2004-05-05 21:24:13 +03:00
c5c35c667e
caching of queries with isammerge tables forbiden using general way
...
SQL_SELECT_LIMIT as default will be applied only for SELECT statement if there was not explicit LIMIT clause
correct table list passed to class constructor of select_update
2004-05-05 21:21:41 +03: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
fdfcadc735
Manual merge for WL#1622 code, will need fixes
2004-05-05 16:10:16 +04: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
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
6678ecf19a
Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result() (Bug #1647 )
...
Added checking of cut read lines in bootstrap thread (Bug #2874 )
2004-04-30 14:02:17 +03:00
d4e9522962
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-04-28 19:27:56 +04:00
692e9dd6f0
- Fixed compile error in sql_parse.cc
2004-04-15 04:55:49 +02:00
194027d5d8
Merged
2004-04-13 02:18:09 +04:00
a314cbefa1
WL#1622 "SQL Syntax for Prepared Statements": post-review fixes:
...
Moved PS name to Statement class, Statement_map now handles name-to-statement resolution.
Both named and unnamed statements are now executed in one function (sql_prepare.cc:execute_stmt)
Fixed a problem: Malformed sequence of commands from client could cause server to use previously deleted objects.
Some code cleanup and small fixes
2004-04-13 01:58:48 +04:00
7d9a9fd93a
Added missing return statement
2004-04-12 03:26:32 +03:00
a535342d57
after review PS fixes
2004-04-10 01:14:32 +03:00
555eb86616
merge
2004-04-08 23:50:10 +03:00
a298c6d4fa
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-04-08 19:14:11 +04:00
62fa4013ce
Don't enable HA_EXTRA_WRITE_CACHE if too few rows
...
Revert main parts of patch for online index builds. Should be done differently
Added support for %lx in my_snprintf()
2004-04-08 17:56:45 +03:00
ac563b1b8e
Merge
2004-04-08 17:08:56 +04:00
56be6f3f93
merge
2004-04-08 00:19:43 +03:00
5e37c41fae
new error for unsupported command in PS
...
fixed IN subselect with basic constant left expression
SQLCOM_CREATE_TABLE, SQLCOM_UPDATE_MULTI, SQLCOM_REPLACE_SELECT, SQLCOM_INSERT_SELECT, QLCOM_DELETE_MULTI fixed to be compatible with PS (BUG#3398, BUG#3406)
fixed multiupdate privelege check (BUG#3408)
fixed multiupdate tables check (BUG#3411)
unchecked commands now is rejected by PS protocol to avoid serever crash
fixed cleunup procedure to be compatible sith DO/SET (BUG#3393)
2004-04-08 00:16:17 +03:00
4de7e18b81
Hand-resolved auto merge
2004-04-07 14:56:24 +02:00
61fd95d168
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
2004-04-07 15:23:05 +03:00
5fa9953ce3
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_3342/mysql-4.1
2004-04-07 17:23:04 +05:00
560a9f66d3
after review changes
2004-04-07 13:25:24 +03:00
70c4eb5838
Portability fixes
...
Fixed problems with group_concat() and HAVING
Updated crash-me values
2004-04-07 04:33:58 +03:00
aeff7ce714
fixed
...
bug #3342 "SHOW CREATE DATABASE seems to require DROP privilege"
(now it require only SELECT privilege on database)
2004-04-06 20:26:35 +05:00
75e7ca479e
reverting table list to be able to use it in next PS call (BUG#2811)
2004-04-06 00:10:43 +03:00
1f8505d66f
Post-merge fixes
2004-04-05 19:52:10 +04:00
a8386d01c2
Many files:
...
SQL Syntax for Prepared Statements (WL#1622)
ps.test, ps.result:
new file
2004-04-05 19:43:37 +04:00
