mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
35680 commits 2784 branches 343 tags 1.6 GiB
Commit graph

1473 commits

Author SHA1 Message Date
jimw@mysql.com
c3efdc92e7 Fix compile using libwrap with gcc 4.0.2. (Bug #12570) 2005-11-01 11:08:20 -08:00
msvensson@neptunus.(none)
be6f7a3f82 Merge neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-10-28 11:00:54 +02:00
jani@ua141d10.elisa.omakaista.fi
cbe21a8eb6 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
 2005-10-27 23:43:20 +03:00
SergeyV@selena.
0eacb6fb35 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  selena.:H:/MYSQL/src/#14137-mysql-5.0
 2005-10-26 19:05:02 +04:00
SergeyV@selena.
14e90138e5 Formatting change for #14137 patch. 2005-10-26 17:45:30 +04:00
SergeyV@selena.
ba919bd168 Fixes bug #14137. Converts charsets_dir path to underlying 
system representation.
 2005-10-24 20:08:56 +04:00
sasha@asksasha.com
f6f22df951 fix for BUG#12974: mysqld segfaults when depreciated option --sql-bin-update-same is used 2005-10-22 18:17:11 -06:00
sergefp@mysql.com
ea3ea9ed10 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-nulls-stats-r2
 2005-10-23 02:49:57 +04:00
sergefp@mysql.com
15a78334c3 BUG#9622, stage 2, work together with fix for BUG#12232: 
added "nulls_ignored" index statistics collection method for MyISAM tables.
(notification trigger: this is about BUG#9622).
 2005-10-21 06:29:17 +04:00
jimw@mysql.com
2c90e2f7a6 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-10-19 13:47:05 -07:00
sergefp@mysql.com
e7065d355c BUG#121915: Merge 4.1->5.0 2005-10-19 01:52:06 +04:00
jimw@mysql.com
e284a57c88 Merge mysql.com:/home/jimw/my/mysql-4.1-13334 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-18 09:45:12 -07:00
pem@mysql.com
ddc36a2784 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/bug7049/mysql-5.0
 2005-10-17 15:12:38 +02:00
pem@mysql.com
e585315703 Additional fix for BUG#7049, after review. 
Make sure "select" aborts when finding a SP condition handler beyond the current scope.
 2005-10-17 15:07:47 +02:00
guilhem@mysql.com
845b9fbf58 fix for Valgrind errors: query_id needs to be inited early (already fixed in 5.0 by Konstantin) and so does client_capabilities (not fixed in 5.0); 
because they are used by net_printf() and push_warning(), which can be called if check_connection() fails.
 2005-10-14 15:34:52 +02:00
jani@ua141d10.elisa.omakaista.fi
2dd1e4f94e Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2005-10-13 18:23:53 +03:00
jimw@mysql.com
cb0d8aba46 Merge mysql.com:/home/jimw/my/mysql-4.1-8731b 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 13:28:46 -07:00
msvensson@neptunus.(none)
7d29c2a4a1 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
 2005-10-12 13:59:00 +02:00
msvensson@neptunus.(none)
0ac28d3187 Always test ssl and compress 
- Updated after review
 2005-10-12 13:56:07 +02:00
gluh@eagle.intranet.mysql.r18.ru
4b2a0f0c70 after merge fix 2005-10-12 13:18:46 +05:00
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
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
monty@mysql.com
b56851fd7a Merge on pull 2004-11-12 17:48:01 +02:00
monty@mysql.com
9252656d49 merge with 4.0 2004-11-12 11:17:53 +02: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
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
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
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
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
monty@mysql.com
b32ffec8fd Fix test case for innodb-lock 2004-10-20 16:04:28 +03:00
monty@mysql.com
1f8b3d0f22 Code cleanups (done during review of new code) 
Rename innodb_table_locks_old_behavior -> innodb_table_locks
Set innodb_table_locks to off by default to get same behaviour as in MySQL 4.0.20
(This means that Innodb ignore table locks by default, which makes it easier to combine MyISAM and InnoDB to simulate a transaction)
 2004-10-20 11:24:08 +03:00
monty@mishka.local
04c23808a8 Review of all code pushed since last review 
Simple optimzations and cleanups
Removed compiler warnings and fixed portability issues
Added client functions 'mysql_embedded()' to allow client to check if we are using embedded server
Fixes for purify
 2004-10-20 01:28:42 +03:00
dellis@goetia.(none)
34e5df0d36 Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0 
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.0
 2004-10-17 18:47:08 -05:00
dellis@goetia.(none)
b9509655a5 mysqld.cc: 
BUG #5731 key_buffer_size not properly restricted to 4GB; use UINT_MAX32 for clarity.
 2004-10-17 18:44:51 -05:00
marko@hundin.mysql.fi
edb93ca441 Added startup option and settable session variable 
innodb_table_locks_old_behavior: do not acquire an
InnoDB table lock for LOCK TABLES, as in mysql-4.0.18
and earlier.
 2004-10-13 22:54:21 +03:00
monty@mysql.com
546c2bd6ab Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-10-07 12:37:21 +03:00
monty@mysql.com
6239edc1d1 After merge fixes 
Some bigger code changes was necessary becasue of the multi-table-update and the new HANDLER code
 2004-10-07 10:50:13 +03:00
rburnett@build.mysql.com
4a01f3030b Enabled the writing of a pid file on Windows. 
mysqld.cc:
  Added call to create_pid_file to start_signal_handler on windows.  Also removed the #ifndef WINDOWS from two calls that deletes the pid file
 2004-10-06 21:46:44 +02:00
monty@mysql.com
62f3cd6a31 Merge with 4.0 for 4.1 release 
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
 2004-10-06 19:14:33 +03:00
dellis@goetia.(none)
634df1c19c mysqld.cc: 
BUG #5731 Restrict key_buffer_size to 4GB on 64 bit platforms
 2004-10-03 10:00:26 -05:00
joerg@mysql.com
b7f35f00cb Solve compile problem for 4.0.22 on hpita2. (Backport of a 4.1 change) 2004-09-30 19:05:33 +02:00
marko@hundin.mysql.fi
1bd65d7715 InnoDB: implement innodb_max_purge_lag 2004-09-30 15:54:19 +03:00
marko@hundin.mysql.fi
9f92688b64 Made innodb_autoextend_increment accessible as a global variable. 2004-09-30 12:31:41 +03:00
guilhem@mysql.com
53d0daa3a0 Fix for BUG#3248 "Doc says MyISAM warns if disk full but it does not": 
we force the message to the error log, and we make it more informative;
we treat EDQUOT like ENOSPC.
 2004-09-24 11:54:37 +02:00
marko@hundin.mysql.fi
a660499cd9 Merge marko@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/j/mysql-4.1
 2004-09-16 19:09:38 +03:00
joerg@mysql.com
563c556694 Replace 'sete_id(__)' calls by 'setre_id(-1,__)' to solve the 
missing prototyped problem (bug#5521).
 2004-09-13 16:32:47 +02:00
ram@gw.mysql.r18.ru
0cb0ae35b6 After merge fix. 2004-09-08 17:38:57 +05:00
marko@hundin.mysql.fi
934a5c0b99 InnoDB: Add configuration option innodb_autoextend_increment 2004-09-07 16:26:38 +03:00
serg@serg.mylan
413a8753e2 merged 2004-09-07 15:18:53 +02:00
monty@mysql.com
9d8555c0f0 Merge with 4.0 to get latest bug fixes 2004-09-04 15:59:49 +03:00
ram@gw.mysql.r18.ru
3c85a363e5 A fix (bug #2631: mlockall called after dropping root permissions). 2004-09-03 19:26:11 +05:00
miguel@hegel.txg.br
fc11887596 Fix for bug #5302 2004-09-02 01:17:28 -03:00
miguel@hegel.txg.br
ca42de54a1 Fix for bug #5302 2004-09-01 14:02:11 -03:00
monty@mysql.com
054cea4ca8 Merge with 4.0 2004-09-01 04:12:09 +03:00
ram@gw.mysql.r18.ru
b93a973b12 Added global my_getopt_error_reporter function pointer which is 
used in the handle_options() function (instead of using additional 
handle_option() parameter). The default value of the 
my_getopt_error_reporter is default_reporter(). One can set it to
other functions if case of need.
 2004-08-31 21:27:58 +05:00
serg@serg.mylan
49d49e2fcb Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-30 16:32:10 +02:00
serg@serg.mylan
b60713c033 bug in my_strnncoll_utf8 (and friends) fixed 
cleanups
better, charset-dependent, ft_max_len_for_sort value
 2004-08-30 08:37:36 +02:00
paul@ice.snake.net
34dc3a86df Minor edits to error messsage. 2004-08-28 13:07:47 -05:00
monty@mysql.com
f574cd4e8f Code style fixes. 
Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options()
 2004-08-28 00:49:54 +03:00
serg@serg.mylan
b4bb38e896 merged 2004-08-26 15:19:46 +02:00
rburnett@build.mysql.com
52a973c5ff Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into build.mysql.com:/users/rburnett/mysql-4.0
 2004-08-25 06:39:19 +02:00
serg@serg.mylan
8f2d92c56a manually merged 2004-08-24 17:24:23 +02:00
paul@kite-hub.kitebird.com
917aa465e2 mysqld.cc: 
System variable names use underscores, not dashes.
  Alphabetize variables in option struct for help message.

(will wait for okay to push)
 2004-08-23 14:30:55 -05:00
tomas@poseidon.(none)
b8dfb7eaf1 reverted default setting of --ndbcluster if --ndb-connectstring is given 2004-08-23 15:12:38 +00:00
pem@mysql.com
66a3f65d98 Fixed: BUG#5135: cannot turn on log_warnings with SET in 4.1 (and 4.0) 2004-08-23 15:29:55 +02:00
tomas@poseidon.(none)
efac41149c small ndb switch fix 2004-08-23 09:15:42 +00:00
tomas@poseidon.(none)
552d841be2 stylistic fixes 2004-08-23 08:42:31 +00:00
tomas@poseidon.(none)
05853d95de Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1
 2004-08-23 07:33:40 +00:00
paul@ice.snake.net
71a57bbeb7 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
 2004-08-20 13:10:05 -05:00
tomas@poseidon.(none)
91b352377c added switch to mysqld to specify connectstring 2004-08-20 16:10:47 +00:00
paul@ice.snake.net
ab52a9d87a Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
 2004-08-19 15:10:19 -05:00
rburnett@build.mysql.com
eb04e6da07 Bug #4466 Nothing in .err when mysql service ends because of malformed my.ini options 
mysqld.cc:
  Changed LOGLEVEL enum to loglevel
mysql_priv.h, log.cc:
  Changed LOGLEVEL to loglevel.  Removed startup_ from some of the DBUG_ENTER macros. Removed the print_msg_to_log function as it was unused.
my_getopt.c, my_getopt.h:
  Renamed LOGLEVEL to loglevel to match coding standards
 2004-08-19 17:56:32 +02:00
hf@deer.(none)
c43d7d92dd Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.emb
 2004-08-19 15:47:09 +05:00
paul@ice.snake.net
d08183d648 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
 2004-08-18 18:42:01 -05:00
rburnett@build.mysql.com
a22cdab9e9 BUG# 4466 - Nothing in .err when mysql service ends because of malformed my.ini options 
mysqld.cc:
  Changed option_error_reporter to match new function header that includes LOGLEVEL enum
mysql_priv.h:
  Removed the MY_ERROR style bitmask.  Changed function headers to use new LOGLEVEL enum
log.cc:
  Changed print_buffer_to_log to print_buffer_to_file.  Remove the timestamp bool and now all log entries written to stderr are timestamped.  Removed some unused commented code.  changed to use the new LOGLEVEL enum.  
my_getopt.c:
  Changed functions to use the new LOGLEVEL enum and changed the included error reporter to be default_reporter.  This reporter is used in handle_options if a reporter is not given
my_getopt.h:
  changed typedefs to use better naming convention.  Moved error bitmask into the LOGLEVEL enum and included it here.
 2004-08-18 22:31:01 +02:00
serg@serg.mylan
e1237cbc53 manually merged 2004-08-18 19:57:55 +02:00
heikki@hundin.mysql.fi
6feb6ea545 srv0start.c, ut0mem.c, ut0dbg.c, ut0dbg.h, srv0start.h: 
Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
mysqld.cc, ha_innodb.cc:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
 2004-08-18 01:48:01 +03:00
sergefp@mysql.com
83dc887b9d Renamed Arg_comparator::compare_int -> compare_int_signed 2004-08-18 02:37:31 +04:00
paul@ice.snake.net
3ee1d0201c Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
 2004-08-13 22:43:26 -05:00
rburnett@build.mysql.com
67003d1c98 mysql_priv.h: 
Added declarations for print_msg_to_log and vprint_msg_to_log.  sql_print_error are simple functions that wrap calls to print_msg_to_log.  Define the different error types with MY_ERROR_TYPE, MY_WARNING_TYPE, and MY_INFORMATION_TYPE
gen_lex_hash.cc:
  Added NULL error reporting parameter to handle_options
log.cc:
  Add print_msg_to_log, print_buffer_to_log, and vprint_msg_to_log.  Print_msg_to_log will write the message to the windows event log if on NT.  We now have error, warning, and information versions of sql_print_xxxx.  T his is a variation of a similar changeset WAX did.
mysqld.cc:
  Added option_error_reporter callback function and pass that into handle_options
mysql.cc:
  Added NULL as error reporter arg to the end of handle_options
Many files:
  Added NULL error reporter parameter as the last paramter to handle_options
my_getopt.c:
  Added second function pointer to server as an error reporting callback.  Added local function report_option_error that will either write the error to stderr or to the error reporting callback.  changed all calls in handle_options from fprintf(stderr, ... ) to report_option_error
my_getopt.h:
  Changed declaration of handle_options to use typedefs for the two function pointers.  added second function pointer to server as an error reporting callback
mysqld.dsp:
  Added custom build step for compiling message file and added message resource file (output of mc)
 2004-08-14 03:38:37 +02:00
brian@avenger.(none)
b7b48d6764 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into avenger.(none):/export/brian/tina-4.1
 2004-08-13 16:27:17 -07:00
guilhem@mysql.com
c9a46a43d2 Escaping [] so that darwin[7-8] gets into 'configure' and not darwin7-8 
Adding a compilation define so that on recent Darwin mysqld does not react to SIGHUP and SIGQUIT:
this fixes a rpl000001 problem on our Powermac G5 machine (popping after an upgrade from 10.3.4 to
10.3.5) and is expected to fix 
BUG#2030 "relay bin log on slave resets multiple times a second"
(i.e. under some Mac OS X Panther versions, mysqld receives many SIGHUP and SIGQUIT).
So this fix is more a problem-hider than a real understanding of why mysqld receives so many signals.
Note that we saw other problems on this OS where mysqld reacts to Ctrl-Z but apparently only once,
where using SSL seems to make the problem more frequent...
 2004-08-13 15:29:47 +02:00
brian@avenger.(none)
1fe8b35bba This is the addition of the CSV engine "aka tina". Its an example engine that works as a plain text file. 2004-08-12 20:57:18 -07:00
paul@ice.snake.net
54adeb0976 mysqld.cc: 
Help message edit.
 2004-08-12 08:47:45 -05:00
ingo@mysql.com
68871aee8e bug#4997 - --log-error sometimes generates incorrect default name. 
Now replacing domain name by 'err'. If host name doesn't have a
domain name, '.err' is appended as before.
 2004-08-12 09:40:32 +02:00
paul@kite-hub.kitebird.com
976e0ce3a8 mysqld.cc: 
minor option description change.
 2004-08-09 10:34:36 -05:00
paul@kite-hub.kitebird.com
651b6893b1 mysqld.cc: 
Put --help first, reorder other options so that they are
  alphabetical. (shouldn't have to use grep to find an option.)
  Move group_concat_max_len to variable part of list.
  Rename character_set_server, collation_server,
  shared_memory_base_name to character-set-server,
  collation-server, shared-memory-base-name.
  Make default-collation message refer to collation-server
  rather than character-set-server.
 2004-08-08 21:23:03 -05:00
kent@mysql.com
072818eab5 mysqld.cc: 
get_options() did an exit(0) after reporting "Too many arguments"
 2004-08-08 15:46:57 +02:00
marko@hundin.mysql.fi
3cb09c9817 InnoDB: Add option for disabling innodb_status.<pid> files. 
InnoDB: Implement tmpfile() differently on Windows (Bug #3998)
 2004-08-06 15:55:50 +03:00
kent@mysql.com
48c8a11a4f mysqld.cc, mysql_test_run.c: 
Changed URL in error message, page has moved
 2004-08-05 17:05:21 +02:00
tim@sand.box
6ce0b07a99 Print MYSQL_COMPILATION_COMMENT after ER_READY on server startup 2004-08-04 10:12:57 -06:00
jan@hundin.mysql.fi
9d615368ac Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-07-29 09:04:50 +03:00
paul@kite-hub.kitebird.com
a3091294b4 Fix some variable misorderings. 2004-07-28 14:52:04 -05:00
jan@hundin.mysql.fi
9e3111486f Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-07-27 12:44:15 +03:00
jani@rhols221.adsl.netsonic.fi
7c3164577f Added info about new --log-warnings option. 2004-07-26 17:41:52 +03:00