patg@patrick-galbraiths-computer.local
1bceba0995
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
2005-01-25 09:35:57 -08:00
ingo@mysql.com
bcd1c31a53
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-25 09:47:01 +01:00
patg@patrick-galbraiths-computer.local
d6727ff70f
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
2005-01-24 11:31:21 -08:00
serg@serg.mylan
c76405a7ee
merged
2005-01-24 19:41:42 +01:00
serg@serg.mylan
79240013b2
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-24 15:50:13 +01:00
serg@serg.mylan
67ba2e367a
fixes/cleanups according to Coverity report
2005-01-24 15:48:25 +01:00
ingo@mysql.com
c4a0eb142b
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-24 10:48:52 +01:00
ingo@mysql.com
12879fc30d
WL#2126 - Multi_read_range.
...
Addendum for correct multi_range_count system variable handling.
Fixed a typo.
Added to sys_variables.
Added to init_vars.
2005-01-21 17:38:46 +01:00
timour@mysql.com
36f1e91b69
Merge of fix for BUG#4258 from 4.1.
...
Needs additional manual merge.
2005-01-21 17:38:36 +02:00
dlenev@brandersnatch.localdomain
348218d21d
Fix for bug #7637 : "Test failure: 'user_limits' on QNX and 64-bit systems"
...
Made user_limits.test scheduling independant (this solves failure on QNX).
Made sys_var_max_user_conn variable int sized. Changed
max_user_connections from ulong to uint to be able to use it in
sys_var_max_user_conn::value_ptr() (solves failures on 64-bit platforms).
2005-01-20 00:54:01 +03:00
timour@mysql.com
7fb0de20f3
Final patch for BUG#4285.
...
This patch collects all previous patches into one.
The main problem was due to that there is are two variables -
dflt_key_cache and sql_key_cache with have more or less duplicate
function. The reson for the bug was that the default value in the key
cache hash was set to dflt_key_cache, then sql_key_cache was set to a
new key cache object, and then dflt_key_cache was set to sql_key_cache
which was different from the dflt_key_cache_var. After sending SIGHUP,
the server was using the original default value for the key cache hash,
which was different from the actual key cache object used for the
default key cache.
2005-01-19 12:55:54 +02:00
mskold@mysql.com
6bb027a97c
Merge
2005-01-17 09:44:34 +01:00
patg@patrick-galbraiths-computer.local
5dd710a958
change to have_<> variable for federated engine
2005-01-13 13:03:05 -08:00
mskold@mysql.com
290489e657
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-01-13 10:49:01 +01:00
paul@kite-hub.kitebird.com
231632e34f
user_limits.result:
...
Fix test result affected by error message rewording.
errmsg.txt:
Reword error messages.
set_var.cc:
Reorder variables.
mysqld.cc:
Reorder options.
2005-01-12 20:38:05 -06:00
vtkachenko@mail.mysql.com
306df48731
Merge
2005-01-12 21:03:06 +01:00
vtkachenko@mail.mysql.com
9f640bbad9
logging_ok:
...
Logging to logging@openlogging.org accepted
innodb.result, innodb.test, set_var.cc, mysqld.cc:
change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
2005-01-12 20:55:06 +01:00
mskold@mysql.com
2e3a60f7fd
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-01-10 09:31:17 +01:00
paul@kite-hub.kitebird.com
61041e55fe
Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
...
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
2005-01-08 19:46:52 -06:00
paul@kite-hub.kitebird.com
7585b5cb61
set_var.cc:
...
Whack duplicate variable line. (Affects SHOW VARIABLES.)
2005-01-08 19:43:15 -06:00
vtkachenko@intelp4d.mysql.com
ad7dad8d03
Many files:
...
- Create innodb_thread_concurrency as dynamic variable
- Add innodb_thread_sleep_delay variable
- Add innodb_free_tickets_to_enter variable
2005-01-08 15:01:37 +01:00
paul@kite-hub.kitebird.com
7e807dc727
Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
...
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
2005-01-07 14:18:38 -06:00
paul@kite-hub.kitebird.com
76b823cebe
set_var.cc:
...
Reorder variables to properly alphabetize SHOW VARIABLES output.
2005-01-07 14:17:08 -06:00
mskold@mysql.com
346aeda888
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-01-07 15:34:25 +01:00
vtkachenko@intelp4d.mysql.com
bd47d6f360
set_var.cc, mysqld.cc, ha_innodb.h, innodb.test, innodb.result:
...
Create new innodb_sync_spin_loops variable
2005-01-05 12:43:48 +01:00
monty@mysql.com
309b1a2b6c
Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY
2005-01-03 23:04:52 +02:00
mskold@mysql.com
881b3a023f
Merge
2005-01-03 15:20:06 +01:00
paul@snake-hub.snake.net
fc0d550bad
set_var.cc:
...
Silence compiler warning.
2005-01-02 15:10:08 -06:00
serg@sergbook.mysql.com
a04fc26c54
manually merged
2004-12-31 15:26:24 +01:00
dlenev@mysql.com
536cb92195
Manual merge.
2004-12-31 12:48:27 +03:00
vtkachenko@intelp4d.mysql.com
ae1b969c8f
Merge bk-internal:/home/bk/mysql-5.0
...
into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0
2004-12-31 09:00:34 +01:00
monty@mysql.com
34d5331cee
Merge with global tree
2004-12-31 00:50:30 +02:00
dlenev@mysql.com
a8deefa3dd
Manual merge of patch implementing WL#1339 with main tree.
2004-12-29 22:35:16 +03:00
dlenev@brandersnatch.localdomain
ffa7393330
WL#1339 "Add per account max_user_connections limit (maximum number
...
of concurrent connections for the same account)"
Added support of account specific max_user_connections limit. Made all
user limits to be counted per account instead of the old behavior,
which was per user/host accounting. Added option which enables the old
behavior. Added testing of these to the test suite.
(After review version).
2004-12-29 20:30:37 +03:00
mskold@mysql.com
a5204f692b
Merge
2004-12-29 10:02:03 +01:00
vtkachenko@intelp4d.mysql.com
f1dfafe721
Many files:
...
tabs replaced
ha_innodb.cc:
Comments removed
2004-12-24 13:31:21 +01:00
vtkachenko@intelp4d.mysql.com
78846b2923
logging_ok:
...
Logging to logging@openlogging.org accepted
sql_yacc.yy, sql_parse.cc, sql_lex.h, lex.h:
Implements the SHOW MUTEX STATUS command
set_var.cc, mysqld.cc, mysql_priv.h:
Added new GLOBAL variable timed_mutexes
ha_innodb.h:
New function innodb_mutex_show_status
ha_innodb.cc:
Added new innodb variables in SHOW STATUS
Implements the SHOW MUTEX STATUS command
innodb.test, innodb.result:
Added new row_lock_waits status variables tests.
variables.test, variables.result:
test new variable timed_mutexes
ut0ut.c:
New function ut_usectime.
sync0sync.c:
Mutex counting.
sync0rw.c:
New mutex parameters initialization.
srv0srv.c:
Counting row lock waits
row0sel.c, row0mysql.c:
Setting row_lock or table_lock state to thd.
que0que.c:
Added default no_lock_state to thd.
univ.i:
Added UNIV_SRV_PRINT_LATCH_WAITS debug define
sync0sync.ic:
Count mutex using.
sync0sync.h:
Added new parameters to mutex structure for counting.
sync0rw.h:
Added new parameters to rw_create_func.
srv0srv.h:
Added new innodb varuables to SHOW STATUS.
que0que.h:
Added thread lock states.
2004-12-24 12:13:32 +01:00
ingo@mysql.com
60e35755ef
WL#2126 - Multi_read_range.
...
Added the required structures and functions for
handing over multiple key ranges to the table handler.
2004-12-23 21:45:10 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
b1e30904d5
WL#925 - Privileges for stored routines
...
Implement fine-grained control over access to stored procedures
Privileges are cached (same way as existing table/column privs)
2004-12-23 10:46:24 +00:00
monty@mishka.local
4f4bbfc279
Merge with 4.1
2004-12-22 13:54:39 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
ecd85b1836
Bug#6481 - storage_engine system variable allows nonsensical value
...
Check that the requested storage engine is enabled.
2004-12-21 11:09:48 +00:00
mskold@mysql.com
4d384b61e4
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2004-12-20 14:13:41 +01:00
mskold@mysql.com
3edf243875
Condition pushdown to storage engine
2004-12-17 21:13:22 +01:00
kaa@polly.local
4644e54f8f
Merge akopytov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into polly.local:/home/kaa/src/mysql-5.0
2004-12-17 17:31:16 +03:00
kaa@polly.local
2ce0ad6d7e
Forward port of HugeTLB, InnoDB doublewrite and checksums patches to 5.0
2004-12-14 22:26:31 +03:00
sergefp@mysql.com
3c8f48d2e3
* Added comments and one assert
...
* Backport of safety measures from 5.0: make numeorous replaces:
s/item->fix_fields()/if (!item->fixed) item->fix_fields()
2004-12-14 03:36:19 +03:00
patg@patrick-galbraiths-computer.local
301c493252
First commit to mysql-5.0 tree to include MySQL Federated Storage Handler. This includes both the source and header files, test (results, test, require), and modifications to server and handler base files, and autoconf modifications to properly build federated handler.
2004-12-11 12:03:51 -08:00
dlenev@mysql.com
611abb882b
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg6765
2004-12-09 14:14:03 +03:00
monty@mysql.com
01e4740f4c
Ensure that we free memory used with --order-by-primary (in mysqldump)
...
Simple, non critical, fix to mysql_fix_privilege_tables
2004-12-09 12:47:20 +02:00
dlenev@mysql.com
62a6d9749b
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg6765
2004-12-09 13:33:12 +03:00