gluh@mysql.com
d19c85199f
4.1->5.0 merge
2005-10-12 11:54:12 +05:00
jimw@mysql.com
c8a6c2c614
Fix wait_timeout (and kill) handling on Mac OS X by cleaning up how
...
signal handlers are set up, the blocking flags for sockets are set,
and which thread-related functions are used. (Bug #8731 )
2005-10-11 09:12:12 -07:00
gluh@eagle.intranet.mysql.r18.ru
8d01ea1be7
Fix for bug#9270 multiple SSL race conditions (for 5.0 tree)
...
The fix is needed to perform locking on shared data structures
This is modification of patch proposed by Leandro Santi
(see http://webs.sinectis.com.ar/lesanti/misc/mysql-4.0.23a-openssl_locking.patch )
2005-10-11 16:26:00 +05:00
jimw@mysql.com
083c032ec3
Fix minimum value of query_prealloc_size to be the same as its default. (Bug #13334 )
2005-10-10 19:39:16 -07:00
konstantin@mysql.com
2c7505b263
Remove protocol_cursor.cpp (no longer used) from sources
...
Fix a compile failure
2005-10-09 14:45:08 +04:00
serg@serg.mylan
e91712d9bb
pthread_handler_decl() changed to be ctags-friendly
...
(and contain extern "C" when necessary)
2005-10-08 16:39:55 +02:00
jani@ua141d10.elisa.omakaista.fi
4099872e2c
Fixed several boolean type options used in my_long_options[].
...
Some options were declared as 'bool', but since those are being
handled in my_getopt.c, bool can be machine dependent. To make
sure it works in all circumstances, the type should be my_bool
for C (not C++) programs.
2005-10-04 19:52:12 +03:00
msvensson@neptunus.(none)
cb96f195c8
Improved testing of ssl and compression
...
- Added show status variable "compression" for checking that compression is turned on.
- Updated show status variable "have_openssl" to be set to DISABLED if server supports ssl but it's not turned on to accept incoming ssl connections.
- Setup server to accept ssl connections from clients ig that is supported by server
- New tests
- ssl - Run with ssl turned on
- ssl_compress - Run with ssl and compression turned on
- compress - Run with compression turned in
- Updated test
- openssl_1, rpl_openssl1 - Changed to run if server supports ssl
2005-10-04 15:43:55 +02:00
bell@sanja.is.com.ua
6caa0c849d
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
2005-10-04 07:51:53 +03:00
kent@mysql.com
656b0cc15a
Merge
2005-09-29 03:20:31 +02:00
kent@mysql.com
844d964f2d
Many files:
...
Prefix regex functions/types with "my_" as our
library is not compatible with normal regex lib.
my_regex.h:
Rename: regex/regex.h -> regex/my_regex.h
2005-09-29 02:08:24 +02:00
sergefp@mysql.com
9a05a887de
Manually merged
2005-09-24 02:39:52 +04:00
sergefp@mysql.com
d90b988da7
BUG#12232: Addressing docs team feedback: s/inequal/unequal/
2005-09-24 01:39:50 +04:00
paul@kite-hub.kitebird.com
67a643f931
mysqld.cc:
...
Fix out-of-order status variable.
2005-09-23 15:59:32 -05:00
paul@kite-hub.kitebird.com
b83f29d56d
mysqld.cc:
...
Fix out-of-order status variable.
2005-09-23 14:14:34 -05:00
dlenev@mysql.com
19b2cd58e8
Fix for yet another compilation failure on Windows which was introduced during
...
work on WL#2787 "Add view definer/owner to the view definition (.frm) to check
privileges on used tables and stored routines when using a VIEW."
(aka bug #13402 "Windows VS 2003 Compiler error")
2005-09-23 21:28:47 +04:00
dlenev@mysql.com
87dcb3c6f5
Fix for bug #13407 "Remote connecting crashes server" and couple of similar
...
problems which were introduced during work on WL#2787 "Add view definer/owner
to the view definition (.frm) to check privileges on used tables and stored
routines when using a VIEW."
In some cases it is better to use value from Security_context::host_or_ip
instead of value from Security_context::host since the latter can be NULL
in certain situations (When we can't resolve hostname or we have not done
this yet).
2005-09-22 23:03:53 +04: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
3b41e3362b
aftermerge fix
2005-09-21 17:38:26 +02:00
jonas@perch.ndb.mysql.com
d1ee898d34
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-21 14:39:28 +02:00
serg@serg.mylan
a083ff160e
merged
2005-09-21 13:53:22 +02:00
jonas@perch.ndb.mysql.com
f35c49f748
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-21 13:22:59 +02:00
sergefp@mysql.com
a26e1b7280
Merge mysql.com:/home/psergey/bk-trees/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-csc6030-r3
2005-09-21 02:20:55 +04: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
c1b185f5ff
WL#2787 (Add view definer/owner to the view definition (.frm) to check privileges on used tables and stored routines when using a VIEW.)
...
Part 2 postreview fixes.
2005-09-20 21:20:38 +03:00
jonas@perch.ndb.mysql.com
2119a88abe
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2005-09-20 10:46:33 +02:00
jonas@perch.ndb.mysql.com
668a192ce5
ndb - imlp. show engine ndb status;
...
that dump free list allocation per connection
2005-09-19 15:35:07 +02: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
ingo@mysql.com
18cb2e8388
Merge mysql.com:/home/mydev/mysql-4.1-4100
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-09-14 13:37:16 +02:00
ingo@mysql.com
6e725adc00
Bug#12920 - key_read_requests counter appears to re-set
...
After merge fix.
2005-09-14 13:18:16 +02:00
ingo@mysql.com
7314307762
Bug#12920 - key_read_requests counter appears to re-set
...
Enlarged the counter variables to ulonglong.
2005-09-14 09:56:49 +02:00
bell@sanja.is.com.ua
613c267cb0
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-mrg-5.0
2005-09-06 21:20:19 +03:00
bell@sanja.is.com.ua
167bc61f37
postmerge fix
2005-09-06 21:18:44 +03:00
bar@mysql.com
c71b5f4db6
mysqld.cc:
...
after merge fix
2005-09-06 15:23:03 +05:00
bar@mysql.com
51d0e0bc30
Merge mysql.com:/usr/home/bar/mysql-4.1.b9948
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-09-06 14:35:36 +05:00
bell@sanja.is.com.ua
10c0ef69e7
support of concurent query cache resizing (BUG#12848)
2005-09-06 11:16:53 +03:00
bar@mysql.com
6a5f00702d
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b9948
2005-09-05 20:05:32 +05:00
bar@mysql.com
0eafb9572a
mysqld.cc, mysql_priv.h, sql_parse.cc:
...
bug#9948
changed client-charset behavior in 4.1.x libmysql, which issue BC prob
after review fixes
2005-09-05 20:00:11 +05:00
dlenev@mysql.com
d23732962f
Merge mysql.com:/home/dlenev/src/mysql-4.1-bg12423
...
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-09-01 23:25:29 +04:00
dlenev@mysql.com
0683c122b6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg12423
2005-09-01 17:01:25 +04:00
dlenev@mysql.com
da2af0bb6d
Fix for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in
...
multi-threaded environment".
To avoid deadlocks between several simultaneously run account management
commands (particularly between FLUSH PRIVILEGES/SET PASSWORD and GRANT
commands) we should always take table and internal locks during their
execution in the same order. In other words we should first open and lock
privilege tables and only then obtain acl_cache::lock/LOCK_grant locks.
2005-09-01 16:52:59 +04:00
bar@mysql.com
f2ea1ac8b8
bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC prob
...
sql_parse.cc:
mysqld.cc:
Added --skip-client-character-set-handshake.
When this option is activated, client side character set
(which is sent in handshake) is ignored, and server side
default-character-set value is used for character_set_client
and character_set_results, thus reprodicing 4.0 behaviour.
2005-08-31 13:03:24 +05:00
paul@kite-hub.kitebird.com
16e879e837
mysqld.cc:
...
Reorder out-of-order status variables
2005-08-30 13:16:40 -05:00
paul@kite-hub.kitebird.com
19af7f8973
Manual merge.
2005-08-30 12:12:12 -05:00
paul@frost.snake.net
351c59cb5f
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0
2005-08-27 22:00:22 -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
848853ea5b
mysqld.cc:
...
Reorder out-of-order status variables.
2005-08-27 21:04:58 -05:00
paul@frost.snake.net
458bc88563
mysqld.cc:
...
Reorder out-of-order status variables.
2005-08-27 19:18:53 -05:00
jani@a193-229-222-105.elisa-laajakaista.fi
e767eb330e
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-08-25 12:08:26 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
fe977b0cd0
Several fixes for Netware.
2005-08-24 22:03:34 +03:00
patg@radha.local
7a43a0f54d
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into radha.local:/Users/patg/mysql-build/mysql-4.1.clean
2005-08-19 23:44:40 +02:00
patg@radha.local
d0767dfad3
BUG #12498 Fixed mispelling
2005-08-19 07:51:22 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
c6ee26ab45
Some minor fixes for Netware. These were required after we started building
...
against a later version of libc.
2005-08-18 21:26:25 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
3bfa514655
Changes for Netware. This is needed when building against newer Libc
...
than we've used before.
2005-08-18 21:22:35 +03:00
jimw@mysql.com
df25928983
Merge mysql.com:/home/jimw/my/mysql-4.1-11796
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-15 09:59:11 -07:00
jimw@mysql.com
d6a8330e39
Avoid problems on shutdown by shutting down replication slave threads
...
after normal connection threads. (Bug #11796 )
2005-08-08 18:05:27 -07:00
hf@deer.(none)
39ef54fd8e
Fix for bug #12177 (errorlog file isn't closed)
...
4.1 version of the patch
2005-08-04 15:23:21 +05:00
hf@deer.(none)
a776edbed1
Fix for bug #11329 (lowercase_table.test fails)
2005-07-26 20:59:43 +05:00
monty@mishka.local
7e83d09ce7
Simple fixes during review of new code
2005-07-19 19:25:05 +03:00
gbichot@production.mysql.com
7cd2fb13ff
Fix for BUG#12003 "assertion failure in testsuite (double lock of
...
LOCK_thread_count)" and for BUG#12004 "SHOW BINARY LOGS reports 0
for the size of all binlogs but the current one".
There are a lot of 4.1->5.0 unmerged changes (hardest are in the optimizer), can't merge; still pushing in 4.1 because my changes
are very small. Feel free to ask me if you have problems merging them.
2005-07-18 14:46:53 +02:00
reggie@linux.site
65a1d74fb1
added a comment referring to the bug report
2005-07-15 03:51:55 -06:00
reggie@linux.site
adfa1a2596
Bug #7403 error "Forcing close of thread 1 user: 'xxx'"
...
The problem was that on Windows, the socket was in a blocking state
trying to read. Setting killed=1 is not enough to break the
socket out of it's read loop. You have to cancel the read request
or close the socket (which close_connection does).
2005-07-14 06:04:29 -06:00
jani@ua141d10.elisa.omakaista.fi
b60175f9c4
Fixed Bug#11226 and reverted fix for Bug#6993.
...
Using 8 bytes for data pointer does not work at least on
all computers. The result may become 0 or negative number.
(mysqld, myisamchk)
2005-06-30 16:13:22 +03:00
monty@mishka.local
1524cd001d
Cleanup during review of new code
...
Fixed wrong allocation that could cause buffer overrun when using join cache
2005-06-21 18:18:58 +03:00
konstantin@mysql.com
dcb0e65dcb
Fix Bug#9334 "PS API queries in log file" and
...
Bug#8367 "low log doesn't gives complete information about prepared
statements"
Implement status variables for prepared statements commands (a port of
the patch by Andrey Hristov).
See details in comments to the changed files.
No test case as there is no way to test slow log/general log in
mysqltest.
2005-06-17 00:11:48 +04:00
konstantin@mysql.com
f10b395982
A fix for Bug#9141 "4.1 does not log into slow log
...
ALTER, OPTIMIZE and ANALYZE statements".
In 4.1 we disabled logging of slow admin statements. The fix adds an
option to enable it back.
No test case (slow log is not tested in the test suite), but tested
manually.
+ post-review fixes (word police mainly).
2005-06-16 23:05:38 +04:00
jimw@mysql.com
495ee34be0
Fix problem with handling of lower_case_table_name == 2 when
...
the case in the FROM and WHERE clauses didn't agree. (Bug #9500 )
2005-06-08 14:35:16 -07:00
monty@mysql.com
29fd1f2fd9
Move USE_PRAGMA_IMPLEMENTATION to proper place
...
Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable
2005-06-03 23:46:03 +03:00
brian@zim.(none)
ba9b9f8993
Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed a number of dumb things in ha_tina.
2005-06-01 17:34:10 -07:00
gluh@mysql.com
665cbabe07
Bug #5843 : Server code does not check whether PID file was successfully written
2005-05-05 12:24:10 +05:00
monty@mysql.com
3ca23bd918
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-04-26 21:09:42 +03:00
monty@mysql.com
220a01a838
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-04-26 16:03:20 +03:00
jimw@mysql.com
93ff028f9d
Fix compile issues in Intel C/C++ compiler (Bug #9063 )
2005-04-25 18:02:03 -07:00
monty@mishka.local
8d919770c7
Fixed core dump with long timezone names
...
Don't abort on bootstrap if a wrong --default-storage-engine is specified
2005-04-16 03:40:33 +03:00
jimw@mysql.com
ab939dce27
Merge mysql.com:/home/jimw/my/mysql-4.1-9833
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-15 11:52:58 -07:00
jimw@mysql.com
6632ed5ce7
Check that the default storage engine is really available, and
...
refuse to start up if it is not. (Bug #9815 )
2005-04-13 18:25:31 -07:00
jimw@mysql.com
47ab7c8785
Don't allow the server to start up when an invalid user is
...
specified via --user or in configuration. (Bug #9833 )
2005-04-13 15:43:29 -07:00
mskold@mysql.com
e39ba63934
Merge
2005-04-13 14:08:54 +02:00
mskold@mysql.com
f5855f2d57
Fix for bug#9813: Test 'ndb_basic': Autoincrement fails in 64 bit
2005-04-13 12:42:23 +02:00
reggie@mdk10.(none)
3f5b8b976c
Bug #9665 After registering MySQL service and starting with shared mem, cannot stop
...
Removed the extra set of the shared memory connect event from kill_mysql since it is also being set in kill_server
2005-04-08 09:17:19 -05:00
reggie@mdk10.(none)
c55a7b651f
Bug #9665 After registering MySQL service and starting with shared mem, cannot stop
...
The shared memory connect event was not being set in kill_server.
This caused the thread that is handling shared memory connections to never
exit.
2005-04-08 00:16:02 -05:00
monty@mysql.com
b9fdb65b18
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-04-06 15:53:32 +03:00
monty@mysql.com
6483a71e82
Fixed that create_time is set properly for cached threads
2005-04-06 15:52:32 +03:00
jimw@mysql.com
9e16f12145
Fix handling of max_allowed_packet and net_buffer_length in
...
embedded server when a size suffix (K, M, G) is added. (Bug #9472 )
2005-04-01 16:09:20 -08:00
konstantin@mysql.com
2115900460
Remove redundant my_security_attr_free() from
...
handle_connections_shared_memory (double free spotted by Monty).
2005-03-29 14:30:34 +04:00
konstantin@mysql.com
ff8017f0d3
A fix for Bug#8226 "Cannot connect via shared memory":
...
provide created shared memory objects with proper
access rights to make them usable when client and server
are running under different accounts.
Post review fixes.
2005-03-26 01:21:52 +03:00
brian@zim.(none)
6e2caeb0ce
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-4.1
2005-03-24 16:08:48 -08:00
msvensson@neptunus.(none)
c4a698ea3e
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-24 12:21:55 +01:00
gbichot@quadita2.mysql.com
19499229ed
"After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication":
...
s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late);
no message on error log (deadlock is too common sometimes), a global counter
instead (SHOW STATUS LIKE 'slave_retried_transactions').
Plus a fix for libmysql/Makefile.shared
2005-03-23 19:19:36 +01:00
brian@zim.(none)
cfcedd85cd
Additional storage engine called "blackhole". Customer request, and for that matter a Zawodny request. With this you can alter table to a type of table that would never store data. Its a /dev/null for a database.
2005-03-22 16:10:39 -08:00
msvensson@neptunus.(none)
a5bb4810ff
BUG#9072 'Max_error_count' system variable cannot be set to zero
...
- Chaned min value in mysqld.cc
- Added testcase to warnings.test
2005-03-21 11:07:31 +01:00
serg@serg.mylan
6121422820
sql/mysqld.cc
...
preserve backward compatibility
2005-03-09 13:41:57 +01:00
marko@hundin.mysql.fi
fa001505e3
mysqld.cc:
...
main(): add missing parameter to printf(ER(ER_READY),...) call
2005-03-08 22:33:11 +02:00
serg@serg.mylan
2472810489
Fixed crash if max_connections is exceeded. BUG#8996
2005-03-07 13:59:28 +01:00
ingo@mysql.com
b5775ee16c
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-03-04 09:35:21 +01:00
serg@serg.mylan
08d5ef6507
typos fixed
2005-03-03 23:10:23 +01:00
serg@serg.mylan
e47d0a0e2d
merge
2005-03-03 23:07:20 +01:00
serg@serg.mylan
8d9a53a78c
Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)
2005-03-03 19:51:29 +01:00
guilhem@mysql.com
c6f1a2e453
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-03-02 11:38:38 +01:00
guilhem@mysql.com
11a1c83c03
Fix for BUG#8325 "Deadlock in replication thread stops replication":
...
in slave SQL thread: if a transaction fails because of InnoDB deadlock or innodb_lock_wait_timeout exceeded,
optionally retry the transaction a certain number of times (new variable --slave_transaction_retries).
2005-03-02 11:29:48 +01:00
jani@ua141d10.elisa.omakaista.fi
530b12166e
Fixed Bug#7906, "Cmdline help for mysqld --ansi option misses some info".
2005-03-01 14:13:25 +02:00
monty@mysql.com
253bfcf783
Fixed wrong memory references found by purify
...
(No really critical errors found, but a few possible wrong results)
2005-02-28 11:59:46 +02:00
jimw@mysql.com
df3c8db4f3
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-22 13:14:49 -08:00
lars@mysql.com
2d1089e8c1
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1
2005-02-22 13:22:34 +01:00
lars@mysql.com
1d3c67000b
BUG#6662: Changes after Guilhems and Sergs review
2005-02-22 12:40:31 +01:00
lars@mysql.com
be28ef0a20
BUG#6662: Importing mysqldumps should not show any warnings of level "notes".
2005-02-21 18:40:28 +01:00
jimw@mysql.com
793a505c26
Fix merge of fix for Bug #4872 .
2005-02-18 15:02:54 -08:00
hf@deer.(none)
93e0107050
Fix for the bug #7344 (multiple server_init/server_end lead to crash)
...
Some variable wasn't moved to the initial state during mysql_server_end
2005-02-18 15:51:55 +04:00
jimw@mysql.com
9df24e5ebd
When calling initgroups(), set a flag that the segfault handler checks
...
in order to output a special warning about a particular case of segfaults
due to a mix of static binaries, NSS, and LDAP. (Bug #4872 )
2005-02-16 11:58:35 -08:00
jani@ua141d10.elisa.omakaista.fi
1c2f4ffecb
Applied a patch for Netware.
2005-02-08 19:49:40 +02:00
serg@serg.mylan
33fc4b10b6
configure.in
...
don't define UNIV_DEBUG in CFLAGS/CXXFLAGS anymore
sql/mysqld.cc
hide from the user options that do nothing
sql/sql_update.cc
better fix for uninitialized used_index
2005-02-02 12:08:20 +01:00
heikki@hundin.mysql.fi
61a0e57cd0
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-01-27 21:33:15 +02:00
ram@gw.mysql.r18.ru
7f6fca4cf0
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2005-01-26 17:09:38 +04:00
heikki@hundin.mysql.fi
9a6e0d06e0
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-01-25 22:12:22 +02:00
heikki@hundin.mysql.fi
d7e5c4d617
sql_class.h, set_var.cc, mysqld.cc:
...
Add settable variables for semi-sync replication
2005-01-25 22:11:21 +02:00
monty@mysql.com
37168015cd
Cleanups during review
2005-01-25 21:27:51 +02:00
marko@hundin.mysql.fi
638e2bd733
InnoDB: Backport innodb_autoextend_increment from 4.1
2005-01-25 16:27:13 +02:00
jimw@mysql.com
09aaba03cf
Merge mysql.com:/home/jimw/my/mysql-4.1-7887
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-24 12:47:19 -08:00
jimw@mysql.com
fa1098618e
Set lower_case_file_system when it is being tested to check if
...
lower_case_tables_names=2 is sensible. Related to Bug #7887 .
2005-01-24 12:31:14 -08:00
ram@gw.mysql.r18.ru
5432e8a3d7
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2005-01-24 13:47:52 +04:00
ram@gw.mysql.r18.ru
0bf3ae74b6
A fix (Bug #8015 : server refuses to start with long basedir path).
2005-01-21 17:51:24 +04:00
jimw@mysql.com
3bdfe44859
Warn when mysqld starts up with lower_case_table_names=2 but datadir is
...
on a case-sensitive filesystem. (Bug #7887 )
2005-01-19 12:23:24 -08: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
serg@serg.mylan
e83f49bd2f
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-01-12 12:35:34 +01:00
serg@serg.mylan
b86a512e37
added missing Com_update_multi status variable
2005-01-12 12:18:17 +01:00
guilhem@mysql.com
60f5a69160
2 small fixes for binlog (sorry for grouping them - I won't do it again):
...
WL#2335 (wait if binlog or binlog index file hits disk full or quota exceeded),
fix for BUG#7236 ("--expire_logs_days does not apply if all statements
happen in transactions"), and a behaviour change: abort if mysqld can't start
binlog at startup (if running with --log-bin of course).
2005-01-06 23:53:58 +01:00
ram@gw.mysql.r18.ru
238249570b
merge
2004-12-27 13:26:03 +04:00
ram@gw.mysql.r18.ru
45bd5ee6f4
A fix (bug #5652 : [patch] tcpwrapper support is broken on systems using an unmodified tcpwrapper).
2004-12-24 18:52:24 +04:00
wax@kishkin.ru
4788b15201
fix indentation
...
add space after comma
add space after equal
add comments in vio_close_shared_memory()
2004-12-23 16:04:40 +05:00
wax@mysql.com
a3e73fc673
Merge mysql.com:/home/wax/mysql/mysql-4.1
...
into mysql.com:/home/wax/mysql/mysql-4.1smemory
2004-12-23 14:44:21 +05:00
tomas@poseidon.ndb.mysql.com
09dccee098
changed name of g_eventLogger so it can be used in TransporterRegistry and is the same as in the kernel
2004-12-22 16:29:01 +01:00
tomas@poseidon.ndb.mysql.com
7b47be8990
added config parameter Group on connection
...
moved NdbWaiter, m_ndb_cluster_connection, to impl class
moved node selection things to cluster connection
moved all private things to impl class
added opts for shared memory and node selection
changed opts handling somewhat; introduced enum for options and common handling of option variables
added checks for transporter support
automatic addition of shared mem transporters
moved wait_until_ready code to cluster connection
added control of usage of new node selection method
2004-12-20 12:36:14 +01:00
wax@kishkin.ru
0c8a78cca1
BUG#6056
...
(continue)
added event_conn_closed
replaced WaitForSingleObject on WaitForMultipleObjects
inserted a check in vio_close()
added SetEvent() for event_conn_closed
2004-12-14 19:24:19 +05:00
guilhem@mysql.com
6c209125b7
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-12-13 15:21:50 +01:00
guilhem@mysql.com
de968efaf3
correcting --expire_logs_days description in mysqld --help
2004-12-13 15:10:54 +01: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
dlenev@brandersnatch.localdomain
4b0882e0a6
Fix for bug #6765 "Implicit access to time zone description
...
tables requires privileges for them if some table or column level grants
present" (with after-review fixes).
We should set SELECT_ACL for implicitly opened tables in
my_tz_check_n_skip_implicit_tables() to be able to bypass privilege
checking in check_grant(). Also we should exclude those tables from
privilege checking in multi-update.
2004-12-09 13:31:46 +03:00
ram@gw.mysql.r18.ru
f449ba85e8
A fix (bug #6993 : Max myisam_data_pointer_size limited to 7).
2004-12-07 14:51:13 +04: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
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
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
b09068f8a4
Applied some Netware related patches.
2004-11-29 17:41:47 +02: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
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