guilhem@mysql.com
3d33dc7c77
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-06-10 16:42:07 +02:00
guilhem@mysql.com
e816a757db
WL#1689 "Map OPTIMIZE TABLE to ALTER TABLE for InnoDB"
...
exactly it's mapped to "ALTER TABLE t; ANALYZE TABLE t;"
2004-06-10 16:41:24 +02:00
guilhem@mysql.com
73411a2ed5
WL#1595 "Optionally fsync() the binlog after every statement":
...
New option --sync-binlog=x (and global settable variable) which will fsync the binlog
after every x-th disk write to it. That is, if in autocommit mode, after every x-th statement
written to the binlog; if using transactions, after every x-th transaction written to the binlog.
x==0 means no fsync. x==1 is the slowest.
There is no test added for this, I have just checked that it works as --sync-binlog=1 dramatically
slows down mysqld.
Made sync-frm a global settable variable.
2004-06-10 15:56:13 +02:00
monty@mysql.com
d8b6322860
Merge
2004-06-09 12:34:22 +03:00
sergefp@mysql.com
7e0455f333
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-06-07 23:50:59 +04:00
sergefp@mysql.com
1e05e6cb82
Post review fixes for "SQL Syntax for Prepared Statements".
2004-06-07 12:09:10 +04:00
brian@brian-akers-computer.local
e24e1350a3
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
2004-06-05 10:43:22 -07:00
sergefp@mysql.com
bd04f52552
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-06-03 20:54:46 +04:00
sergefp@mysql.com
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
hf@deer.(none)
15ea09b79d
WL#1163 (Make spatial code separable for other parts)
...
--with-geometry and
--with-embedded-privilege-control
configure switches added
2004-05-27 20:31:30 +05:00
pem@mysql.com
71eddc362e
Merging 4.1 to 5.0.
2004-05-26 17:04:45 +02:00
brian@brian-akers-computer.local
fee4ed7f1c
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
2004-05-25 14:53:55 -07:00
sergefp@mysql.com
d7dd97089e
Manually merged, requirees more merging
2004-05-25 08:15:50 +04:00
konstantin@mysql.com
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
sergefp@mysql.com
ef260fa754
Merge
2004-05-24 21:13:38 +04:00
vva@eagle.mysql.r18.ru
1b61cb6d0f
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/TASK_ALTER_INFO/mysql-4.1
2004-05-24 21:01:35 +05:00
brian@brian-akers-computer.local
fe83735a26
Merge
2004-05-22 12:18:06 -07:00
vva@eagle.mysql.r18.ru
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
brian@avenger.(none)
467cad0bfc
First commit of archive example. Archive is a simple storage engine that handles inserts and selects.
2004-05-20 18:13:11 -07:00
sergefp@mysql.com
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
bell@sanja.is.com.ua
c7396f8d20
PS and SP made compatible in mechanism used for preparing query for rexecutions (Bug #2266 )
2004-05-20 02:02:49 +03:00
monty@mysql.com
a4b0ec1ede
Merge with 4.0, mainly to get changes to windows project files
2004-05-20 00:54:52 +03:00
guilhem@mysql.com
319f83ef9b
Fix for BUG#3829 "Setting server_id on fly doesn't allow replication to start"
...
(fix by our Harrison Fisk): when one does SET GLOBAL SERVER_ID=x, we must set
server_id_supplied to 1.
2004-05-19 15:03:32 +02:00
monty@mishka.local
314a8bf114
key_cmp -> key_cmp_if_same
...
New records_in_range() interface (similar to read_range())
Macros for faster bitmap handling
Simplify read_range() code (#WL1786)
New general key_cmp() function to compare keys
2004-05-16 14:48:32 +03:00
pem@mysql.com
df69f93ae9
Post-merge post-merge fix (new error codes for fparser).
2004-05-14 16:10:31 +02:00
bell@sanja.is.com.ua
3c5cec08c0
file parser for new .frm
2004-05-11 23:23:49 +03:00
monty@mysql.com
1d528a4d55
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2004-05-11 12:21:38 +03:00
timour@mysql.com
f3dab7be12
Merge of WL#1469 with latest bk sources.
2004-05-11 12:15:58 +03:00
timour@mysql.com
a840d8daad
Complete implementation of WL#1469 "Greedy algorithm to search for an optimal execution plan",
...
consisting of pos-review fixes and improvements.
2004-05-10 15:48:50 +03:00
pem@mysql.com
bf45960eef
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
sergefp@mysql.com
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
monty@mysql.com
d21d49a32a
Merge with 4.0.19
2004-05-05 17:05:24 +03:00
sergefp@mysql.com
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
monty@mysql.com
f10d098f7d
Fixed http address in some scripts (Bug #3460 )
...
Output TIMESTAMP in 4.1 format for 4.1 tables (or for TIMESTAMP(19)) (portability fix)
Fixed that INTERVAL can handle big integers. (Bug #3498 )
Fixed that hostname="" works identical as hostname="%" for table/column grants (Bug #3473 )
2004-04-28 17:45:08 +03:00
timour@mysql.com
9f1fd5bd90
Implementation of WL#1469 (Greedy algorithm to search for an optimal execution plan).
2004-04-16 13:21:08 +03:00
magnus@neptunus.(none)
88478c28b1
Merge conflicts with EXAMPLE handler
2004-04-15 09:22:29 +02:00
magnus@neptunus.(none)
7c2c408cb8
Added NDB storage engine
2004-04-15 09:14:14 +02:00
sergefp@mysql.com
9250a0e4e1
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-04-14 23:49:47 +04:00
brian@brian-akers-computer.local
86952cd9a6
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1-examples
2004-04-14 11:59:51 -04:00
brian@brian-akers-computer.local
4d5a8cb78c
All changes are to allow someone to compile the example storage engine and use it.
2004-04-12 21:01:45 -07:00
sergefp@mysql.com
194027d5d8
Merged
2004-04-13 02:18:09 +04:00
sergefp@mysql.com
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
bell@sanja.is.com.ua
a535342d57
after review PS fixes
2004-04-10 01:14:32 +03:00
bell@sanja.is.com.ua
555eb86616
merge
2004-04-08 23:50:10 +03:00
sergefp@mysql.com
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
monty@mysql.com
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
sergefp@mysql.com
ac563b1b8e
Merge
2004-04-08 17:08:56 +04:00
bell@sanja.is.com.ua
56be6f3f93
merge
2004-04-08 00:19:43 +03:00
bell@sanja.is.com.ua
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
serg@serg.mylan
7899158736
correct SET GLOBAL ft_boolean_syntax=DEFAULT behaviour
2004-04-07 20:58:33 +02:00