summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Collapse)AuthorAgeFilesLines
* postmerge fixbell@sanja.is.com.ua2005-09-061-0/+1
|
* Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-09-051-2/+2
|\ | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.b9948
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@mysql.com2005-09-011-2/+2
| |\ | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-4.1-bg12423
| | * Fix for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in dlenev@mysql.com2005-09-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | mysqld.cc, mysql_priv.h, sql_parse.cc:bar@mysql.com2005-09-051-6/+6
| | | | | | | | | | | | | | | | | | bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC prob after review fixes
* | | bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC ↵bar@mysql.com2005-08-311-0/+7
|/ / | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1paul@frost.snake.net2005-08-271-4/+4
|\ \ | | | | | | | | | into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
| * | mysqld.cc:paul@frost.snake.net2005-08-271-4/+4
| | | | | | | | | | | | Reorder out-of-order status variables.
* | | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0jani@a193-229-222-105.elisa-laajakaista.fi2005-08-251-0/+1
|\ \ \ | |_|/ |/| | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
| * | Several fixes for Netware.jani@a193-229-222-105.elisa-laajakaista.fi2005-08-241-3/+13
| | |
| * | Some minor fixes for Netware. These were required after we started buildingjani@a193-229-222-105.elisa-laajakaista.fi2005-08-181-0/+1
| | | | | | | | | | | | against a later version of libc.
* | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1patg@radha.local2005-08-191-1/+1
|\ \ \ | | | | | | | | | | | | into radha.local:/Users/patg/mysql-build/mysql-4.1.clean
| * | | BUG #12498 Fixed mispellingpatg@radha.local2005-08-191-1/+1
| | | |
* | | | Changes for Netware. This is needed when building against newer Libcjani@a193-229-222-105.elisa-laajakaista.fi2005-08-181-0/+1
| |_|/ |/| | | | | | | | than we've used before.
* | | Merge mysql.com:/home/jimw/my/mysql-4.1-11796jimw@mysql.com2005-08-151-1/+5
|\ \ \ | |/ / |/| | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| * | Avoid problems on shutdown by shutting down replication slave threadsjimw@mysql.com2005-08-081-1/+5
| | | | | | | | | | | | after normal connection threads. (Bug #11796)
* | | Fix for bug #12177 (errorlog file isn't closed)hf@deer.(none)2005-08-041-1/+2
| | | | | | | | | | | | 4.1 version of the patch
* | | Fix for bug #11329 (lowercase_table.test fails)hf@deer.(none)2005-07-261-44/+44
|/ /
* | Simple fixes during review of new codemonty@mishka.local2005-07-191-13/+24
| |
* | Fix for BUG#12003 "assertion failure in testsuite (double lock ofgbichot@production.mysql.com2005-07-181-1/+1
| | | | | | | | | | | | | | 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.
* | added a comment referring to the bug reportreggie@linux.site2005-07-151-0/+6
| |
* | Bug #7403 error "Forcing close of thread 1 user: 'xxx'"reggie@linux.site2005-07-141-1/+1
| | | | | | | | | | | | | | 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).
* | Fixed Bug#11226 and reverted fix for Bug#6993.jani@ua141d10.elisa.omakaista.fi2005-06-301-1/+1
| | | | | | | | | | | | | | Using 8 bytes for data pointer does not work at least on all computers. The result may become 0 or negative number. (mysqld, myisamchk)
* | Cleanup during review of new codemonty@mishka.local2005-06-211-3/+0
| | | | | | | | Fixed wrong allocation that could cause buffer overrun when using join cache
* | Fix Bug#9334 "PS API queries in log file" and konstantin@mysql.com2005-06-171-0/+7
| | | | | | | | | | | | | | | | | | | | 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.
* | A fix for Bug#9141 "4.1 does not log into slow log konstantin@mysql.com2005-06-161-3/+16
| | | | | | | | | | | | | | | | | | 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).
* | Fix problem with handling of lower_case_table_name == 2 whenjimw@mysql.com2005-06-081-3/+5
| | | | | | | | the case in the FROM and WHERE clauses didn't agree. (Bug #9500)
* | Move USE_PRAGMA_IMPLEMENTATION to proper placemonty@mysql.com2005-06-031-0/+4
| | | | | | | | | | | | 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
* | Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. ↵brian@zim.(none)2005-06-011-7/+1
| | | | | | | | Removed a number of dumb things in ha_tina.
* | Bug #5843: Server code does not check whether PID file was successfully writtengluh@mysql.com2005-05-051-1/+7
| |
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-04-261-0/+1
|\ \ | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| * \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-04-261-0/+1
| |\ \ | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| | * \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-04-061-0/+1
| | |\ \ | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| | | * | Fixed that create_time is set properly for cached threadsmonty@mysql.com2005-04-061-0/+1
| | | | |
* | | | | Fix compile issues in Intel C/C++ compiler (Bug #9063)jimw@mysql.com2005-04-251-1/+1
|/ / / /
* | | | Fixed core dump with long timezone namesmonty@mishka.local2005-04-161-9/+17
| | | | | | | | | | | | | | | | Don't abort on bootstrap if a wrong --default-storage-engine is specified
* | | | Merge mysql.com:/home/jimw/my/mysql-4.1-9833jimw@mysql.com2005-04-151-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| * | | | Don't allow the server to start up when an invalid user isjimw@mysql.com2005-04-131-0/+1
| | | | | | | | | | | | | | | | | | | | specified via --user or in configuration. (Bug #9833)
* | | | | Check that the default storage engine is really available, andjimw@mysql.com2005-04-131-0/+12
|/ / / / | | | | | | | | | | | | refuse to start up if it is not. (Bug #9815)
* | | | Mergemskold@mysql.com2005-04-131-1/+1
|\ \ \ \
| * | | | Fix for bug#9813: Test 'ndb_basic': Autoincrement fails in 64 bitmskold@mysql.com2005-04-131-1/+1
| |/ / /
* | | | Bug #9665 After registering MySQL service and starting with shared mem, ↵reggie@mdk10.(none)2005-04-081-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | cannot stop Removed the extra set of the shared memory connect event from kill_mysql since it is also being set in kill_server
* | | | Bug #9665 After registering MySQL service and starting with shared mem, ↵reggie@mdk10.(none)2005-04-081-0/+12
|/ / / | | | | | | | | | | | | | | | | | | | | | 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.
* | | Fix handling of max_allowed_packet and net_buffer_length injimw@mysql.com2005-04-011-10/+3
|/ / | | | | | | embedded server when a size suffix (K, M, G) is added. (Bug #9472)
* | Remove redundant my_security_attr_free() from konstantin@mysql.com2005-03-291-2/+0
| | | | | | | | handle_connections_shared_memory (double free spotted by Monty).
* | A fix for Bug#8226 "Cannot connect via shared memory": konstantin@mysql.com2005-03-261-15/+29
| | | | | | | | | | | | | | 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.
* | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1brian@zim.(none)2005-03-241-0/+6
|\ \ | | | | | | | | | into zim.(none):/home/brian/mysql/mysql-4.1
| * | Additional storage engine called "blackhole". Customer request, and for that ↵brian@zim.(none)2005-03-221-0/+6
| | | | | | | | | | | | 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.
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2005-03-241-3/+13
|\ \ \ | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1
| * | | "After Monty's review" changes to the fix for BUG#8325 "Deadlock in ↵gbichot@quadita2.mysql.com2005-03-231-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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