- 30 Mar, 2008 2 commits
- 29 Mar, 2008 6 commits
-
-
unknown authored
into macbook.gmz:/Users/kgeorge/mysql/work/pb-5.1-bugteam mysys/mf_keycache.c: null-merge sql/item_func.cc: null-merge sql/lock.cc: null-merge sql/sql_analyse.cc: null-merge storage/csv/ha_tina.cc: null-merge storage/myisam/mi_check.c: null-merge storage/myisam/mi_keycache.c: null-merge
-
unknown authored
-
unknown authored
into macbook.gmz:/Users/kgeorge/mysql/work/pb-5.1-bugteam BitKeeper/deleted/.del-ha_berkeley.cc: null-merge extra/charset2html.c: Auto merged sql/mysqld.cc: null-merge sql/sql_union.cc: null-merge
-
unknown authored
-
unknown authored
into macbook.gmz:/Users/kgeorge/mysql/work/pb-5.1-bugteam configure.in: null merge libmysql/libmysql.c: null merge sql/ha_ndbcluster.cc: null merge sql/ha_ndbcluster_cond.cc: null merge sql-common/client.c: null merge storage/federated/ha_federated.cc: null merge storage/heap/hp_test2.c: SCCS merged storage/innobase/handler/ha_innodb.cc: null merge storage/myisam/mi_check.c: null merger storage/myisam/mi_delete.c: null merge storage/myisam/mi_dynrec.c: null merge storage/myisam/mi_key.c: null merge storage/myisam/mi_open.c: null merge storage/myisam/mi_packrec.c: null merge storage/myisam/mi_page.c: null merge storage/myisam/mi_search.c: null merge storage/myisam/mi_statrec.c: null merge storage/myisam/mi_test1.c: SCCS merged storage/myisam/mi_test2.c: null merge storage/myisam/mi_test3.c: SCCS merged storage/myisam/mi_write.c: null merge storage/myisammrg/myrg_rkey.c: null merge storage/ndb/src/ndbapi/DictCache.cpp: null merge storage/ndb/src/ndbapi/NdbBlob.cpp: null merge storage/ndb/src/ndbapi/NdbOperationDefine.cpp: null merge storage/ndb/src/ndbapi/NdbOperationInt.cpp: null merge storage/ndb/src/ndbapi/NdbOperationSearch.cpp: null merge
-
unknown authored
-
- 28 Mar, 2008 32 commits
-
-
unknown authored
into amd64.(none):/src/bug26243/my51-bug26243 libmysql/libmysql.c: Auto merged sql/slave.cc: Auto merged sql/sql_select.cc: Auto merged storage/federated/ha_federated.cc: Auto merged storage/myisam/mi_open.c: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged tests/mysql_client_test.c: Auto merged
-
unknown authored
into amd64.(none):/src/bug26243/my51-bug26243
-
unknown authored
-
unknown authored
into quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-bt-merged mysql-test/t/loaddata.test: Auto merged mysql-test/r/loaddata.result: Manually merged. sql/share/errmsg.txt: Manually merged. sql/sql_load.cc: Manually merged.
-
unknown authored
into amd64.(none):/src/bug26243/my51-bug26243
-
unknown authored
into amd64.(none):/src/bug26243/my50-bug26243
-
unknown authored
1. Use 'dat' extension, because it is handled in Makefile.am; 2. Fix typo: the bug id is 35469, not 35649. mysql-test/std_data/bug35469.dat: Rename: mysql-test/std_data/bug35649.data -> mysql-test/std_data/bug35469.dat mysql-test/r/loaddata.result: Update result file. mysql-test/t/loaddata.test: 1. Use 'dat' extension, because it is handled in Makefile.am; 2. Fix typo: the bug id is 35469, not 35649.
-
unknown authored
into amd64.(none):/src/bug26243/my50-bug26243 libmysql/libmysql.c: Auto merged myisam/mi_open.c: Auto merged sql/ha_federated.cc: Auto merged sql/ha_myisammrg.cc: Auto merged sql/slave.cc: Auto merged sql/sql_select.cc: Auto merged tests/mysql_client_test.c: Auto merged
-
unknown authored
into amd64.(none):/src/bug26243/my51-bug26243 libmysql/libmysql.c: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_select.cc: Auto merged storage/federated/ha_federated.cc: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged storage/myisam/mi_open.c: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged tests/mysql_client_test.c: Auto merged
-
unknown authored
sql/log.cc: Reordering initialalizer list to eliminate compiler warnings.
-
unknown authored
into quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-bt
-
unknown authored
into amd64.(none):/src/bug26243/my51-bug26243 dbug/factorial.c: Auto merged dbug/user.r: Auto merged include/my_dbug.h: Auto merged libmysql/libmysql.c: Auto merged sql/item_cmpfunc.cc: Auto merged sql/net_serv.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_select.cc: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged storage/myisam/mi_open.c: Auto merged tests/mysql_client_test.c: Auto merged dbug/dbug.c: Null Merge sql/mysqld.cc: Null Merge sql/opt_range.cc: Null Merge sql/set_var.cc: Null Merge sql/slave.cc: Null Merge storage/federated/ha_federated.cc: Null Merge storage/myisammrg/ha_myisammrg.cc: Null Merge client/mysql.cc: Manual Merge
-
unknown authored
- Backported the 5.1 DBUG to 5.0. - Avoid memory cleanup race on Windows client for CTRL-C client/mysql.cc: Bug#26243 mysql command line crash after control-c - On Windows, the sigint handler shouldn't call mysql_end because the main thread will do so automatically. - Remove unnecessary signal call from the sigint handler. - Call my_end with proper value. dbug/dbug.c: Bug#26243 mysql command line crash after control-c - Backported the 5.1 DBUG library. The old version uses a non-thread safe global variable 'static struct state *stack'. dbug/factorial.c: Bug#26243 mysql command line crash after control-c - Backported the 5.1 DBUG library. The old version uses a non-thread safe global variable 'static struct state *stack'. dbug/user.r: Bug#26243 mysql command line crash after control-c - Backported the 5.1 DBUG library. The old version uses a non-thread safe global variable 'static struct state *stack'. include/my_dbug.h: Bug#26243 mysql command line crash after control-c - Backported the 5.1 DBUG library. The old version uses a non-thread safe global variable 'static struct state *stack'. libmysql/libmysql.c: Bug#26243 mysql command line crash after control-c - Update for new DBUG library. myisam/mi_open.c: Bug#26243 mysql command line crash after control-c - Update for new DBUG library. sql/ha_federated.cc: Bug#26243 mysql command line crash after control-c - Update for new DBUG library. sql/ha_innodb.cc: Bug#26243 mysql command line crash after control-c - Update for new DBUG library. sql/ha_myisammrg.cc: Bug#26243 mysql command line crash after control-c - Update for new DBUG library. sql/item_cmpfunc.cc: Bug#26243 mysql command line crash after control-c - Update for new DBUG library. sql/mysqld.cc: Bug#26243 mysql command line crash after control-c - Update for new DBUG library. sql/net_serv.cc: Bug#26243 mysql command line crash after control-c - Update for new DBUG library. sql/opt_range.cc: Bug#26243 mysql command line crash after control-c - Update for new DBUG library. sql/set_var.cc: Bug#26243 mysql command line crash after control-c - Update for new DBUG library. sql/slave.cc: Bug#26243 mysql command line crash after control-c - Update for new DBUG library. sql/sql_cache.cc: Bug#26243 mysql command line crash after control-c - Update for new DBUG library. sql/sql_select.cc: Bug#26243 mysql command line crash after control-c - Update for new DBUG library. tests/mysql_client_test.c: Bug#26243 mysql command line crash after control-c - Update for new DBUG library.
-
unknown authored
into mats-laptop.(none):/home/bk/b29020-mysql-5.1-rpl sql/sql_insert.cc: Auto merged
-
unknown authored
mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result: Result change. mysql-test/suite/rpl/r/rpl_extraCol_myisam.result: Result change. mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result: Result change. mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test: Removing rows causing tests to be non-deterministic.
-
unknown authored
into moonbone.local:/work/27219-bug-5.1
-
unknown authored
into mysql.com:/home/ram/work/mysql-5.1-bugteam
-
unknown authored
The problem was that LOAD DATA code (sql_load.cc) didn't take into account that there may be items, representing references to other columns. This is a usual case in views. The crash happened because Item_direct_view_ref was casted to Item_user_var_as_out_param, which is not a base class. The fix is to 1) Handle references properly; 2) Ensure that an item is treated as a user variable only when it is a user variable indeed; 3) Report an error if LOAD DATA is used to load data into non-updatable column. mysql-test/r/loaddata.result: Update result file. mysql-test/t/loaddata.test: Add a test case form Bug#35469: server crash with LOAD DATA INFILE to a VIEW. sql/share/errmsg.txt: Introduce a new error. sql/sql_load.cc: Handle reference-items properly. mysql-test/std_data/bug35649.data: Add a data file for the test case.
-
unknown authored
after few delete statements Problem: changing a file size might require that it must be unmapped beforehand. Fix: unmap the file before changing its size. mysql-test/r/temp_table.result: Fix for bug #35392: Delete all statement does not execute properly after few delete statements - test result. mysql-test/t/temp_table.test: Fix for bug #35392: Delete all statement does not execute properly after few delete statements - test case. storage/myisam/mi_delete_all.c: Fix for bug #35392: Delete all statement does not execute properly after few delete statements - unmap file before changing its size as it's required by SetEndOfFile() function (see my_chsize()). - as no other threads allowed to perform concurrent inserts when delete_all is called, mmap_lock locking removed.
-
unknown authored
into moonbone.local:/work/27219-bug-5.1 sql/item_subselect.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/mysql_priv.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/group_by.result: SCCS merged mysql-test/t/group_by.test: SCCS merged sql/item.cc: SCCS merged sql/sql_lex.h: SCCS merged
-
unknown authored
into witty.:/Users/mattiasj/clones/bug21413-51-bugteam
-
unknown authored
into witty.:/Users/mattiasj/clones/bug21413-50-bugteam
-
unknown authored
into mats-laptop.(none):/home/bk/b29020-mysql-5.1-rpl mysql-test/suite/binlog/r/binlog_base64_flag.result: Auto merged mysql-test/suite/binlog/t/binlog_base64_flag.test: Auto merged mysql-test/suite/rpl/r/rpl_row_create_table.result: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/sql_insert.cc: Auto merged
-
unknown authored
into witty.:/Users/mattiasj/clones/bug21413-51-engines sql/sql_insert.cc: Auto merged
-
unknown authored
into witty.:/Users/mattiasj/clones/bug21413-50-engines sql/sql_insert.cc: Manual merge
-
unknown authored
in REPLACE DELAYED post push patch, removing the optimization for copying delayed_insert variables. sql/sql_insert.cc: Bug#21413 - Engine table handler used by multiple threads in REPLACE DELAYED post push patch, removing the optimization for copying delayed_insert variables. (restored some parts which caused errors)
-
unknown authored
The bug allow multiple executing transactions working with non-transactional to interfere with each others by interleaving the events of different trans- actions. Bug is fixed by writing non-transactional events to the transaction cache and flushing the cache to the binary log at statement commit. To mimic the behavior of normal statement-based replication, we flush the transaction cache in row- based mode when there is no committed statements in the transaction cache, which means we are committing the first one. This means that it will be written to the binary log as a "mini-transaction" with just the rows for the statement. Note that the changes here does not take effect when building the server with HAVE_TRANSACTIONS set to false, but it is not clear if this was possible before this patch either. For row-based logging, we also have that when AUTOCOMMIT=1, the code now always generates a BEGIN/COMMIT pair for single statements, or BEGIN/ROLLBACK pair in the case of non-transactional changes in a statement that was rolled back. Note that for the case where changes to a non-transactional table causes a rollback due to error, the statement will now be logged with a BEGIN/ROLLBACK pair, even though some changes has been committed to the non-transactional table. mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test: Removing SHOW BINLOG EVENTS causing test to be non-deterministic. mysql-test/r/ctype_cp932_binlog_row.result: Result change. mysql-test/suite/binlog/r/binlog_base64_flag.result: Result change. mysql-test/suite/binlog/r/binlog_multi_engine.result: Result file change. mysql-test/suite/binlog/r/binlog_row_binlog.result: Result file change. mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result: Result file change. mysql-test/suite/binlog/r/binlog_row_insert_select.result: Result file change. mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result: Result file change. mysql-test/suite/binlog/r/binlog_stm_binlog.result: Result file change. mysql-test/suite/binlog/t/binlog_base64_flag.test: Removing table that will be used in test to prevent failing if preceeding tests forgot to drop the table. mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result: Result file change. mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result: Result file change. mysql-test/suite/rpl/r/rpl_row_create_table.result: Result file change. mysql-test/suite/rpl/r/rpl_row_delayed_ins.result: Result file change. mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result: Result file change. mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result: Result file change. mysql-test/suite/rpl/r/rpl_row_log.result: Result file change. mysql-test/suite/rpl/r/rpl_row_log_innodb.result: Result file change. mysql-test/suite/rpl/r/rpl_row_until.result: Result file change. mysql-test/suite/rpl/r/rpl_slave_skip.result: Result file change. mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result: Result file change. mysql-test/suite/rpl/r/rpl_truncate_2myisam.result: Result file change. mysql-test/suite/rpl/t/rpl_row_create_table.test: Binlog position change. mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test: Binlog position change. mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test: Binlog position change. Added stop position to mysqlbinlog argments to prevent extreneous output. mysql-test/suite/rpl/t/rpl_row_until.test: Binlog position change. mysql-test/suite/rpl/t/rpl_slave_skip.test: Binlog position change. mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test: Removing extreneous SHOW BINLOG EVENTS causing test to be non-deterministic. mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result: Result change. sql/log.cc: Adding variable at_least_one_stmt to denote that there is at least one statement committed to the transaction cache (but there might be more). Removing duplicate checks from binlog_end_trans(). The transaction cache should always be committed or rolled back when this function is called. Correcting conditions for binlog_rollback() and binlog_commit() and removing the previous "invisible commit" in favor of always using explicit commits in the binary log. sql/log_event.cc: Marking table map event to be cached. Removing Muted_query_log_event from code. sql/log_event.h: Removing unused class Muted_query_log_event. sql/sql_insert.cc: Adding missing call to ha_autocommit_or_rollback() for delayed thread. Marking CREATE-SELECT statements as transactional, since they don't need to be logged.
-
unknown authored
into moonbone.local:/work/27219-5.0-opt-mysql sql/item.cc: Auto merged sql/item_subselect.cc: Auto merged sql/item_sum.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_select.cc: Auto merged
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam sql/sql_acl.cc: Auto merged
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam sql/sql_acl.cc: Auto merged sql/sql_select.cc: Auto merged
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam sql/sql_acl.cc: Auto merged
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
-