summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* Fix for Bug #9913 "udf_deinit is not called after execution of PS"unknown2005-04-305-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (aka "deinit is not called when calling udf from trigger"). We should call udf_deinit() function during cleanup phase after prepared (or ordinary) statement execution instead of calling it from Item's desctructor. No test case is provided since it is hard to test UDF's from our test suite. sql/item_func.cc: udf_handler: Moved all functionality from udf_handler::~udf_handler() to udf_handler::cleanup() method which will be called after each PS execution, thus allowing udf_deinit() to be executed symetrically with udf_init() (which is executed for each execution of PS). Added Item_udf_func::cleanup() which performs proper cleanup after execution of PS with UDF function. sql/item_func.h: Added Item_udf_func::cleanup() method to perform cleanup properly after execution of PS with UDF function. sql/item_sum.cc: Added Item_udf_sum::cleanup() method to perform cleanup properly after execution of PS with aggregate UDF function. sql/item_sum.h: Added Item_udf_sum::cleanup() method to perform cleanup properly after execution of PS with aggregate UDF function. sql/sql_udf.h: Added udf_handler::cleanup() method declaration which is responsible for cleaning up UDF execution context at the end of execution of statement (using ~udf_handler() for this purprose did not worked for PS).
* Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-292-22/+79
|\ | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
| * Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-292-22/+79
| |\ | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
| | * Fix for avoiding gettin Invalid schema object version when doing local ↵unknown2005-04-291-1/+1
| | | | | | | | | | | | changes, fixed found bug
| | * Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-282-22/+79
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
| | | * Fix for avoiding gettin Invalid schema object version when doing local ↵unknown2005-04-281-3/+7
| | | | | | | | | | | | | | | | changes, more post review fixes
| | | * Fix for avoiding gettin Invalid schema object version when doing local ↵unknown2005-04-281-4/+20
| | | | | | | | | | | | | | | | changes, post review fixes
| | | * Fix for avoiding gettin Invalid schema object version when doing local changesunknown2005-04-272-15/+43
| | | |
| | | * Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-274-5/+7
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
| | | * | Post review fix of ndbcluster_drop_database, typounknown2005-04-251-1/+1
| | | | |
| | | * | Post review fix of ndbcluster_drop_database, print errorunknown2005-04-251-0/+3
| | | | |
| | | * | Post review fix of ndbcluster_drop_databaseunknown2005-04-251-5/+11
| | | | |
* | | | | Merge mysql.com:/home/mydev/mysql-4.1unknown2005-04-291-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100
| * | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-281-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-4.1-bug9298
| | * \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-271-20/+55
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-4.1-bug9298
| | * \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-271-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-4.1-bug9298
| | | * \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-271-1/+1
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-4.1-bug9298
| | | | * | | | Fix for BUG#9298: Make int->string conversion sign-aware in ↵unknown2005-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protocol_simple::store_long mysql-test/r/group_by.result: Testcase for BUG#9298 mysql-test/t/group_by.test: Testcase for BUG#9298
* | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1-bug5964unknown2005-04-281-4/+24
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100
| * | | | | | | BUG#5964 - 4.1 MERGE tables regression from 4.0unknown2005-04-281-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the creation of the .MRG file so that only the table name is written when the MyISAM table is in the same database as the MERGE table, a relative path is used in other cases in mysqld, and possibly an absolute path is used in an embedded server. No test case is added as the external behaviour is unchanged. Only the file names within the .MRG file are changed. include/my_sys.h: BUG#5964 - 4.1 MERGE tables regression from 4.0 Added declaration for a new function. myisammrg/myrg_open.c: BUG#5964 - 4.1 MERGE tables regression from 4.0 Changed check for absolute path to check for any path. mysys/my_getwd.c: BUG#5964 - 4.1 MERGE tables regression from 4.0 Added a new functions which checks for absolute _or_ relative paths. sql/ha_myisammrg.cc: BUG#5964 - 4.1 MERGE tables regression from 4.0 Changed the creation of the .MRG file so that only the table name is written when the MyISAM table is in the same database as the MERGE table, a relative path is used in other cases in mysqld, and possibly an absolute path is used in an embedded server.
* | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/bug9911unknown2005-04-283-30/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1
| * | | | | | | BUG#9911 After review fixesunknown2005-04-283-30/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove ha_archive::rename_table and move the fix to handler::rename_table sql/examples/ha_archive.cc: Remove ha_archive::rename_table sql/examples/ha_archive.h: Remove ha_archive::rename_table sql/handler.cc: Fix handler::rename_table so it does not care about if the file to rename is missing
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-276-27/+114
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1 configure.in: Auto merged
| * | | | | | | Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlockunknown2005-04-271-20/+55
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After merge fix.
| * | | | | | Merge from 4.0 needs fixesunknown2005-04-272-3/+53
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/lock.cc: Auto merged sql/mysql_priv.h: Auto merged
| | * | | | | Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlockunknown2005-04-273-23/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added protection against global read lock while creating and initializing a delayed insert handler. Allowed to ignore a global read lock when locking the table inside the delayed insert handler. Added some minor improvements. sql/lock.cc: Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock Changed mysql_lock_tables() to allow for ignoring global read lock. Added functions to set/unset protection against global read lock. sql/mysql_priv.h: Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock Changed existing and added new function declarations. sql/sql_insert.cc: Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock Added and extended some comments. Added a protection against global read lock while a handler is created and initialized. Moved the unlock of the delayed insert object past its last usage in delayed_get_table(). Changed the table locking in handle_delayed_insert() so that it does not wait for global read lock.
| * | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-271-0/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M41/mysql-4.1
| | * \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-271-0/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/4.1.b9803
| | | * | | | | | A fix (bug #9837: round(1, 6) delivers wrong value in create table context).unknown2005-04-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item_func.cc: A fix (bug #9837: round(1, 6) delivers wrong value in create table context). As we change decimals, we should change max_length accordingly.
| * | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-262-4/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M41/mysql-4.1 acinclude.m4: Auto merged configure.in: Auto merged
| | * | | | | | | Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/nptl-4.1unknown2005-04-262-4/+4
| | |\ \ \ \ \ \ \
| | | * | | | | | | Step 2 of the switch to support configuration with NPTL:unknown2005-04-202-4/+4
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define a new CPP symbol that the target OS is Linux, and use it where only the OS matters and not the threads Library. Until now, 'HAVE_LINUXTHREADS' was used to indicate "Target is Linux" in many places. When we support configuration with NPTL but no Linuxthreads, this misuse must cease. configure.in: Step 2 of the switch to support configuration with NPTL: Define a new CPP symbol that the target OS is Linux. Until now, 'HAVE_LINUXTHREADS' was used to indicate "Target is Linux" in many places. When we support configuration with NPTL but no Linuxthreads, this misuse must cease. include/my_global.h: Step 2 of the switch to support configuration with NPTL: Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library. mysys/thr_mutex.c: Step 2 of the switch to support configuration with NPTL: Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library. sql/stacktrace.c: Step 2 of the switch to support configuration with NPTL: Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library. sql/stacktrace.h: Step 2 of the switch to support configuration with NPTL: Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library. tools/mysqlmanager.c: Step 2 of the switch to support configuration with NPTL: Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library.
* | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/bug9911unknown2005-04-272-0/+25
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1
| * | | | | | | BUG#9911 RENAME TABLE of type ARCHIVE fails with .ARN file errorunknown2005-04-262-0/+25
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Implemented ha_archive::rename_table - Added testcases for rename mysql-test/r/archive.result: Addd testcase for rename of archive table mysql-test/t/archive.test: Addd testcase for rename of archive table sql/examples/ha_archive.cc: Implement special version of rename table that does not care it the .arn file is missing sql/examples/ha_archive.h: Implement special version of rename table that does not care it the .arn file is missing
* | | | | | | Fix compile issues in Intel C/C++ compiler (Bug #9063)unknown2005-04-251-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acinclude.m4: Use AC_LANG_PUSH/POP instead of _SAVE/RESTORE Add test to get type of 'struct rlimit' Switch order of including stdlib.h and declaration being tested to match how it will be used in regular code. configure.in: Call MYSQL_TYPE_STRUCT_RLIMIT macro sql/mysqld.cc: Use STRUCT_RLIMIT for getting type of struct rlimit.
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-251-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-4.1-bg10040
| * | | | | | Fix for func_sapdb failures on 64-bit platforms (aka Bug #10040 unknown2005-04-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "'func_sapdb' fails on 64bit build hosts") sql/item_timefunc.cc: calc_time_diff(): Fixed yet another signedness problem.
* | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-222-52/+77
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
| * | | | | | | Fix for Bug #9318 drop database does not drop ndb tablesunknown2005-04-222-52/+77
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Bug#7806 - insert on duplicate key and auto-update of timestampunknown2005-04-222-9/+16
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A fix of the original patch. Correctly clear a bit from an enum value.
* | | | | | C99 Portability fixunknown2005-04-211-3/+3
|/ / / / /
* | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-211-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
| * | | | | Fix for failing ps_7ndb.test, force write_row when batching inserts so that ↵unknown2005-04-211-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | update of primary key is done before next value to insert
* | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-211-0/+16
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| * | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-211-1/+13
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| * \ \ \ \ \ Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-201-0/+16
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| | * | | | | - manual mergeunknown2005-04-191-0/+16
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | sql/share/Makefile.am: Auto merged
| | | * | | | - added missing copyright headers to several Makefile.am's (noticedunknown2005-04-191-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | while testing changes to the mysql-copyright scripts libmysqld/examples/Makefile.am: - added a copyright header sql/share/Makefile.am: - added a copyright header tools/Makefile.am: - added a copyright header
* | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-214-15/+99
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
| * | | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2005-04-201-1/+13
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-4.1-0 sql/sql_select.cc: Auto merged
View Lorry Controller Status