summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* Mergesergefp@mysql.com2004-05-241-31/+34
|\
| * Merge with 4.0, mainly to get changes to windows project filesmonty@mysql.com2004-05-201-31/+34
| |\
| | * Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mysql.com2004-05-191-24/+30
| | |\
| | | * Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'monty@mysql.com2004-05-191-24/+30
| | * | Fix for BUG#3829 "Setting server_id on fly doesn't allow replication to start"guilhem@mysql.com2004-05-191-5/+5
| | |/
* | | WL#1622 "SQL Syntax for Prepared Statements": Post-review fixes (1 of 2)sergefp@mysql.com2004-05-211-3/+6
* | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-05-061-0/+3
|\ \ \ | |/ / |/| |
| * | Manual merge for WL#1622 code, will need fixessergefp@mysql.com2004-05-051-0/+3
| |\ \
| | * \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-04-281-3/+25
| | |\ \
| | * \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-04-141-1/+6
| | |\ \ \
| | * \ \ \ Mergesergefp@mysql.com2004-04-081-0/+3
| | |\ \ \ \
| | | * \ \ \ Post-merge fixessergefp@mysql.com2004-04-051-0/+3
| | | |\ \ \ \
| | | | * | | | Many files:sergefp@mysql.com2004-04-051-0/+3
* | | | | | | | after merge fixesmonty@mysql.com2004-05-051-0/+4
* | | | | | | | Merge with 4.0.19monty@mysql.com2004-05-051-2/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | useless fixes for --report-password and --show-slave-auth-info (almost undocu...guilhem@mysql.com2004-05-041-1/+1
| * | | | | | A new option --replicate-same-server-id to force a slave to execute queries o...guilhem@mysql.com2004-04-281-1/+17
* | | | | | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2004-05-031-2/+4
|\ \ \ \ \ \ \
| * | | | | | | WL#1700 - Properly count key_blocks_used and key_blocks_current.ingo@mysql.com2004-05-031-2/+4
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | myisam_data_pointer_sizeserg@serg.mylan2004-05-011-1/+6
|/ / / / / /
* | | | | | mysqld.cc:tomas@mc05.(none)2004-04-191-1/+1
* | | | | | Fix mysql-test-run to work better with NDBmagnus@neptunus.(none)2004-04-151-4/+1
* | | | | | Merge conflicts with EXAMPLE handlermagnus@neptunus.(none)2004-04-151-3/+28
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Added NDB storage enginemagnus@neptunus.(none)2004-04-151-3/+27
| | |/ / / | |/| | |
* | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1brian@brian-akers-computer.local2004-04-141-1/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | All changes are to allow someone to compile the example storage engine and us...brian@brian-akers-computer.local2004-04-121-1/+6
| | |/ / | |/| |
* | | | correct SET GLOBAL ft_boolean_syntax=DEFAULT behaviourserg@serg.mylan2004-04-071-5/+3
* | | | Portability fixesmonty@mysql.com2004-04-071-0/+2
* | | | Fixed warnings from valgrind (not a bug)monty@mysql.com2004-04-061-5/+3
|/ / /
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-04-051-2/+1
|\ \ \
| * | | Fixed many compiler warningsmonty@mysql.com2004-04-051-2/+1
| | |/ | |/|
* | | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1vva@eagle.mysql.r18.ru2004-04-031-1/+3
|\ \ \
| * | | added synchronization in mysql_create_like_tablevva@eagle.mysql.r18.ru2004-04-011-1/+3
| |/ /
* | | Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1miguel@hegel.local2004-04-021-1/+1
|\ \ \
| * | | Fix for bug #3359. Bad named pipe name.miguel@hegel.local2004-04-011-1/+1
| |/ /
* | | WL#775 "Add status variable identifying binlog_cache_size shortage"dlenev@jabberwock.localdomain2004-04-021-0/+4
|/ /
* | Some SHOW STATUS lines were in non-alphabetic order.paul@ice.snake.net2004-03-211-26/+26
* | select @@smth=@@sys_str_var crash fixedserg@serg.mylan2004-03-201-0/+4
* | Don't change server suffix if given to configuremonty@mysql.com2004-03-181-3/+4
* | merge with 4.0monty@mysql.com2004-03-161-22/+53
|\ \ | |/
| * Ensure that install_test_db.sh script works with both 'make install' and 'mak...monty@mysql.com2004-03-121-6/+8
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mysql.com2004-03-101-17/+28
| |\
| | * Fixed memory leak in DROP DATABASE when using RAID tables (Bug #2882)monty@mysql.com2004-03-101-17/+28
| * | Touch up error message.paul@ice.snake.net2004-03-081-4/+4
| |/
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mysql.com2004-03-061-5/+12
| |\
| | * Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0bell@sanja.is.com.ua2004-03-041-2/+7
| | |\
| | | * invalidation of locking for write tables (BUG#2693)bell@sanja.is.com.ua2004-03-041-2/+7
| | * | Fixed Bug#2491, INSERT DELAYED causes binary log unusable by mysqlbinlog (rep...jani@ua72d24.elisa.omakaista.fi2004-03-041-3/+5
| | |/
| * | Ensure that one can't from the command line set a variable too small. (Bug #2...monty@mysql.com2004-03-061-3/+19
| |/
| * Fix problem with NT named pipes code (per e-mail thread).Greg@greg-laptop.2004-02-281-1/+1