- 31 Jul, 2006 1 commit
-
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
-
- 26 Jul, 2006 1 commit
-
-
unknown authored
innobase/ibuf/ibuf0ibuf.c: Applied innodb-4.1-ss32 snapshot. ibuf_fixed_addr_page(): Add parameter space. As the insert buffer B-tree is only located in the system tablespace (space 0), IBUF_TREE_ROOT_PAGE_NO is only special in space 0.
-
- 13 Jul, 2006 1 commit
-
-
unknown authored
into mysql.com:/home/hf/work/mysql-4.1.16017 include/sql_common.h: Auto merged libmysql/libmysql.c: Auto merged libmysqld/lib_sql.cc: Auto merged sql-common/client.c: Auto merged sql/sql_parse.cc: Auto merged libmysqld/libmysqld.c: merging
-
- 12 Jul, 2006 2 commits
- 11 Jul, 2006 3 commits
-
-
unknown authored
into zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5 mysql-test/r/date_formats.result: Auto merged mysql-test/t/date_formats.test: Auto merged
-
unknown authored
The problem is that the author used the wrong function to send a warning to the user about truncation of data. push_warning() takes a constant string and push_warning_printf() takes a format and variable arguments to fill it. Since the string we were complaining about contains percent characters, the printf() code interprets the "%Y" et c. that the user sends. That's wrong, and often causes a crash, especially if the date mentions seconds, "%s". A alternate fix would be to use push_warning_printf(..., "%s", warn_buff) . mysql-test/r/date_formats.result: Test that an invalid date doesn't crash the server. We should get a warning back instead of a dead socket. mysql-test/t/date_formats.test: Test that an invalid date doesn't crash the server. We should get a warning back instead of a dead socket. sql/time.cc: Don't try to use warn_buf as the start of a varible arguement list to send to a warning-formatted my_vsnprintf() .
-
unknown authored
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-4.1 client/sql_string.h: Auto merged sql/item_func.h: Auto merged sql/sql_string.h: Auto merged configure.in: Null merge. sql/item_strfunc.cc: Null merged
-
- 10 Jul, 2006 3 commits
- 09 Jul, 2006 1 commit
-
-
unknown authored
closing temp tables through end_thread had a flaw in binlog-off branch of close_temporary_tables where next table to close was reset via table->next for (table= thd->temporary_tables; table; table= table->next) which was wrong since the current table instance got destoyed at close_temporary(table, 1); The fix adapts binlog-on branch method to engage the loop's internal 'next' variable which holds table->next prior table's destoying. sql/sql_base.cc: no-binlog branch is fixed: scanning across temporary_tables must be careful to save next table since the current is being destroyed inside of close_temporary. binlog-is-open case is ok.
-
- 08 Jul, 2006 4 commits
-
-
unknown authored
into chilla.local:/home/mydev/mysql-4.1-amerge
-
unknown authored
into chilla.local:/home/mydev/mysql-4.1-amerge
-
unknown authored
into chilla.local:/home/mydev/mysql-4.1-amerge sql/sql_class.cc: Auto merged
-
unknown authored
into chilla.local:/home/mydev/mysql-4.1-amerge myisam/mi_create.c: Auto merged
-
- 07 Jul, 2006 3 commits
-
-
unknown authored
have a better test (and so this should be null-merged there). ALSO! Make it so that it accepts NPTL as a valid _equivalent_ implementation.
-
unknown authored
ndb/src/kernel/blocks/ERROR_codes.txt: DbtupTabDesMan: add merge with left buddies ndb/src/kernel/blocks/dbtup/Dbtup.hpp: DbtupTabDesMan: add merge with left buddies ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp: DbtupTabDesMan: add merge with left buddies ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp: DbtupTabDesMan: add merge with left buddies ndb/test/ndbapi/testDict.cpp: DbtupTabDesMan: add merge with left buddies ndb/test/run-test/daily-basic-tests.txt: DbtupTabDesMan: add merge with left buddies
-
unknown authored
into mysql.com:/usr/home/bar/mysql-4.1.b17647 sql/sql_acl.cc: Auto merged
-
- 06 Jul, 2006 9 commits
-
-
unknown authored
into bodhi.netgear:/opt/local/work/mysql-4.1-19399 sql/table.cc: Auto merged
-
unknown authored
dropping/creating tables". The bug could lead to a crash when multi-delete statements were prepared and used with temporary tables. The bug was caused by lack of clean-up of multi-delete tables before re-execution of a prepared statement. In a statement like DELETE t1 FROM t1, t2 WHERE ... the first table list (t1) is moved to lex->auxilliary_table_list and excluded from lex->query_tables or select_lex->tables. Thus it was unaccessible to reinit_stmt_before_use and not cleaned up before re-execution of a prepared statement. mysql-test/r/ps.result: Updated test results (Bug#19399) mysql-test/t/ps.test: A test case for Bug#19399 "Stored Procedures 'Lost Connection' when dropping/creating tables": test that multi-delete tables are cleaned up properly before re-execution. sql/sql_lex.cc: Always initialize auxilliary_table_list when we initialize the lex: this way we don't have to check that lex->sql_command equals to SQLCOM_DELETE_MULTI whenever we need to access auxilliary_table_list. In particular, in reinit_stmt_before_use we can simply check that auxilliary_table_list is not NULL and clean it up if the check returns a true value. sql/sql_prepare.cc: Move the one table clean-up functionality to a method of st_table_list. Clean up auxiliary_table_list if it's not empty. sql/table.cc: Implement st_table_list::reinit_before_use(). sql/table.h: Declare st_table_list::reinit_before_use().
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
-
unknown authored
- don't invalidate tables that are in state RETRIEVING
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
-
unknown authored
into mysql.com:/space_old/pekka/ndb/version/my41
-
unknown authored
"temporary table with data directory option fails" myisam should not use user-specified table name when creating temporary tables and use generated connection specific real name. Test included. myisam/mi_create.c: Bug#8706 When creating a temporary table with directory override, ensure that the real filename is using the hidden temporary name otherwise multiple clients cannot have same named temporary tables without conflict. mysql-test/r/myisam.result: Bug#8706 Test for bug mysql-test/t/myisam.test: Bug#8706 Test for bug
-
- 05 Jul, 2006 2 commits
- 04 Jul, 2006 4 commits
-
-
unknown authored
into mysql.com:/home/mydev/mysql-4.1-bug14400 myisam/mi_rkey.c: Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert" Manual merge sql/sql_class.cc: Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert" Manual merge
-
unknown authored
ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp: DROP did not do merge with right buddies
-
unknown authored
(implemented by by Josh Chamas) libmysqld/Makefile.am: Adding new source file mysql-test/r/date_formats.result: Adding test case mysql-test/t/date_formats.test: Adding test case sql/Makefile.am: Adding new source file BitKeeper/etc/ignore: Added libmysqld/sql_locale.cc to the ignore list sql/item_timefunc.cc: Using current locale data, instead of hard coded English names. sql/mysql_priv.h: Adding new type MY_LOCALE, and declaring new global variables. sql/set_var.cc: Adding "lc_time_names" system variable. sql/set_var.h: Adding "lc_time_names" system variable. sql/sql_cache.cc: Adding lc_time_names as a query cache flag. sql/sql_class.cc: Setting default locale to en_US sql/sql_class.h: Adding locale variable into system_variables. sql/sql_locale.cc: Adding new file with locale data for various languages
-
unknown authored
BitKeeper/etc/config: checkout:get
-
- 01 Jul, 2006 1 commit
-
-
unknown authored
On exactly-sized Strings, the String::c_ptr() function peeked beyond the end of the buffer, possibly into unititialized space to see whether the buffer was NUL-terminated. In a place that did peek improperly, we now use a c_ptr_safe() function, which doesn't peek where it shouldn't. client/sql_string.h: Back-port String::c_ptr_safe(). sql/item_func.h: Describe side-effect behavior. sql/item_strfunc.cc: Use the "_safe" version of c_ptr to avoid looking for a terminating NUL character outside the initialized memory area. Valgrind hates it when one does that, and it theoretically could lead to a SEGV. sql/sql_string.h: Back-port String::c_ptr_safe().
-
- 30 Jun, 2006 5 commits
-
-
unknown authored
into mysql.com:/home/psergey/mysql-4.1-bug16168-push sql/opt_range.cc: Auto merged
-
unknown authored
into mysql.com:/home/my/mysql-4.1
-
unknown authored
into mysql.com:/home/my/mysql-4.1
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
-
unknown authored
into mysql.com:/home/my/mysql-4.1
-