summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* merge with 4.0monty@mashka.mysql.fi2003-10-1624-76/+251
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mashka.mysql.fi2003-10-1510-33/+86
| |\ | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.0
| | * Better fix for CREATE TABLE IF NOT EXISTS ... SELECTmonty@mashka.mysql.fi2003-10-1510-33/+86
| | | | | | | | | | | | | | | Fixed chsize() problem on windows Extend default timeout on windows clients to 1 year (to avoid timeout problems)
| * | dummy resize_thr_alarm for Netwareserg@serg.mylan2003-10-151-1/+2
| |/
| * Updated commentsmonty@mashka.mysql.fi2003-10-152-5/+29
| |
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mashka.mysql.fi2003-10-1519-46/+141
| |\ | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.0
| | * Identical mysql.ico and MYSQL.ICOpaul@teton.kitebird.com2003-10-141-0/+0
| | | | | | | | | | | | | | | existed, causing problems on non-case-sensitive OSes. Deleted conflicting file.
| | * make LOCK TABLES to work when Lock_tables_priv is granted on the DB level ↵serg@serg.mylan2003-10-141-1/+1
| | | | | | | | | | | | and Select_priv is granted on the table level.
| | * Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2003-10-145-28/+142
| | |\ | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| | | * Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0vva@eagle.mysql.r18.ru2003-10-101-2/+3
| | | |\ | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.0
| | | | * Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2003-10-091-2/+3
| | | | |\ | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| | | | | * Make the slave die if master is 5.0. Indeed, 5.0 masters sendguilhem@mysql.com2003-10-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a Format_description_log_event (or maybe it will be named Description_log_event) which is not recognized by 4.0, so a 4.0 can't be a slave of 5.0. We detect it early to produce a helpful message instead of "corrupted relay log" later.
| | | * | | fixed temp directory for mysqlbinlog (was wrong on solaris)vva@eagle.mysql.r18.ru2003-10-081-8/+8
| | | |/ /
| | * | | mergedserg@serg.mylan2003-10-0719-1220/+1517
| | |\ \ \ | | | | |/ | | | |/|
| | * | | results updatedserg@serg.mylan2003-10-061-0/+22
| | | | |
| | * | | bug #1434 (and related issues)serg@serg.mylan2003-10-063-5/+35
| | | | |
| | * | | fix_max_connections to resize alarm_queue (Bug #1435)serg@serg.mylan2003-10-065-13/+44
| | | | |
| | * | | Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2003-10-067-18/+28
| | |\ \ \ | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| | | * | | enum options renamed to avoid possible name conflictsserg@serg.mylan2003-09-293-3/+3
| | | | | |
| | | * | | typo fixed (bug #1390 - incorrect mysql_config output)serg@serg.mylan2003-09-281-1/+1
| | | | | |
| | | * | | make mysqld to respect socket/port options of mysqld_safe command lineserg@serg.mylan2003-09-271-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and [mysqld_safe] section in my.cnf, even if they are also specified in [mysql] section.
| | | * | | Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2003-09-182-5/+11
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| | | | * \ \ merged (ul)serg@serg.mylan2003-09-120-0/+0
| | | | |\ \ \
| | | | * \ \ \ mergedserg@serg.mylan2003-09-121-1/+0
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2003-09-121-4/+11
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| | | | | * | | | | fixed: thread lock-up on a FLASH TABLE when another thread has an open handlerserg@serg.mylan2003-09-091-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#1204
| * | | | | | | | | Add more information about memory usage to debug logmonty@mashka.mysql.fi2003-10-151-3/+7
| | | | | | | | | |
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mashka.mysql.fi2003-10-1544-130/+486
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.1
| * | | | | | | | | | Portability fixes for windowsmonty@mashka.mysql.fi2003-10-1516-41/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After merge fixes
| * | | | | | | | | | merge with 4.0 to get fix for SET enum_system_variable=NULLmonty@mashka.mysql.fi2003-10-144-5/+11
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Fixed bug in SET enum_system_variable=NULLmonty@mashka.mysql.fi2003-10-144-5/+11
| | | | | | | | | | |
| * | | | | | | | | | merge with 4.0 for more memory allocation variables.monty@mashka.mysql.fi2003-10-1321-68/+362
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Add new user variables for tuning memory usage:monty@mashka.mysql.fi2003-10-1121-81/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size Add more checks for "out of memory" detection in range optimization
| | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mashka.mysql.fi2003-10-08175-6877/+3221
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.0
| | | * | | | | | | | Mergelenz@mysql.com2003-10-082-1/+120
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | - added make_sharedlib_distribution.sh to the source distributionlenz@mysql.com2003-10-082-1/+120
| | | | | | | | | | | |
| | * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mashka.mysql.fi2003-09-133-51/+51
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.0
| | * \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mashka.mysql.fi2003-09-1210-45/+170
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.0
| * | | | | | | | | | | | Add warnings for single line inserts. To do this I had to convert ↵monty@mashka.mysql.fi2003-10-1116-23/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | count_cuted_fields to an enum (to be able to detect setting a NOT NULL field to NULL)
* | | | | | | | | | | | | ctype-simple.c, ctype-mb.c:bar@bar.mysql.r18.ru2003-10-154-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Win compilation problem fix ctype-bin.c: Win compilation problem fix , , m_ctype.h: Win compilation problem fix ,
* | | | | | | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1gluh@gluh.mysql.r18.ru2003-10-157-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.max
| * | | | | | | | | | | | | WL#1106: Switch = --maxdb rather than --sapdbgluh@gluh.mysql.r18.ru2003-10-157-8/+8
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge hfisk@bk-internal.mysql.com:/home/bk/mysql-4.1harrison@mysql.com2003-10-151-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/harry/mysqlstuff/mysql-4.1
| * | | | | | | | | | | | | | fil0fil.c:heikki@hundin.mysql.fi2003-10-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual C++ apparently does not know what -1LL (= -1 in longlong type) means
* | | | | | | | | | | | | | | Add in bit_xor function (approved by Sergei)harrison@bud.lordblink.com2003-10-155-0/+40
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | os0file.c:heikki@hundin.mysql.fi2003-10-141-45/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Visual C++ compilation errors reported by Miguel
* | | | | | | | | | | | | | row0purge.c, row0mysql.c, os0file.c, os0file.h, fil0fil.h, fil0fil.c:heikki@hundin.mysql.fi2003-10-147-11/+250
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IMPORT TABLESPACE must reset lsns if they are too high ha_innodb.cc: DISCARD/IMPORT TABLESPACE must have a TL_WRITE lock on the table
* | | | | | | | | | | | | | do not add DROP TABLE and LOCK TABLES to the dump in --xml modeserg@serg.mylan2003-10-141-15/+13
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | sql_yacc.yy:heikki@hundin.mysql.fi2003-10-142-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add DISCARD etc. in the keyword: rule of sql_yacc.yy sql_table.cc: Add comment that DISCARD/IMPORT TABLESPACE is always the only clause in an ALTER TABLE
* | | | | | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2003-10-1332-118/+424
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-group_concat-4.1
View Lorry Controller Status