guilhem@mysql.com
24006266d0
Merge mysql.com:/home/mysql_src/mysql-5.0-van
...
into mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
(2nd try; Pekka kindly accepted to fix storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
and storage/ndb/src/kernel/vm/SimulatedBlock.cpp after I push).
2005-11-19 10:43:28 +01:00
guilhem@mysql.com
2f95fc2701
Merge mysql.com:/home/mysql_src/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
2005-11-18 16:38:01 +01:00
grog@mysql.com
e91e55d643
set_var.cc, mysqld.cc, ha_innodb.h:
...
BUG#12701: SHOW VARIABLES does not show correct size of buffer pool.
ha_innodb.cc:
BUG#12701: SHOW VARIABLES does not show correct size of buffer pool
2005-11-17 15:08:49 +01:00
andrey@lmy004.
3fa9c4243b
reorder the variables - should be in alphabetical order
2005-11-17 14:58:14 +01:00
andrey@lmy004.
6f8d80b146
2 More --bdb variables (fix for bug #14895 )
...
- added bdb-cache-parts
- modified bdb-cache-size to support more than 4G
- added bdb-region-size (size of memory pool for storing file names used in transaction)
2005-11-12 11:56:16 +01:00
guilhem@mysql.com
ff46e54932
WL#2971 "change log-bin-trust-routine-creators=0 to apply only to functions".
...
Indeed now that stored procedures CALL is not binlogged, but instead the invoked substatements are,
the restrictions applied by log-bin-trust-routine-creators=0 are superfluous for procedures.
They still need to apply to functions where function calls are written to the binlog (for example as "DO myfunc(3)").
We rename the variable to log-bin-trust-function-creators but allow the old name until some future version (and issue a warning if old name is used).
2005-11-10 17:50:51 +01:00
reggie@poseidon.ndb.mysql.com
473dac3541
some small changes to help get 5.1 compiling cleanly on Windows and with Visual C++ 2005
2005-11-07 17:15:23 +01:00
acurtis@poseidon.ndb.mysql.com
c01a3b5e5f
Make storage engines "pluggable", handlerton work
2005-11-07 16:25:06 +01:00
svoj@poseidon.ndb.mysql.com
3791197f0d
WL#2575 - Fulltext: Parser plugin for FTS
...
WL#2763 - MySQL plugin interface: step 1
Manual merge from CNET tree.
2005-11-06 13:13:06 +01:00
ramil@poseidon.ndb.mysql.com
63a497a103
1. sys_variables[] array is removed.
...
2. All have_xxx variables are now selectable.
2005-11-06 01:36:40 +01:00
jimw@mysql.com
ef956e27d6
Fix handling of "SET TRANSACTION ISOLATION LEVEL ...". (Bug #7955 )
2005-11-02 16:38:23 -08:00
tomas@poseidon.ndb.mysql.com
620b7bafb0
Merge
2005-10-06 10:54:07 +02:00
serg@serg.mylan
306aa15391
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-merged
2005-09-21 17:42:44 +02:00
serg@serg.mylan
a083ff160e
merged
2005-09-21 13:53:22 +02:00
sergefp@mysql.com
f9475d1d15
BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index
...
statistics (like 4.0 did) (patch #3 , with review #1 & #2 feedback addressed)
2005-09-21 02:18:29 +04:00
bell@sanja.is.com.ua
aec371f910
WL#2787 (part 2, ver 3 (merged)) changed securety context switching
2005-09-15 22:29:07 +03:00
pekka@mysql.com
81d8cc1e84
ndb - wl#2624 re-commit due to bk problem
2005-09-15 02:33:28 +02:00
tulin@dl145c.mysql.com
80da104ea5
merge
2005-09-14 13:37:52 +02:00
pem@mysql.com
f31095f3d5
Fixed BUG#12712: SET AUTOCOMMIT should fail within SP/functions/triggers
...
Second version after review. Allow 'set autocommit' in procedures, but not
functions or triggers. Can return error in run-time (when a function calls
a procedure).
2005-09-13 17:16:12 +02:00
jonas@eel.(none)
315b8ef3bb
Merge eel.(none):/home/jonas/src/mysql-5.0
...
into eel.(none):/home/jonas/src/mysql-5.1-push
2005-09-09 13:30:38 +02:00
gluh@eagle.intranet.mysql.r18.ru
01afb3390b
Fix for bug#11775 Variable character_set_system does not exist (sometimes).
...
Variable character_set_system is selectable now
More accurate error message results during
update of character_set_system and some other read only variables
2005-09-07 15:38:09 +05:00
ndbdev@dl145c.mysql.com
f40c1576b0
Merge
2005-09-06 09:20:15 +02:00
jimw@mysql.com
0e323e566d
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-02 12:42:00 -07:00
bar@mysql.com
5e3eb3d21e
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b12363
2005-09-02 11:19:43 +05:00
ndbdev@dl145b.mysql.com
583979d949
merge
2005-08-31 20:45:48 +02:00
ramil@mysql.com
a16da25e06
Merge mysql.com:/usr/home/ram/work/4.1.b9613
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-08-31 10:25:00 +05:00
paul@kite-hub.kitebird.com
939c7c687d
set_var.cc:
...
Reorder out-of-order system variables
2005-08-30 13:15:43 -05:00
paul@kite-hub.kitebird.com
9cedc58427
Merge kite-hub.kitebird.com:/tmp/merge-4.1
...
into kite-hub.kitebird.com:/tmp/merge-5.0
2005-08-30 12:11:11 -05:00
bar@mysql.com
3ff1acb8db
Bug#12363
...
character_set_results is nullable, but value_ptr returns string "NULL"
set_var.cc:
Create Item_null instead of Item_string for NULL values
variables.result, variables.test:
adding test case
2005-08-30 17:11:59 +05:00
ramil@mysql.com
00e066e201
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b9613
2005-08-30 12:33:58 +05:00
paul@frost.snake.net
39e5dafb91
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
2005-08-27 21:52:26 -05:00
paul@frost.snake.net
c0080aeba6
set_var.cc:
...
Reorder out-of-order system variables.
2005-08-27 19:20:10 -05:00
ramil@mysql.com
120dd92b03
workaround (bug #9613 : Some read-only variables are selectable, others are not).
2005-08-26 13:23:32 +05:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
02056f8e3a
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-25 13:11:38 -04:00
monty@mishka.local
f384e08277
Merge mishka.local:/home/my/mysql-4.1
...
into mishka.local:/home/my/mysql-5.0
2005-08-25 06:55:48 +03:00
jimw@mysql.com
f70beef6c7
Use the hostname with which the user authenticated when determining which
...
user to update with 'SET PASSWORD = ...'. (Bug #12302 )
2005-08-22 15:48:50 -07:00
vtkachenko@quadxeon.mysql.com
fc22a36d78
set_var.cc, mysqld.cc, ha_innodb.h, ha_innodb.cc, srv0srv.c, srv0srv.h:
...
Added innodb_commit_concurrency variable
2005-08-11 18:03:01 +02:00
ingo@mysql.com
1147e00274
Bug#10473 - Can't set 'key_buffer_size' system variable to ZERO
...
Give the user a warning if he tries to destroy the default key cache.
2005-08-07 20:39:17 +02:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
69acde961f
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-05 18:01:34 -04:00
monty@mishka.local
7f845036c0
After merge fixes
...
Review of new pushed code
2005-07-31 22:56:24 +03:00
monty@mishka.local
e73d6c25fd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-07-31 12:56:02 +03:00
monty@mishka.local
8437e9c1be
Fixes during review of new pushed code
...
Change bool in C code to my_bool
Added to mysqltest --enable_parsning and --disable_parsing to avoid to have to comment parts of tests
Added comparison of LEX_STRING's and use this to compare file types for view and trigger files.
2005-07-31 12:49:55 +03:00
bell@sanja.is.com.ua
4a0d64af89
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-trigger-5.0
2005-07-29 23:43:07 +03:00
bell@sanja.is.com.ua
36f250a240
Added sql_mode saving to mysql_dump (BUG#5891, part 2)
2005-07-29 23:39:08 +03:00
jimw@mysql.com
90924fcb6a
Fix for handling of unsigned long options on 32-bit platforms that
...
allowed unintended overflows. (Bug #10351 )
2005-07-28 18:22:49 -07:00
bell@sanja.is.com.ua
b220fc47ef
store/restore sql_mode which was in force during ctrigger creation (BUG#5891)
...
other sql_mode fixes
2005-07-28 22:39:11 +03:00
jimw@mysql.com
72a6c71d08
Fix value returned from SELECT of unsigned long system
...
variables. (Bug #10351 )
2005-07-22 16:18:34 -07:00
jani@a193-229-222-105.elisa-laajakaista.fi
8f10662eab
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
2005-07-23 00:15:53 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
2657e48c64
Faster alter table code for 5.1.
2005-07-22 23:43:59 +03:00
tulin@dl145b.mysql.com
a6c21a0791
merge
2005-07-19 21:56:10 +02:00