- 10 Aug, 2006 10 commits
-
-
unknown authored
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge sql/mysql_priv.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge sql/ha_myisam.cc: Auto merged sql/ha_myisammrg.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_partition.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_view.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged storage/innobase/row/row0mysql.c: Auto merged
-
unknown authored
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-runtine-merge mysql-test/r/sp.result: Auto merged mysql-test/t/sp.test: Auto merged sql/sql_base.cc: Auto merged
-
unknown authored
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge client/mysql.cc: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/func_str.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/t/date_formats.test: Auto merged mysql-test/t/func_str.test: Auto merged mysql-test/t/ps_1general.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/udf.test: Auto merged mysys/my_open.c: Auto merged BitKeeper/deleted/.del-make_win_src_distribution.sh~f80d8fca44e4e5f1: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_strfunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/time.cc: Auto merged client/mysqltest.c: Manual merge. mysql-test/r/ps_1general.result: Manual merge.
-
unknown authored
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge sql/ha_innodb.cc: Null-merge. storage/innobase/fil/fil0fil.c: Null-merge. storage/innobase/ibuf/ibuf0ibuf.c: Null-merge.
-
unknown authored
into janus.mylan:/usr/home/serg/Abk/m51 configure.in: Auto merged sql/sql_base.cc: Auto merged
-
unknown authored
how did it get in?!? (it's only in local csets so no other tree is affected) sql/sp.cc: revert this patch. how did it get in?!? (it's only in local csets so no other tree is affected)
-
unknown authored
mysql-test/r/mysqldump.result: update result mysql-test/t/mysqldump.test: update test
-
unknown authored
into janus.mylan:/usr/home/serg/Abk/m51 configure.in: Auto merged
-
unknown authored
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge sql/sql_base.cc: Auto merged
-
- 09 Aug, 2006 6 commits
-
-
unknown authored
After merge fix sql/table.cc: After merge fix sql/sql_base.cc: After merge fix
-
unknown authored
into lmy004.:/work/mysql-5.1-runtime sql/sp.cc: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/r/sp.result: manual merge mysql-test/t/sp.test: manual merge
-
unknown authored
create function func() returns char(10) binary ... is no more possible. This will be reenabled when bug 2676 "DECLARE can't have COLLATE clause in stored procedure" is fixed. Fix after 2nd review mysql-test/r/sp-error.result: update result mysql-test/r/sp.result: update result mysql-test/t/sp-error.test: add a test case for bug#20701 BINARY keyword should be forbidden in stored procedures mysql-test/t/sp.test: Fix test case which uses binary for the return value of a function. It's no more possible after fix for bug#20701 BINARY keyword should be forbidden in SP Fix few glitches where ; is used instead of | . The delimiter is | sql/sql_yacc.yy: Fix for bug#20701 BINARY keyword should be forbidden in stored routines create function func() returns char(10) binary ... is no more possible. This will be reenabled when bug 2676 "DECLARE can't have COLLATE clause in stored procedure" is fixed
-
unknown authored
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-rt-merge sql/handler.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_base.cc: Auto merged sql/share/errmsg.txt: Auto merged
-
unknown authored
sql/sql_parse.cc: Post-merge fix. No need to check DB name twice.
-
unknown authored
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822: Auto merged configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/warnings.result: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/mysqlbinlog.test: Auto merged mysql-test/t/udf.test: Auto merged mysql-test/t/warnings.test: Auto merged BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb: Auto merged sql/field.cc: Auto merged sql/handler.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sp.cc: Auto merged sql/sql_class.cc: Auto merged support-files/mysql.spec.sh: Auto merged mysql-test/r/sp.result: Manual merge. Place 5.0 test before 5.1 test. mysql-test/t/sp.test: Manual merge. Place 5.0 test before 5.1 test. mysys/my_bitmap.c: Manual merge. scripts/make_binary_distribution.sh: Manual merge. sql/Makefile.am: Manual merge. sql/slave.cc: Manual merge. sql/sql_class.h: Manual merge. sql/sql_parse.cc: Manual merge. sql/sql_select.cc: Manual merge. tests/mysql_client_test.c: Manual merge.
-
- 08 Aug, 2006 5 commits
-
-
unknown authored
into sunlight.local:/local_work/leak_fix-5.1-mysql sql/sql_lex.h: Auto merged sql/sql_view.cc: Auto merged sql/sql_view.h: Auto merged sql/unireg.h: Auto merged sql/sql_base.cc: Manual merge sql/table.cc: Manual merge
-
unknown authored
(this is not a fix to the bug, but simply to disable the test in order to push a 5.0 to 5.1 merge) This merge contains: Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge mysql-test/t/disabled.def: BUG #21524 "'ps' test fails in --ps-protocol test AMD64 bit" (this is not a fix to the bug, but simply to disable the test in order to push a 5.0 to 5.1 merge)
-
unknown authored
Correct memory leak fix sql/unireg.h: Correct memory leak fix sql/table.cc: Correct memory leak fix sql/sql_view.h: Correct memory leak fix sql/sql_view.cc: Correct memory leak fix sql/sql_lex.h: Correct memory leak fix sql/sql_base.cc: Correct memory leak fix
-
unknown authored
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-5.0-merge2 Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149: Auto merged configure.in: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/t/date_formats.test: Auto merged mysql-test/t/merge.test: Auto merged sql/field.h: Auto merged sql/ha_myisammrg.cc: Auto merged BitKeeper/deleted/.del-libmysqld.vcproj~a75d5b9a5967dea0: Auto merged BitKeeper/deleted/.del-libmysqld_ia64.dsp~578ab58d5f281d2a: Auto merged BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56: Auto merged BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb: Auto merged BitKeeper/deleted/.del-mysqld_ia64.dsp~7f8cf84d81ee04e2: Auto merged BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e: Auto merged BitKeeper/deleted/.del-mysqldemb.vcproj~54c64d55ccc51a7c: Auto merged BitKeeper/deleted/.del-mysqldemb_ia64.dsp~c7f7d75d542393cd: Auto merged BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e: Auto merged BitKeeper/deleted/.del-mysqldmax_ia64.dsp~25006b7cc0725ad1: Auto merged sql/item_strfunc.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/sql_class.cc: Auto merged support-files/mysql.spec.sh: Auto merged include/my_base.h: Hand merge of conflicts (5.0-5.1 merge), second try Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge mysql-test/r/federated.result: Hand merge of conflicts (5.0-5.1 merge), second try Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge mysql-test/t/federated.test: Hand merge of conflicts (5.0-5.1 merge), second try Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge sql/field.cc: Hand merge of conflicts (5.0-5.1 merge), second try Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge sql/ha_federated.cc: Hand merge of conflicts (5.0-5.1 merge), second try Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge sql/handler.cc: Hand merge of conflicts (5.0-5.1 merge), second try Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge tests/mysql_client_test.c: Hand merge of conflicts (5.0-5.1 merge), second try Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
-
unknown authored
we didn't check for NULL value of the lex_create_info->db_type pointer. The pointer is NULL in the case, when the engine name is unknown to the server. This happens with NDB on Windows. sql/sql_table.cc: don't check pointer in the case, it is NULL
-
- 04 Aug, 2006 2 commits
-
-
unknown authored
The following procedure was not possible if max_sp_recursion_depth is 0 create procedure show_proc() show create procedure show_proc; Actually there is no recursive call but the limit is checked. Solved by temporarily increasing the thread's limit just before the fetch from cache and decreasing after that. mysql-test/r/sp.result: update result mysql-test/t/sp.test: Test for bug #21416 SP: Recursion level higher than zero needed for non-recursive call sql/sp.cc: Increase the max_sp_recursion_depth temporarily for SHOW CREATE PROCEDURE call. This call is in fact not recursive but is counted as such. Outcome, it will work always but if max_sp_recursion_depth is reached we are going to cache one more sp_head instance.
-
unknown authored
into mysql.com:/home/cps/mysql/devel/5.1-curs-bug sql/ha_myisam.cc: Auto merged sql/handler.h: Auto merged sql/sql_table.cc: Auto merged mysql-test/r/log_tables.result: SCCS merged mysql-test/t/log_tables.test: SCCS merged
-
- 03 Aug, 2006 16 commits
-
-
unknown authored
into maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
-
unknown authored
into rama.(none):/home/jimw/my/mysql-5.1-clean
-
unknown authored
-
unknown authored
Use "--source" command instead of "source", makes mysql-test-run.pl dtecte this as test case that need binlog format row.
-
unknown authored
into maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c
-
unknown authored
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. mysql-test/r/log_tables.result: Update result file. Note: there are warnings in result file. This is because of CSV bug (Bug #21328). They should go away after it is fixed. mysql-test/t/log_tables.test: Add a test for the bug sql/ha_myisam.cc: Add log table handling to myisam: as log tables use concurrent insert, they are typically locked with TL_CONCURRERENT_INSERT lock. So, disallow other threads to attempt locking of the log tables in incompatible modes. Because otherwise the threads will wait for the tables to be unlocked forever. sql/handler.cc: Add a function to check if a table we're going to lock is a log table and if the lock mode we want allowed sql/handler.h: Add a new function to check compatibility of the locking sql/log.cc: we shouldn't close the log table if and only if this particular table is already closed sql/log.h: add new functions to check if a log is enabled sql/share/errmsg.txt: add new error messages sql/sql_table.cc: DROP and ALTER TABLE should not work on log tables if the log tables are enabled storage/csv/ha_tina.cc: move function to check if the locking for the log tables allowed to handler class, so that we can reuse it in other engines. storage/myisam/mi_extra.c: add new ::extra() flag processing to myisam storage/myisam/mi_open.c: init log table flag storage/myisam/mi_write.c: update status after each write if it's a log table storage/myisam/myisamdef.h: Add new log table flag to myisam share. We need it to distinguish between usual and log tables, as for the log tables we should provide concurrent insert in a different way than for usual tables: we want new rows to be immediately visible to other threads.
-
unknown authored
-
unknown authored
sql/ha_federated.cc: After merge fix
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint sql/ha_federated.cc: Manual merge
-
unknown authored
Due to incorrect handling of FLUSH TABLES, log tables were marked for flush, but not reopened. Later we started to wait for the log table to be closed (disabled) after the flush. And as nobody disabled logs in concurrent treads, the command lasted forever. After internal consultations it was decided to skip logs during FLUSH TABLES. The reasoning is that logging is done in the "log device", whatever it is which is always active and controlled by FLUSH LOGS. So, to flush logs one should use FLUSH LOGS, and not FLUSH TABLES. mysql-test/r/log_tables.result: update result file mysql-test/t/log_tables.test: add a test for the bug sql/sql_base.cc: Skip log tables during FLUSH TABLES
-
unknown authored
-
unknown authored
into maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c mysql-test/t/warnings.test: 5.0 -> 5.1 manual merge, part 3 of 3 (or more?) sql/handler.cc: 5.0 -> 5.1 manual merge, part 3 of 3 (or more?) sql/mysql_priv.h: 5.0 -> 5.1 manual merge, part 3 of 3 (or more?) sql/mysqld.cc: 5.0 -> 5.1 manual merge, part 3 of 3 (or more?) sql/set_var.cc: 5.0 -> 5.1 manual merge, part 3 of 3 (or more?) mysql-test/r/warnings.result: 5.0 -> 5.1 manual merge, part 3 of 3 (or more?)
-
unknown authored
into maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-b mysql-test/r/insert_select.result: SCCS merged sql/sql_insert.cc: SCCS merged
-
unknown authored
-
unknown authored
New test cases. Names with umlauts don't compare well on Windows. mysql-test/r/alter_table.result: Bug#18775 - Temporary table from alter table visible to other threads New test results mysql-test/r/backup.result: Bug#18775 - Temporary table from alter table visible to other threads New test results mysql-test/t/alter_table.test: Bug#18775 - Temporary table from alter table visible to other threads New test case. Names with umlauts don't compare well on Windows. mysql-test/t/backup.test: Bug#18775 - Temporary table from alter table visible to other threads New test case. Names with umlauts don't compare well on Windows.
-
- 02 Aug, 2006 1 commit
-
-
unknown authored
Reverting part of the patch. NDB has unencoded names in their data dictionary.
-