summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix Bug #18559 "log tables cannot change engine, andpetr/cps@mysql.com/owlet.2006-08-0314-24/+403
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | gets deadlocked when dropping w/ log on" Log tables rely on concurrent insert machinery to add data. This means that log tables are always opened and locked by special (artificial) logger threads. Because of this, the thread which tries to drop a log table starts to wait for the table to be unlocked. Which will happen only if the log table is disabled. Alike situation happens if one tries to alter a log table. However in addition to the problem above, alter table calls check_if_locking_is_allowed() routine for the engine. The routine does not allow alter for the log tables. So, alter doesn't start waiting forever for logs to be disabled, but returns with an error. Another problem is that not all engines could be used for the log tables. That's because they need concurrent insert. In this patch we: (1) Explicitly disallow to drop/alter a log table if it is currently used by the logger. (2) Update MyISAM to support log tables (3) Allow to drop log tables/alter log tables if log is disabled At the same time we (4) Disallow to alter log tables to unsupported engine (after this patch CSV and MyISAM are alowed) Recommit with review fixes.
* Fix windows build of libmysqld. Curious why pushbuild did notandrey@lmy004.2006-07-181-1/+1
| | | | | catch that. Stale CMakeLists.txt
* Fix information_schema.result after a manual merge.kostja@bodhi.local2006-07-151-8/+46
|
* Merge bodhi.local:/opt/local/work/tmp_mergekostja@bodhi.local2006-07-1512-39/+126
|\ | | | | | | into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.0konstantin@mysql.com2006-07-0113-44/+169
| |\ | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-runtime
| | * Remove an unused variable.konstantin@mysql.com2006-07-011-7/+0
| | |
| | * Remove a couple of unused/barely used names.konstantin@mysql.com2006-07-013-10/+3
| | |
| | * Bug#17226: Variable set in cursor on first iteration is assignedkroki@mysql.com2006-06-303-3/+59
| | | | | | | | | | | | | | | | | | | | | second iterations value During assignment to the BLOB variable in routine body the value wasn't copied.
| | * Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0kroki@mysql.com2006-06-304-13/+96
| | |\ | | | | | | | | | | | | into mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug20230
| | | * Bug#20230: routine_definition is not nullkroki@mysql.com2006-06-304-13/+96
| | | | | | | | | | | | | | | | | | | | SHOW CREATE PROCEDURE and SHOW CREATE FUNCTION are fixed as well as INFORMATION_SCHEMA.ROUTINES.ROUTINE_NAME.
| | * | Merge mysql.com:/opt/local/work/tmp_mergekonstantin@mysql.com2006-06-295-6/+25
| | |\ \ | | | |/ | | |/| | | | | into mysql.com:/opt/local/work/mysql-5.0-merge
* | | | Merge mysql.com:/home/psergey/tmp_merge-2sergefp@pylon.mylan2006-07-143-4/+225
|\ \ \ \ | |/ / / | | | | | | | | into mysql.com:/home/psergey/mysql-5.1-merge-2
| * | | Post-merge fixsergefp@mysql.com2006-07-012-2/+0
| | | |
| * | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2006-07-013-4/+227
| |\ \ \ | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-5.0-bug16168-merge
| | * \ \ Merge mysql.com:/home/psergey/mysql-4.1-bug16168-pushsergefp@mysql.com2006-07-013-4/+227
| | |\ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-5.0-bug16168-merge
| | | * | | BUG#16168: Wrong results from range optimizer, "Use_count: Wrong count for ↵sergefp@mysql.com2006-06-303-4/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | key ..." warnings: - Added comments. - Make SEL_ARG::clone() set SEL_ARG::elements in the created copy.
* | | | | | Post-merge fixes.kostja@bodhi.local2006-07-144-12/+4
| | | | | |
* | | | | | Merge bodhi.local:/opt/local/work/tmp_mergekostja@bodhi.local2006-07-1319-118/+204
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
| * | | | | After merge fixesmonty@mysql.com2006-06-304-4/+5
| | | | | |
| * | | | | Merge mysql.com:/home/my/mysql-4.1monty@mysql.com2006-06-309-54/+149
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2006-06-303-1/+31
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| | | * | | | Reverted wrong bug fix (Bug#11228)monty@mysql.com2006-06-303-1/+31
| | | | | | |
| | * | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2006-06-301-0/+6
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
| | | * \ \ \ \ Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1tomas@poseidon.ndb.mysql.com2006-06-301-0/+6
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
| | * | \ \ \ \ \ Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1kroki@mysql.com2006-06-302-4/+56
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | into mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug20152
| | | * | | | | | bug #20152: mysql_stmt_execute() overwrites parameter bufferskroki@mysql.com2006-06-302-4/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a parameter bind MYSQL_TYPE_DATE in a prepared statement, the time part of the MYSQL_TIME buffer was written to zero in mysql_stmt_execute(). The param_store_date() function in libmysql.c worked directly on the provided buffer. Changed to use a copy of the buffer.
| | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2006-06-308-21/+20
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| | | * \ \ \ \ \ \ Merge monty@192.168.0.9:/home/my/mysql-4.1monty@mysql.com2006-06-304-17/+13
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| | | | * | | | | | Don't read ~/.my.cnf in mysqldump.testmonty@mysql.com2006-06-304-17/+13
| | | | | | | | | |
| | | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2006-06-305-5/+8
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| * | | | | | | | | Merge mysqldev@production:my/mysql-5.0-releaseknielsen@mysql.com2006-06-309-77/+90
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/mysql/tmp-5.0
| | * \ \ \ \ \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseknielsen@mysql.com2006-06-307-75/+71
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/mysql/mysql-5.0-release
| | | * | | | | | | | | BUG#20769: Dangling pointer in ctype_recoding test case.knielsen@mysql.com2006-06-307-75/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some functions dealing with strings and character sets, the wrong pointers were saved for restoration in THD::rollback_item_tree_changes(). This could potentially cause random corruption or crashes. Fixed by passing the original Item ** locations, not local stack copies. Also remove unnecessary use of default arguments.
| | * | | | | | | | | | mysql.spec.sh:kent@mysql.com2006-06-303-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable old RPM strip my_global.h: Fixed wrong cast, which caused problems with gcc 4.0 and floats in prepared statements (Bug #19694) mysqlmanager.vcproj: Place output files in common release/debug directory
| * | | | | | | | | | | Fix Windows build problem following previous push.knielsen@mysql.com2006-06-301-1/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1elliot@mysql.com2006-06-302-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
| | * | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1evgen@sunlight.local2006-06-302-6/+6
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | into sunlight.local:/local_work/autopush/merge-4.1
| | | * | | | | | | | | Merge mysql.com:/mnt/storeage/mysql-4.1iggy@mysql.com2006-06-292-6/+6
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/mnt/storeage/mysql-4.1_bug19298
| | | | * | | | | | | | | Bug#19298 mysqld_safe still uses obsolete --skip-locking parameteriggy@mysql.com2006-06-272-6/+6
| | | | | |_|_|_|_|/ / / | | | | |/| | | | | | |
| * | | | | | | | | | | Fixing windows build.elliot@mysql.com2006-06-301-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2006-06-306-7/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| | * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/my/mysql-4.1monty@mysql.com2006-06-3012-10/+44
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| | | * | | | | | | | | | Fixed include file usagemonty@mysql.com2006-06-305-5/+8
| | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hp_test2 now works again Fixed wrong cast, which caused problems with gcc 4.0 and floats in prepared statements (Bug #19694)
| * | | | | | | | | | | Mergeevgen@moonbone.local2006-06-307-5/+38
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1evgen@moonbone.local2006-06-3021-163/+244
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/merge-4.1
| | | * | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2006-06-291-24/+59
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
| | | * \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/stewart/Documents/MySQL/4.1/ndbstewart@mysql.com2006-06-291-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/4.1/main
| | | | * \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/stewart/Documents/MySQL/4.1/ndbstewart@mysql.com2006-06-281-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/4.1/merge
| * | | | | | | | | | | | | Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-optevgen@moonbone.local2006-06-30173-1208/+4556
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/merge-5.0
| | * | | | | | | | | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-maintomas@poseidon.ndb.mysql.com2006-06-301-44/+56
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/5.0-merge
View Lorry Controller Status