- 12 Sep, 2006 1 commit
-
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
-
- 08 Sep, 2006 2 commits
-
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.0
-
unknown authored
sql/mysql_priv.h: after merge fix added charset parameter to check_string_length() function sql/slave.h: after merge fix USERNAME_LENGTH const is changed to USERNAME_BYTE_LENGTH sql/sql_parse.cc: after merge fix added charset parameter to check_string_length() function sql/sql_yacc.yy: after merge fix added charset parameter to check_string_length() function
-
- 07 Sep, 2006 5 commits
-
-
unknown authored
configure.in: NDB version and general version must be (kept) in sync - do that.
-
unknown authored
into trift2.:/M50/push-5.0 configure.in: Auto merged
-
unknown authored
To be pushed to both the cloned 5.0.25 and the general 5.0 tree. configure.in: When creating "commercial" sources, this file gets modified by "mysql-copyright". For this, it is essential that the string 'cmd-line-utils/readline/Makefile' be alone on its line ...
-
unknown authored
include/mysql_com.h: USERNAME_LENGTH is changed to USERNAME_BYTE_LENGTH mysql-test/r/ctype_utf8.result: result fix mysql-test/t/ctype_utf8.test: test fix sql/sp.cc: NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer sql/sp_head.cc: NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer sql/sql_acl.cc: NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer sql/sql_class.h: NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer sql/sql_parse.cc: NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer Function check_string_length() is fixed, now it check string lenght in symbols sql/sql_repl.h: NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.0 include/mysql_com.h: Auto merged mysql-test/t/ctype_utf8.test: Auto merged sql/item_func.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/slave.cc: Auto merged sql/sql_parse.cc: Auto merged sql-common/client.c: Auto merged sql/sql_select.cc: Auto merged sql/table.cc: Auto merged mysql-test/r/ctype_utf8.result: manual merge sql/sql_acl.cc: manual merge
-
- 06 Sep, 2006 8 commits
-
-
unknown authored
into maint1.mysql.com:/data/localhome/tsmith/bk/50 sql/mysqld.cc: Auto merged sql/stacktrace.c: Auto merged sql/stacktrace.h: Auto merged
-
unknown authored
into maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx sql/mysqld.cc: Manual merge sql/stacktrace.c: Manual merge; undo trivial change to avoid automerge. sql/stacktrace.h: Manual merge; undo trivial change which avoided automerge
-
unknown authored
-
unknown authored
Fix OPT_MYISAM_STATS_METHOD case, where the NULLS_EQUAL and NULLS_NOT_EQUAL methods were mixed up sql/mysqld.cc: Fix OPT_MYISAM_STATS_METHOD case, bug #21054
-
unknown authored
sql/stacktrace.c: stacktrace dumps for amd64 (backport fix for bug 21250 to mysql-4.1) sql/stacktrace.h: stacktrace dumps for amd64 (backport fix for bug 21250 to mysql-4.1)
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
-
unknown authored
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
-
- 05 Sep, 2006 1 commit
-
-
unknown authored
In 5.0 we made LOAD DATA INFILE autocommit in all engines, while only NDB wanted that. Users and trainers complained that it affected InnoDB and was a change compared to 4.1 where only NDB autocommitted. To revert to the behaviour of 4.1, we move the autocommit logic out of mysql_load() into ha_ndbcluster::external_lock(). The result is that LOAD DATA INFILE commits all uncommitted changes of NDB if this is an NDB table, its own changes if this is an NDB table, but does not affect other engines. Note: even though there is no "commit the full transaction at end" anymore, LOAD DATA INFILE stays disabled in routines (re-entrency problems per a comment of Pem). Note: ha_ndbcluster::has_transactions() does not give reliable results because it says "yes" even if transactions are disabled in this engine... sql/ha_ndbcluster.cc: NDB wants to do autocommit if this is LOAD DATA INFILE. For this to not affect all other engines, we move the logic inside ha_ndbcluster. sql/sql_load.cc: This ha_enable_transaction() in mysql_load() forced an autocommit in all engines, while only NDB wants to do that. So we move the logic inside ha_ndbcluster.cc. mysql-test/include/loaddata_autocom.inc: test for engines to see if they autocommit or not in LOAD DATA INFILE mysql-test/r/loaddata_autocom_innodb.result: result for InnoDB (no autocommit) mysql-test/r/loaddata_autocom_ndb.result: result for NDB (autocommit) mysql-test/r/rpl_ndb_innodb_trans.result: result for InnoDB+NDB transactions. Observe that when ROLLBACK cannot rollback the LOAD DATA INFILE in NDB it issues warning 1196 as appropriate. mysql-test/t/loaddata_autocom_innodb.test: test that InnoDB does not autocommit in LOAD DATA INFILE. mysql-test/t/loaddata_autocom_ndb.test: test that NDB does autocommit in LOAD DATA INFIL mysql-test/t/rpl_ndb_innodb_trans-slave.opt: need to tell the slave to use innodb mysql-test/t/rpl_ndb_innodb_trans.test: test of transactions mixing NDB and InnoDB. To see if ROLLBACK rolls back in both engines, with the exception of LOAD DATA INFILE which does not roll back NDB: we see that a LOAD DATA INFILE in NDB commits all what has been done in NDB so far, commits its changes, but does not commit in other engines.
-
- 04 Sep, 2006 11 commits
-
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb sql/log.cc: Auto merged sql/sql_class.h: Auto merged
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/50-work sql/log.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_repl.cc: merge
-
unknown authored
fix deadlock if master switches log file in parallell with "show master logs" sql/log.cc: add raw_get_current_log which dont take log mutex sql/sql_class.h: add raw_get_current_log which dont take log mutex sql/sql_repl.cc: Fix lock order i.e first log_lock then index_lock
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0 sql/sql_select.cc: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0 sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
Fix problem where mysql-test-run.pl fails to start up the mysqld after a failed test. Shows up on win hosts where one failed test case make subsequent ones fails with error "Could not open connection 'default': 2003 Can't connect to MySQL server on 'localhost'" mysql-test/lib/mtr_process.pl: Reset the associated "pid" of masters and slave when building the list of processes to shutdown.
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
-
unknown authored
into maint1.mysql.com:/data/localhome/tnurnberg/my50-21913 mysql-test/r/func_time.result: Auto merged mysql-test/t/func_time.test: Auto merged
-
unknown authored
into salvation.intern.azundris.com:/home/tnurnberg/21913/my50-21913 21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver. Variable character_set_results can legally be NULL (for "no conversion.") This could result in a NULL deref that crashed the server. Fixed. (Although ran some additional precursory tests to see whether I could break anything else, but no breakage so far.) mysql-test/r/func_time.result: Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver. Prove DATE_FORMAT() no longer crashes the server when character_set_results is NULL (which is a legal value and means, "no conversion"). mysql-test/t/func_time.test: Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver. Prove DATE_FORMAT() no longer crashes the server when character_set_results is NULL (which is a legal value and means, "no conversion"). sql/sql_string.cc: Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver. Avoid NULL deref in my_charset_same() -- if !to_cs, we won't need to compare because it is magic for, "no conversion."
-
unknown authored
Variable character_set_results can legally be NULL (for "no conversion.") This could result in a NULL deref that crashed the server. Fixed. (Although ran some additional precursory tests to see whether I could break anything else, but no breakage so far.) mysql-test/r/func_time.result: Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver. Prove DATE_FORMAT() no longer crashes the server when character_set_results is NULL (which is a legal value and means, "no conversion"). mysql-test/t/func_time.test: Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver. Prove DATE_FORMAT() no longer crashes the server when character_set_results is NULL (which is a legal value and means, "no conversion"). sql/sql_string.cc: Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver. Avoid NULL deref in my_charset_same() -- if !to_cs, we won't need to compare because it is magic for, "no conversion."
-
- 03 Sep, 2006 1 commit
-
-
unknown authored
into maint1.mysql.com:/data/localhome/tsmith/bk/mysql-5.0-maint
-
- 02 Sep, 2006 5 commits
-
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.0-cmake
-
unknown authored
into maint2.mysql.com:/data/localhome/tsmith/bk/50
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.0-cmake
-
- 01 Sep, 2006 6 commits
-
-
unknown authored
into maint1.mysql.com:/data/localhome/cmiller/mysql-5.0-maint
-
unknown authored
Provide a more extensible, easier-to-change way of reordering test cases. mysql-test/lib/mtr_cases.pl: Provide a more extensible, easier-to-change way of reordering test cases.
-
unknown authored
-
unknown authored
configure.in: added win subdir
-
unknown authored
scripts/make_win_bin_dist: BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/scripts/make_win_bin_dist client/mysqlbinlog.cc: Fix for cmake build: Cmake doesn't use the VC++ files extra/comp_err.c: fixed windows crash (debug): We can't call DBUG_RETURN after my_end. include/my_dbug.h: added missing empty define for DBUG_LEAVE to prevent precompiler errors when compiling in non_debug mode mysql-test/mysql-test-run.pl: Added support for new cmake release and debug paths. mysql-test/t/system_mysql_db_fix.test: This test requires unix shell script mysql_fix_previleges_tables -> skip under windows mysys/my_seek.c: Fix for windows debug crash. However this solution is bad: we should never call lseek with an invalid file pointer. sql/ha_archive.cc: Fixed windows crash: We need dup in gzdopen to keep the filehandle open, otherwise subsequent calls to mysql_close will fail/crash.
-
unknown authored
into dl145s.mysql.com:/data/tkatchaounov/5.0-bug-21787 mysql-test/r/limit.result: Auto merged mysql-test/t/limit.test: Auto merged sql/sql_select.cc: Adjust the fix for BUG#21787 for 5.0
-