monty@mysql.com
75d0958dc3
After merge fixes
...
Fixed compiler warnings
Fix core dump when sending SIGHUP to mysqld
2004-12-06 17:15:54 +02:00
monty@mysql.com
0de4777187
Merge with 4.1
2004-12-06 11:38:56 +02:00
marko@hundin.mysql.fi
89996cd7ad
mysqld.cc:
...
innodb_autoextend_increment: set a maximum limit of 1000 (Bug #6904 )
2004-12-02 12:40:25 +02:00
brian@avenger.(none)
5e71b5b266
Merge avenger.(none):/export/brian/mysql/merge/4.1
...
into avenger.(none):/export/brian/mysql/merge/5.0
2004-11-30 12:51:59 -08:00
tomas@poseidon.ndb.mysql.com
900e507b14
fixed so that warning on missing support for engine only printed once even if option given multiple times
2004-11-30 20:51:57 +00:00
brian@avenger.(none)
b85f4677d5
Merge for Matt for Innodb bug.
2004-11-30 10:10:40 -08:00
tomas@poseidon.ndb.mysql.com
922c9146cd
use sql_print_warning instead of push_warning in mysqld.cc
2004-11-30 15:48:29 +00:00
tomas@poseidon.ndb.mysql.com
2d1458ea5b
mysqld.cc:
...
fixed erroneous previous push
2004-11-30 14:52:05 +00:00
tomas@poseidon.ndb.mysql.com
d209371a46
mysqld.cc:
...
fixed typo
2004-11-30 10:22:50 +00:00
tomas@poseidon.ndb.mysql.com
91aec87086
add warnings for INNODB,BDB,ISAM being unavailable if switch to use is supplied, i.e. --bdb,--isam,--innodb
2004-11-30 09:22:33 +00:00
tomas@poseidon.ndb.mysql.com
2d5711b8d5
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-30 08:41:59 +00:00
tomas@poseidon.ndb.mysql.com
f3e201886a
added use of mysql_cluster in mysqld (e.g. for ndb-connectstring)
...
added warning printout if --ndbcluster switch is given in a "non-cluster" binary
2004-11-30 08:41:16 +00:00
jani@a193-229-222-105.elisa-laajakaista.fi
57b30a1eef
Applied some patches for Netware.
2004-11-29 18:32:52 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
b09068f8a4
Applied some Netware related patches.
2004-11-29 17:41:47 +02:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
f595216869
Change sql_mode BROKEN_NOT to HIGH_NOT_PRECEDENCE
2004-11-27 19:26:46 +00:00
bell@sanja.is.com.ua
a1cac9687e
spelling fixed/comments added (postreview fixes)
2004-11-25 09:28:32 +02:00
serg@serg.mylan
508067420e
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-23 15:50:29 +01:00
wax@mysql.com
332269903b
Merge mysql.com:/home/wax/mysql/mysql-4.1
...
into mysql.com:/home/wax/mysql/mysql-4.1bug
2004-11-23 17:58:46 +05:00
wax@kishkin.ru
cfb82e9ef7
rename event_connect_request to smem_event_connect_request
2004-11-23 17:55:07 +05:00
serg@serg.mylan
2d3dd65cc1
merged
2004-11-20 18:36:41 +01:00
tomas@poseidon.ndb.mysql.com
eb11d34403
moved ndb_use_transactions out of opts and to be set default true in THD::init
2004-11-18 22:45:48 +00:00
petr@mysql.com
30789e7aa2
Merge mysql.com:/home/cps/mysql/trees/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/innotask/mysql-5.0-inno-final
2004-11-18 14:53:21 +03:00
petr@mysql.com
890211a7c4
WL 2059 Engine-specific status variables framework and WL 1922
...
InnoDB status variables
2004-11-18 13:00:42 +03:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
8c0d21d186
WL#638 - Fix precedence for parsing NOT ... LIKE expression s
...
Rework parser expression rules
Rework handling for "||" concat/or
Eliminate some shift/reduce conflicts
Add support for "xxx IS [ NOT ] truth_value"
2004-11-17 15:49:10 +00:00
tomas@poseidon.ndb.mysql.com
1700bf3844
Enabled usage of new system variables for ndb
...
- ndb_use_exact_count
- ndb_autoincrement_prefetch_sz
- ndb_use_transactions
- ndb_force_send
moved "inlined" functions to .cc file since they are virtual anyways
enabled printout od ndb errors in warnings even if mapping existst to mysql error code
2004-11-17 08:15:53 +00:00
bell@sanja.is.com.ua
d76db8b999
marge
2004-11-13 19:45:36 +02:00
monty@mysql.com
addd1a0da8
Merge with 4.1
2004-11-12 19:58:24 +02:00
monty@mysql.com
b56851fd7a
Merge on pull
2004-11-12 17:48:01 +02:00
bell@sanja.is.com.ua
1555469b64
merge
2004-11-12 15:36:31 +02:00
bell@sanja.is.com.ua
31f7811183
post-review fixes
2004-11-12 14:34:00 +02:00
monty@mysql.com
9252656d49
merge with 4.0
2004-11-12 11:17:53 +02:00
brian@avenger.(none)
f05daf02ba
Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)
2004-11-11 18:58:57 -08:00
ram@gw.mysql.r18.ru
1d967b8dcf
A fix (bug #6551 : UMASK_DIR & UMASK not taken into account (mysqld.cc my_init.c inconsistency)).
...
my_umask and my_umask_dir initialization has been moved to the my_init() func.
2004-11-11 12:35:55 +04:00
monty@mysql.com
c7e85ef9b9
More debugging
...
Print position in normal log for Binlog dump
2004-11-10 18:07:39 +02:00
monty@mysql.com
1087186657
Merge with 4.1 to get new thd->mem_root handling
2004-11-08 17:53:32 +02:00
monty@mysql.com
b903a129e2
Simpler arena swapping code
...
Now thd->mem_root is a pointer to thd->main_mem_root and THR_MALLOC is a pointer to thd->mem_root.
This gives us the following benefits:
- Allow us to easily detect if arena has already been swapped before (this fixes a bug in setup_conds() where arena was swaped twice in some cases)
- Faster swaps of arenas (as we don't have to copy the whole MEM_ROOT)
- We don't anymore have to call my_pthread_setspecific_ptr(THR_MALLOC,...) to change where memory is alloced. Now it's enough to set thd->mem_root
2004-11-08 01:13:54 +02:00
wax@kishkin.ru
618428d2e8
BUG#6056
...
fixed MySQL can't clean shutdown with --shared-memory
2004-11-04 19:45:31 +05:00
monty@mysql.com
071001950e
Merge with 4.1 to get in latest bug fixes
2004-11-04 15:06:24 +02:00
monty@mysql.com
7d3be517a4
Merge on pull
2004-11-03 13:01:38 +02:00
monty@mysql.com
8ba52759a3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-11-02 21:40:55 +02:00
monty@mysql.com
2185f1a56c
Remove usage of !$ from mysql-tests
...
Added protocol::flush() for easier embedded-server code
Increase block allocation variables a bit as they where a bit too small for MySQL 4.1
Added option --silent to client_test
2004-11-02 20:13:27 +02:00
rburnett@build.mysql.com
8b472a7605
Bug# 5303 Windows --log-error option doesn't work correctly
2004-11-02 18:18:21 +01:00
gluh@gluh.mysql.r18.ru
4c65a9447e
WL#1437 :don't create new users with GRANT
2004-11-02 17:45:26 +03:00
marko@hundin.mysql.fi
a3294186ec
mysqld.cc:
...
Describe innodb_max_purge_lag
Improve description of innodb_table_locks
2004-11-01 12:08:44 +02:00
monty@mysql.com
afbe601302
merge with 4.1
2004-10-29 19:26:52 +03:00
marko@hundin.mysql.fi
b5f49a3abd
Backport innodb_max_purge_lag from 4.1
2004-10-27 13:33:11 +03:00
bar@mysql.com
217d83a69f
Bug#6202: ENUMs are not case sensitive even if declared BINARY
2004-10-25 17:51:26 +05:00
monty@mysql.com
e1218474b8
Merge with 4.0
2004-10-20 16:24:28 +03:00
bell@sanja.is.com.ua
d409547de4
changed function name to prevent injection wrong code from 4.1 (WL#2133)
2004-10-20 16:06:54 +03:00
monty@mysql.com
b32ffec8fd
Fix test case for innodb-lock
2004-10-20 16:04:28 +03:00