mariadb

Tree: 4afe31568b

Author	SHA1	Message	Date
unknown	4afe31568b	Merge mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.0-engines into mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines mysql-test/suite/rpl/r/rpl_dual_pos_advance.result: Auto merged mysql-test/suite/rpl/t/rpl_dual_pos_advance.test: SCCS merged	18 years ago
unknown	3ec867679a	BUG#13861 - START SLAVE UNTIL may stop 1 evnt too late if log-slave-updates and circul repl This is a test case fix for BUG#13861. mysql-test/r/rpl_dual_pos_advance.result: Fix for a test case for BUG#13861. mysql-test/t/rpl_dual_pos_advance.test: Fix for a test case for BUG#13861. master_pos_wait() requires slave sql thread running. But it is not guaranteed for this test case. As we use start slave until it may execute all events and shutdown before master_pos_wait() is started. On the other hand it is safe just to wait for slave to stop here, as start slave returns _after_ sql thread is started.	18 years ago
unknown	1bffc51066	Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines into pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1	18 years ago
unknown	fd826522c5	Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0 into pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1 sql/item.cc: Auto merged sql/item_func.cc: Auto merged	18 years ago
unknown	7b5da0aa77	Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines into pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1 configure.in: Auto merged include/mysql/plugin.h: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/r/partition_innodb.result: Auto merged mysql-test/t/information_schema.test: Auto merged mysql-test/t/partition_innodb.test: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/repl_failsafe.cc: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_partition.cc: Auto merged sql/sql_plugin.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged storage/myisam/mi_dynrec.c: Auto merged	18 years ago
unknown	1e8b11c656	Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines into pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0 sql/item.cc: Auto merged sql/item_func.cc: Auto merged	18 years ago
unknown	0f5c666936	Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-engines into mysql.com:/home/bar/mysql-work/mysql-5.1.b27580	18 years ago
unknown	215c9456ac	After merge fix	18 years ago
unknown	e0075179c3	Merge mysql.com:/home/svoj/devel/mysql/BUG34656/mysql-5.1-engines into mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines	18 years ago
unknown	0d4fb8b492	Merge mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.0-engines into mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines	18 years ago
unknown	928c449ad2	Merge mysql.com:/home/svoj/devel/bk/mysql-5.1-engines into mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines	18 years ago
unknown	e78f628499	Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines into mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.0-engines	18 years ago
unknown	44df0f6e9c	BUG#34656 - KILL a query = Assertion failed: m_status == DA_ERROR \|\| m_status == DA_OK Reading from information_scema.tables or information_schema.columns may cause assertion failure in debug builds. This may happen under rare circumstances when information_schema fails to get information about a table (e.g. when a connection is killed). This happens because open_normal_and_derived_tables() can return an error without setting an error message in THD. But information_schema attempts to get an error message from THD unconditionally. With this fix information_schema attempts to get an error message from THD only in case error message is set in THD. mysql-test/r/information_schema.result: A test case for BUG#34656. mysql-test/t/information_schema.test: A test case for BUG#34656. sql/item_func.cc: Set proc info to "User sleep". sql/sql_show.cc: open_normal_and_derived_tables() can return an error without setting an error message in THD. That means we must access error message conditionally, only in case thd->is_error() is true.	18 years ago
unknown	a03f1a4c1d	Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b27580v2 into mysql.com:/home/bar/mysql-work/mysql-5.1.b27580 Additonal after merge fix mysql-test/r/ctype_cp1250_ch.result: Auto merged mysql-test/r/ctype_euckr.result: Auto merged mysql-test/r/ctype_uca.result: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/t/ctype_cp1250_ch.test: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result: Auto merged sql/item_create.cc: After merge fix	18 years ago
unknown	613fe6acb6	Merge mysql.com:/home/bar/mysql-work/mysql-5.0-engines into mysql.com:/home/bar/mysql-work/mysql-5.1-engines	18 years ago
unknown	f2c9483dd5	additional test fixes for bug 27580	18 years ago
unknown	89fb97c500	Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b27580 into mysql.com:/home/bar/mysql-work/mysql-5.0.b27580v2 mysql-test/r/ctype_ucs.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/include/ctype_common.inc: after merge fix mysql-test/r/ctype_big5.result: after merge fix mysql-test/r/ctype_euckr.result: after merge fix mysql-test/r/ctype_gb2312.result: after merge fix mysql-test/r/ctype_gbk.result: after merge fix mysql-test/r/ctype_uca.result: after merge fix	18 years ago
unknown	8e4a3fcbc9	Bug#23097 mysql can't insert korean on mysql prompt. Problem: libedit is a very pure-ASCII oriented library, and it is not aware of extended (0x80..0xFF) or even multi-byte characters. It considered such characters as non-printable and didn't allow to input them. Fix: make libedit think that all bytes >= 0x80 are printable. cmd-line-utils/libedit/el.h: Defining macro, a locale's isprint() replacement. We'll consider all 8bit values as printable characters. cmd-line-utils/libedit/key.c: Changing isprint() to el_isprint(). cmd-line-utils/libedit/map.c: Changing isprint() to el_isprint(). cmd-line-utils/libedit/read.c: Changing isprint() to el_isprint(). cmd-line-utils/libedit/refresh.c: Changing isprint() to el_isprint().	18 years ago
unknown	6c2420ed3c	Merge trift2.:/MySQL/M50/mysql-5.0 into trift2.:/MySQL/M51/mysql-5.1 configure.in: No propagation of a 5.0 version number change to 5.1	18 years ago
unknown	4d09306dd1	Raise the version number after cloning 5.0.58	18 years ago
unknown	0ab3eab55c	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt	18 years ago
unknown	29cfe3161a	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime into mysql.com:/Users/davi/mysql/mysql-5.1-runtime	18 years ago
unknown	1ed34fed33	Bug#23924 general_log truncates queries with character set introducers. Problem: logging of utf8-incompatible binary strings didn't work Fix: hex-encoding of incompatible sequences. mysql-test/r/log_tables.result: Adding test mysql-test/t/log_tables.test: Adding test sql/field.cc: Copying with hex escaping sql/field.h: New field flag sql/log.cc: Marking the column "general_log.argument" as hex-escaping field. sql/sql_string.cc: New function to copy strings with hex-encoding of incompatible characters. sql/sql_string.h: Prototype for the new function	18 years ago
unknown	de534f2bc1	Fix for Bug#31947: Declare with a reserved word succeeded. READ_ONLY token was accidentally placed into wrong place ('ident' rule). The proper place is in the 'keyword_sp' rule. The manual should be re-generated after this patch, because the manual depends on the 'keyword_sp' rule. sql/sql_yacc.yy: Move READ_ONLY token to the 'keyword_sp' rule.	18 years ago
unknown	05480a8863	Merge buzz.(none):/home/davi/mysql-5.0-runtime into buzz.(none):/home/davi/mysql-5.1-runtime mysql-test/r/ps.result: Auto merged mysql-test/t/limit.test: Auto merged mysql-test/t/ps.test: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/sql_class.h: Auto merged sql/item.cc: Auto merged mysql-test/suite/rpl/r/rpl_user_variables.result: Manual merge mysql-test/suite/rpl/t/rpl_user_variables.test: Manual merge sql/sql_yacc.yy: Manual merge	18 years ago
unknown	8b77945615	Post-merge fix for Bug 33851. The initialization order of members must match the order which they were declared in the class definition. sql/item.cc: Fix initialization order, parameter was the last one declared.	18 years ago
unknown	33a4e76090	Bug#34655 Compile error Rename client_last_error to last_error and client_last_errno to last_errno to not break connectors which use the internal net structure for error handling. include/mysql_com.h: Rename client_last_error to last_error, client_last_errno to last_errno. include/mysql_h.ic: Rename client_last_error to last_error, client_last_errno to last_errno. libmysql/libmysql.c: Rename client_last_error to last_error, client_last_errno to last_errno. libmysql/manager.c: Rename client_last_error to last_error, client_last_errno to last_errno. libmysqld/lib_sql.cc: Rename client_last_error to last_error, client_last_errno to last_errno. libmysqld/libmysqld.c: Rename client_last_error to last_error, client_last_errno to last_errno. server-tools/instance-manager/mysql_connection.cc: Rename client_last_error to last_error, client_last_errno to last_errno. sql/log_event.cc: Rename client_last_error to last_error, client_last_errno to last_errno. sql-common/client.c: Rename client_last_error to last_error, client_last_errno to last_errno. sql/log_event_old.cc: Rename client_last_error to last_error, client_last_errno to last_errno. sql/net_serv.cc: Rename client_last_error to last_error, client_last_errno to last_errno. sql/repl_failsafe.cc: Rename client_last_error to last_error, client_last_errno to last_errno.	18 years ago
unknown	1164e2bc7a	Bug#33851 Passing UNSIGNED param to EXECUTE returns ERROR 1210 The problem is that passing anything other than a integer to a limit clause in a prepared statement would fail. This limitation was introduced to avoid replication problems (e.g: replicating the statement with a string argument would cause a parse failure in the slave). The solution is to convert arguments to the limit clause to a integer value and use this converted value when persisting the query to the log. mysql-test/r/limit.result: Update test case result. mysql-test/r/ps.result: Add test case result for Bug#33851 mysql-test/r/rpl_user_variables.result: Test case result for replication of prepared statement with limit clause. mysql-test/t/limit.test: Test parameters to limit clause. mysql-test/t/ps.test: Add test case for Bug#33851 mysql-test/t/rpl_user_variables.test: Test replication of a parameter which value is converted. sql/item.cc: Convert value to integer if it's a parameter to a limit clause. sql/item.h: Flag signal that item is a parameter to a limit clause. sql/item_func.cc: Const member functions, object is not mutated. sql/sql_class.h: Const member functions, object is not mutated. sql/sql_yacc.yy: Flag that item is a parameter to a limit clause.	18 years ago
unknown	944f2599fe	Disable test case due to Bug#34891: sp_notembedded.test fails sporadically. mysql-test/r/sp_notembedded.result: Disable test case. mysql-test/t/sp_notembedded.test: Disable test case.	18 years ago
unknown	ce7b8e1248	Fix for Bug#34852: SHOW OPEN TABLES output is not repeatable (show_check.test fails sporadically). Fix test case for Bug#12183 to make it stable. mysql-test/r/show_check.result: Fix result file. mysql-test/t/show_check.test: Make test case for Bug#12183 stable.	18 years ago
unknown	ba3112b539	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime into mysql.com:/Users/davi/mysql/mysql-5.1-runtime	18 years ago
unknown	e9068d0b73	Fix for team tree failure. Synchronously wait for the query state to reach the desired value. mysql-test/r/flush_read_lock_kill.result: Update test case result. mysql-test/t/flush_read_lock_kill.test: Wait for the debug synchronization point to be reached.	18 years ago
unknown	b3cc07838d	Merge quad.:/mnt/raid/alik/MySQL/devel/5.0-rt into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-build tests/mysql_client_test.c: Manually merged.	18 years ago
unknown	da413e4217	Fix information_schema.test to be case-insensitive.	18 years ago
unknown	b43f8f695c	Eliminate compilation warning.	18 years ago
unknown	83bcd5dfab	BUG#13861 - START SLAVE UNTIL may stop 1 evnt too late if log-slave-updates and circul repl After merge fixes. mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt: Rename: mysql-test/t/rpl_dual_pos_advance-slave.opt -> mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt mysql-test/include/wait_for_slave_sql_to_stop.inc: Do not change connection if it was requested by caller (needed for circular replication tests). mysql-test/suite/rpl/t/rpl_dual_pos_advance.test: Let include/wait_for_slave_sql_to_stop.inc know that we do not want to change connection to slave. sql/rpl_rli.cc: After merge fix. sql/rpl_rli.h: After merge fix. sql/slave.cc: After merge fix.	18 years ago
unknown	e78d896c3f	Bug#34889 mysql_client_test::test_mysql_insert_id test fails sporadically Disable the test case. tests/mysql_client_test.c: Disable test case.	18 years ago
unknown	6dd9666d0f	Update Bug#12713 test results to take into account fixed bugs (29157, 33846)	18 years ago
unknown	eec647badb	Merge mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.0-engines into mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines mysql-test/suite/rpl/r/rpl_dual_pos_advance.result: Auto merged sql/log_event.cc: Auto merged sql/slave.h: Use local. mysql-test/suite/rpl/t/rpl_dual_pos_advance.test: Manual merge. sql/slave.cc: Manual merge.	18 years ago
unknown	432bc1f259	Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines into mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.0-engines	18 years ago
unknown	fe7035a73a	Merge quad.:/mnt/raid/alik/MySQL/devel/5.0-rt into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt mysql-test/r/view.result: Auto merged	18 years ago
unknown	336f2c7e51	Merge quad.:/mnt/raid/alik/MySQL/devel/5.1 into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged client/mysqltest.c: Auto merged mysql-test/r/view.result: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged sql/handler.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_connect.cc: Auto merged sql/sql_parse.cc: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/suite/rpl_ndb/t/disabled.def: Manually merged. mysql-test/t/disabled.def: Manually merged.	18 years ago
unknown	a86e504f59	Merge quad.:/mnt/raid/alik/MySQL/devel/5.0 into quad.:/mnt/raid/alik/MySQL/devel/5.0-rt-merged mysql-test/r/view.result: Auto merged	18 years ago
unknown	fb3f8bdbb6	Merge mysql.com:/Users/davi/mysql/bugs/34424-5.1 into mysql.com:/Users/davi/mysql/mysql-5.1-runtime	18 years ago
unknown	2aa0927d9c	Fix the remaining memory leaks (mysql_client_test). tests/mysql_client_test.c: Fix the remaining memory leaks.	18 years ago
unknown	bf9bb656a6	Bug#34424 query_cache_debug.test leads to valgrind warnings Bug#34678 @@debug variable's incremental mode The problem is that the per-thread debugging settings stack wasn't being deallocated before the thread termination, leaking the stack memory. The chosen solution is to push a new state if the current is set to the initial settings and pop it (free) once the thread finishes. dbug/dbug.c: Move dbug parser out of _db_set_ to a separate function and make _db_set_ push a new stack if the corrent one is set to the initial settings. dbug/user.r: Update DBUG_SET description. mysql-test/t/disabled.def: Re-enable test case which triggered the leak. mysys/my_thr_init.c: Pop a pushed state, nop if stack is empty. sql/set_var.cc: Handle incremental debug settings. mysql-test/r/variables_debug.result: Add new test case result for Bug#34678 mysql-test/t/variables_debug.test: Add new test case for Bug#34678	18 years ago
unknown	6b9db6d213	Valgrind errors in mysql_client_test. tests/mysql_client_test.c: Fix a memory leak. Run the test for Bug#28386 only if logging to tables is enabled.	18 years ago
unknown	0a1c0059df	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime into dipika.(none):/opt/local/work/mysql-5.1-runtime	18 years ago
unknown	226e682139	We never check the return value of mysql_frm_type for an error. Do not try to push an error into the error stack as it will be ignored anyway.	18 years ago
unknown	fd31753387	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime into mysql.com:/Users/davi/mysql/mysql-5.1-runtime tests/mysql_client_test.c: Auto merged	18 years ago

1 2 3 4 5 ...

53195 Commits (4afe31568b1b30d71d85b4ede412417c657d712f) All Branches Search

53195 Commits (4afe31568b1b30d71d85b4ede412417c657d712f)

All Branches