summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* after merge fixesunknown2004-08-221-3/+7
|
* ported bugfix for #2408 from 3.23unknown2004-08-221-64/+59
|\ | | | | | | | | | | (cannot call it a "merge" :)
| * bug#2408 - Multiple threads altering MERGE table UNIONs hang/crash.unknown2004-08-221-52/+49
| | | | | | | | | | | | | | Abandoned improper use of MyISAM data. Thanks Ingo!
* | null.test, null.result:unknown2004-08-204-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added test case for bug #4256. join_outer.result: Fixed bug #4256. item_cmpfunc.h: Fixed inconsistency of values of used_tables_cache and const_item_cache for Item_func_isnull objects. This inconsistency caused bug #4256. sql/item_cmpfunc.h: Fixed inconsistency of values of used_tables_cache and const_item_cache for Item_func_isnull objects. This inconsistency caused bug #4256. mysql-test/r/join_outer.result: Fixed bug #4256. mysql-test/r/null.result: Added test case for bug #4256. mysql-test/t/null.test: Added test case for bug #4256.
* | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-08-209-21/+154
|\ \ | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| * | Making FLUSH TABLES WITH READ LOCK block COMMITs of existing transactions,unknown2004-08-209-21/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in a deadlock-free manner. This splits locking the global read lock in two steps. This fixes a consequence of this bug, known as: BUG#4953 'mysqldump --master-data may report incorrect binlog position if using InnoDB' And a test. sql/handler.cc: making COMMIT wait if FLUSH TABLES WITH READ LOCK happened. sql/lock.cc: an additional stage so that FLUSH TABLES WITH READ LOCK blocks COMMIT: make_global_read_lock_block_commit(): taking the global read lock is TWO steps (2nd step is optional; without it, COMMIT of existing transactions will be allowed): lock_global_read_lock() THEN make_global_read_lock_block_commit(). sql/mysql_priv.h: new argument to wait_if_global_read_lock() sql/sql_class.h: THD::global_read_lock now an uint to reflect the 2 steps of global read lock (does not block COMMIT / does) sql/sql_db.cc: update for new prototype sql/sql_parse.cc: implementing the two steps of global read lock so that FLUSH TABLES WITH READ LOCK can block COMMIT without deadlocking with COMMITs.
* | | A fix (bug #5115: Erronious Syntax Error when comment placed inside of ↵unknown2004-08-201-8/+10
| | | | | | | | | | | | | | | | | | | | | "create table") client/mysql.cc: in_comment is now outside the add_line().
* | | Merge bk-internal:/home/bk/mysql-4.0/unknown2004-08-193-2/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| * | | less strict assert to take into account weird casesunknown2004-08-193-2/+14
| | | |
* | | | ha_innodb.cc:unknown2004-08-191-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase_mysql_tmpfile(): call dup() and my_close() on the file returned by create_temp_file() in order to avoid memory leak caused by my_open() being paired with close() sql/ha_innodb.cc: innobase_mysql_tmpfile(): call dup() and my_close() on the file returned by create_temp_file() in order to avoid memory leak caused by my_open() being paired with close()
* | | | Build bug on 64-Bit platforms.unknown2004-08-191-21/+9
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed improper casts. Thanks to Joerg Bruehe for the fix. include/my_global.h: Build bug on 64-Bit platforms. Removed improper casts. Changed to uniform writing style. Appended 'L' to 32-Bit constants which doesn't hurt on 32-Bit, but can be important for some 64-Bit compilers.
* | | typos fixedunknown2004-08-191-2/+2
| | |
* | | Merge bk-internal:/home/bk/mysql-4.0/unknown2004-08-192-10/+10
|\ \ \ | |/ / | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| * | cosmetic changeunknown2004-08-192-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | sql/sql_class.h: comment sql/sql_table.cc: smarter use of the Disable_binlog object (using a block so that when leaving it either way, the object gets destroyed and so properties of the thread get reset).
* | | take dec. point into account in store_double_in_stringunknown2004-08-191-6/+12
| | |
* | | copied new my_vsnprintf from 4.1. use "ul" when mergingunknown2004-08-192-16/+75
|/ / | | | | | | | | BitKeeper/etc/ignore: Added EXCEPTIONS-CLIENT to the ignore list
* | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-08-197-17/+70
|\ \ | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| * | Fix for BUG#4971 "CREATE TABLE ... TYPE=HEAP SELECT ... stops slave (wrong ↵unknown2004-08-197-17/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DELETE in binlog)": replacing the no_log argument of mysql_create_table() by some safer method (temporarily setting OPTION_BIN_LOG to 0) which guarantees that even the automatic DELETE FROM heap_table does not get into the binlog when a not-yet-existing HEAP table is opened by mysql_create_table(). mysql-test/r/rpl_heap.result: result update mysql-test/t/rpl_heap.test: testing a bug sql/log.cc: new class Disable_binlog used to temporarily disable binlogging for one thread. sql/mysql_priv.h: removing argument no_log from mysql_create_table(); no_log was perfect as some binlogging could still be done by open_unireg_entry() for a HEAP table. sql/sql_class.h: new class Disable_binlog used to temporarily disable binlogging for one thread. sql/sql_parse.cc: removing no_log sql/sql_table.cc: removing no_log from mysql_create_table(); instead using new class Disable_binlog. Disabling binlogging in some cases, where the binlogging is done later by some other code (case of CREATE SELECT and ALTER).
* | | Bug 4937: different date -> string conversion when usingunknown2004-08-184-41/+88
| | | | | | | | | | | | | | | | | | SELECT ... UNION and INSERT ... SELECT ... UNION
* | | Merge bk-internal:/home/bk/mysql-4.0/unknown2004-08-187-9/+78
|\ \ \ | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| * | | srv0start.c, ut0mem.c, ut0dbg.c, ut0dbg.h, srv0start.h:unknown2004-08-187-9/+78
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) sql/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) sql/mysqld.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) innobase/include/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) innobase/include/ut0dbg.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) innobase/ut/ut0dbg.c: Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri) innobase/ut/ut0mem.c: Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri) innobase/srv/srv0start.c: Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
* | | use my_vsnprintf() just in caseunknown2004-08-181-1/+3
|/ / | | | | | | | | | | bug#4925
* | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-08-171-1/+1
|\ \ | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| * | Fix for BUG#5073 "--disable-local-infile has no effect if client reads it ↵unknown2004-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with MYSQL_READ_DEFAULT": that was a forgotten '~' probably. libmysql/libmysql.c: When we read "disable-local-infile" from the option file specified by mysql_options(MYSQL_READ_DEFAULT_FILE), we must take CLIENT_LOCAL_FILES down (it was probably a forgotten '~').
* | | Merge heikki@build.mysql.com:/home/bk/mysql-4.0unknown2004-08-172-4/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/heikki/mysql-4.0
| * | | A fix (bug #5055: SQL_SELECT_LIMIT=0 crashes command line client):unknown2004-08-171-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | mysql outwits itself.
| * | | A desperate attempt to comment one place where we do conversions.unknown2004-08-161-0/+27
| |/ /
* | | Merge heikki@build.mysql.com:/home/bk/mysql-4.0unknown2004-08-161-0/+24
|\ \ \ | |/ / |/| | | | | | | | | | | into hundin.mysql.fi:/home/heikki/mysql-4.0
| * | row0mysql.c:unknown2004-08-131-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | Fix bug: if we RENAME a table, InnoDB forgot to load the foreign key constraints that reference the new table name, and forgot to check that they are compatible with the table innobase/row/row0mysql.c: Fix bug: if we RENAME a table, InnoDB forgot to load the foreign key constraints that reference the new table name, and forgot to check that they are compatible with the table
* | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-08-141-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| * | | Fix for BUG#5050 "mysql-test-run fails on rpl_trunc_binlog after 'make ↵unknown2004-08-141-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | install'": The binlog files we use for some tests must be installed like other mysql-test/std_data/ files. mysql-test/Makefile.am: The binlog files we use for some tests must be installed like other mysql-test/std_data/ files. Putting a * before 001 so that it works for 6-digit extensions of 4.1.
* | | - manual mergeunknown2004-08-132-13/+9
|\ \ \ | |/ /
| * | Escaping [] so that darwin[7-8] gets into 'configure' and not darwin7-8unknown2004-08-132-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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... configure.in: 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. sql/mysqld.cc: optionally ignore SIGHUP and SIGQUIT, for some Mac OS X Panther versions which send too many of those.
* | | Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0unknown2004-08-134-2/+98
|\ \ \ | |/ / | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0
| * | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-08-133-1/+96
| |\ \ | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_4358/mysql-4.0
| | * \ Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0unknown2004-08-133-1/+96
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_4358/mysql-4.0 sql/sql_select.cc: Auto merged
| | | * | fixed Bug #4358 Problem with HAVING clause that uses aliasunknown2004-08-123-1/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the select list and TEXT field make setup_copy_fields to insert Item_copy_string for blobs in the beginning of the copy_funcs (push_back instead of push_front) the thing is that Item_copy_string::copy for function can call Item_copy_string::val_int for blob via Item_ref. But if Item_copy_string::copy for blob isn't called before, it's value will be wrong. So all the Item_copy_string::copy for blobs should be called before Item_copy_string::copy for functions. mysql-test/r/having.result: added test case for Bug #4358 Problem with HAVING clause that uses alias from the select list and TEXT field mysql-test/t/having.test: added test case for Bug #4358 Problem with HAVING clause that uses alias from the select list and TEXT field sql/sql_select.cc: make setup_copy_fields to insert Item_copy_string for blobs in the beginning of the copy_funcs (push_back instead of push_front) the thing is that Item_copy_string::copy for function can call Item_copy_string::val_int for blob via Item_ref. But if Item_copy_string::copy for blob isn't called before, it's value will be wrong. So all the Item_copy_string::copy for blobs should be called before Item_copy_string::copy for functions. fixed Bug #4358 Problem with HAVING clause that uses alias from the select list and TEXT field
| * | | | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-08-131-1/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_4973/mysql-4.0
| | * \ \ \ Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0unknown2004-08-131-1/+2
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_4973/mysql-4.0
| | | * | | fixed Bug #4973 Memory is not released when HEAP table is droppedunknown2004-08-111-1/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/ha_heap.cc: added calling fn_format(name,..) for name before heap_delete_table as it's done before heap_create fixed Bug #4973 Memory is not released when HEAP table is dropped
* | | | | - portability fix for SCO Open Server 5.0.7 (thanks to Boyd Gerber)unknown2004-08-121-0/+1
| | | | |
* | | | | - Fixed two small version number issues in MySQL-shared-compat.specunknown2004-08-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support-files/MySQL-shared-compat.spec.sh: - fixed using the correct version number - bumped up the 3.23 version number to current
* | | | | - giving a range does not work for platform detection in configure.inunknown2004-08-121-1/+10
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - resorting to having to separate sections for darwin7 and darwin8 configure.in: - giving a range does not work here - resorting to having to separate sections for darwin7 and darwin8
* | | | Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0unknown2004-08-123-5/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0
| * | | | Added initial sorting in order to make test case repeatable.unknown2004-08-121-0/+1
| | | | |
| * | | | Added initial sorting in order to make test case repeatable. unknown2004-08-121-0/+1
| | | | |
| * | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-08-123-5/+46
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b4898
| | * | | | A test case (bug #4898: User privileges depending on ORDER BY Settings of ↵unknown2004-08-122-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | table db)
| | * | | | A fix (Bug#4898: User privileges depending on ORDER BY Settings of table db)unknown2004-08-121-5/+13
| | | | | |
* | | | | | Merge mysql.com:/space/my/mysql-4.0unknown2004-08-129-16/+73
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0-build
View Lorry Controller Status