mariadb

Tree: ab61c15efd

Author	SHA1	Message	Date
Georgi Kodinov	2fa49930ca	revert of the fix for bug #45989 : pushed by mistake.	16 years ago
Mattias Jonsson	8c6d6c0c6c	merge	16 years ago
Georgi Kodinov	b60d59b958	merge	16 years ago
Sergey Glukhov	81391bd00c	Bug#49501 Inefficient information_schema check (system collation) added check_length optimization for I_S_NAME comparison sql/event_data_objects.cc: added check_length optimization for I_S_NAME comparison sql/events.cc: added check_length optimization for I_S_NAME comparison sql/mysql_priv.h: added check_length optimization for I_S_NAME comparison sql/repl_failsafe.cc: added check_length optimization for I_S_NAME comparison sql/sql_db.cc: added check_length optimization for I_S_NAME comparison sql/sql_parse.cc: added check_length optimization for I_S_NAME comparison sql/sql_show.cc: added check_length optimization for I_S_NAME comparison sql/sql_view.cc: added check_length optimization for I_S_NAME comparison sql/table.cc: added check_length optimization for I_S_NAME comparison	16 years ago
Luis Soares	d1d16f9c3f	Fix for BUG#49481 and BUG#49482 reverted. PB2 run uncovered issue that needs further analysis.	16 years ago
Alexander Nozdrin	40271e4f5e	Manual merge from mysql-next-mr. Conflicts: - sql/sql_plugin.cc	16 years ago
Alexander Nozdrin	0835775b7c	Manual merge from mysql-trunk. Conflicts: - support-files/mysql.spec.sh	16 years ago
Alexander Nozdrin	6060c8d3c1	Auto-merge from mysql-next-mr.	16 years ago
Alexander Nozdrin	f143270f2f	Auto-merge from mysql-next-mr.	16 years ago
Mattias Jonsson	eab2be0aee	Bug#47343: InnoDB fails to clean-up after lock wait timeout on REORGANIZE PARTITION There were several problems which lead to this this, all related to bad error handling. 1) There was several bugs preventing the ddl-log to be used for cleaning up created files on error. 2) The error handling after the copy partition rows did not close and unlock the tables, resulting in deletion of partitions which were in use, which lead InnoDB to put the partition to drop in a background queue. sql/ha_partition.cc: Bug#47343: InnoDB fails to clean-up after lock wait timeout on REORGANIZE PARTITION Better error handling, if partition has been created/opened/locked then make sure it is unlocked and closed before returning error. The delete of the newly created partition is handled by the ddl-log. sql/sql_parse.cc: Bug#47343: InnoDB fails to clean-up after lock wait timeout on REORGANIZE PARTITION Fix a bug found when experimenting, thd could really be NULL here, as mentioned in the function header. sql/sql_partition.cc: Bug#47343: InnoDB fails to clean-up after lock wait timeout on REORGANIZE PARTITION Used the correct .frm shadow name to put into the ddl-log. Really use the ddl-log to handle errors. sql/sql_table.cc: Bug#47343: InnoDB fails to clean-up after lock wait timeout on REORGANIZE PARTITION Fixes of the ddl-log when used as error recovery (no crash). When executing an entry from memory (not read from disk) the name_len was not set correctly.	16 years ago
Georgi Kodinov	5ba1dd0474	Bug #45989 take 2 : memory leak after explain encounters an error in the query. Fixes a leak after materializing a GROUP BY subquery to a temp table when the subquery has a blob column in the SELECT list. Fixed by correctly destructing temporary buffers after doing the conversion.	16 years ago
Alexander Nozdrin	33c075e842	Enable sys_vars and perfschema test suites for regular PB builds.	16 years ago
Alexander Nozdrin	3408d7c2da	Auto-merge from mysql-5.1-rpl-merge.	16 years ago
Mattias Jonsson	ae3e094191	merge	16 years ago
unknown	377d710296	BUG#47418 RBR fails, failure with mixup of base/temporary/view 'CREATE TABLE IF NOT EXISTS ... SELECT' statement were causing 'CREATE TEMPORARY TABLE ...' to be written to the binary log in row-based mode (a.k.a. RBR), when there was a temporary table with the same name. Because the 'CREATE TABLE ... SELECT' statement was executed as 'INSERT ... SELECT' into the temporary table. Since in RBR mode no other statements related to temporary tables are written into binary log, this sometimes broke replication. This patch changes behavior of 'CREATE TABLE [IF NOT EXISTS] ... SELECT ...'. it ignores existence of temporary table with the same name as table being created and is interpreted as attempt to create/insert into base table. This makes behavior of 'CREATE TABLE [IF NOT EXISTS] ... SELECT' consistent with how ordinary 'CREATE TABLE' and 'CREATE TABLE ... LIKE' behave.	16 years ago
Georgi Kodinov	7a7147c5b4	Bug #46175 : NULL read_view and consistent read assertion The optimizer must not continue executing the current query if e.g. the storage engine reports an error. This is somewhat hard to implement with Item::val_xxx() because they do not have means to return error code. This is why we need to check the thread's error state after a call to one of the Item::val_xxx() methods. Fixed store_key_item::copy_inner() to return an error state if an error happened during the call to Item::save_in_field() because it calls Item::val_xxx(). Also added similar checks to related places.	16 years ago
Sergey Glukhov	b6685d35dc	compilation failure fix	16 years ago
Sergey Glukhov	5a4a98af14	backported: -WL#2822 INFORMATION_SCHEMA.ROUTINES: Add missing columns -WL#2003 INFORMATION_SCHEMA: PARAMETERS view -addon for 'I_S optimization' WL	16 years ago
Alexey Kopytov	0a5b406fc5	Manual merge from mysql-5.1-bugteam into mysql-trunk-merge. Conflicts: Text conflict in .bzr-mysql/default.conf Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result Text conflict in mysql-test/t/mysqlbinlog.test Text conflict in sql/sql_acl.cc Text conflict in sql/sql_servers.cc Text conflict in sql/sql_update.cc Text conflict in support-files/mysql.spec.sh	16 years ago
Georgi Kodinov	0305aea88a	merge	16 years ago
Georgi Kodinov	a07ca23755	merge of version change. Added not_embedded to the new dbug_sync test file.	16 years ago
unknown	5d27920514	Fix for perfschema.binlog_stmt failure: Problem: The test case failed because: (i) warning text in result file differed from the warning output by the server, and (ii) binlog contents in result file did not show the statements logged wrapped in BEGIN/COMMIT as it is the case after WL 2687. Solution: We update the result file, but first we change the unsafe warning text to also refer to performance_schema table(s). This required changing the result files for existing test cases that provide output for warnings related to ER_BINLOG_UNSAFE_SYSTEM_TABLE. "Grepping" in result files, shows that only binlog_unsafe contained reference to such a warning. We also update the result file with the missing BEGIN/COMMIT statements.	16 years ago
MySQL Build Team	b41937105a	Automerge the 5.5.1-m2 release back into the main branch.	16 years ago
MySQL Build Team	10824d2ec1	Automerge main branch with Trondheim copy.	16 years ago
Alfranio Correia	3f1899e858	Removed garbage from the mysqld--help-win	16 years ago
Alfranio Correia	dd5d5d32fc	merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge	16 years ago
Alfranio Correia	b4c0c1550c	merge mysql-next-mr --> mysql-5.1-rpl-merge Conflicts: Text conflict in sql/sql_insert.cc	16 years ago
Luis Soares	32aa612819	Fix for BUG#49481 and BUG#49482. BUG#49481: RBR: MyISAM and bit fields may cause slave to stop on delete: cant find record BUG#49482: RBR: Replication may break on deletes when MyISAM tables + char field are used When using MyISAM tables, despite the fact that the null bit is set for some fields, their old value is still in the row. This can cause the comparison of records to fail when the slave is doing an index or range scan. We fix this by avoiding memcmp for MyISAM tables when comparing records. Additionally, when comparing field by field, we first check if both fields are not null and if so, then we compare them. If just one field is null we return failure immediately. If both fields are null, we move on to the next field.	16 years ago
Alfranio Correia	1b09e10508	merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1	16 years ago
Alfranio Correia	eef6ea03d2	Augmented the rpl_ndb_binlog_format_errors to verify if a slave running in the STMT mode aborts the SQL Thread if it receives changes in ROW mode and such changes are not processed.	16 years ago
Olav Sandstaa	ec680f0a2b	Fix for Bug#50221 Server refuses to start from non-default installdir on Solaris 32-bit When starting mysqld it did not recognize most of the options given on the command line when it was compiled for 32-bit Solaris using Sun Studio compiler. The cause for this was that most of the entries in the my_long_options array contained "garbage" data. The garbage data was caused by a compiler bug. When initilizing the def_value member for the "default-storage-engine" entry it was initialized like this: (longlong)"MyISAM" i.e. casting a 32 bit pointer to a 64 bit integer value. Due to the compiler bug only 4 bytes was allocated (instead of 8 bytes). This caused everything following this entry to be stored at a location that was 4 byte wrong. The fix/work-around for this problem is initialize the def_value for default-storage-engine in my_long_options to 0 and instead initialize the default_storage_engine variable to "MyISAM" in init_common_variables(). sql/mysqld.cc: Due to a bug in Sun Studio compiler when generating 32 bit code the initialization of the def_value member of the default-storage-engine entry in my_long_options only got 4 bytes allocated instead of 8 bytes. The compiler bug was triggered by casting a 32 bit pointer to a 64 bit integer value in the initialization code for my_long_options. To avoid triggering the compiler bug the intialization of the def_value in my_long_options is set to 0 and instead the default_storage_engine is initialized to "MyISAM" in init_common_variables().	16 years ago
Alexander Barkov	8dfc3fbbab	WL#4583 Case conversion in Asian character sets modified: include/m_ctype.h - Changing type for tolower/toupper members, to store values >= 0xFFFF. - Adding function prototypes mysql-test/r/ctype_big5.result mysql-test/r/ctype_cp932_binlog_stm.result mysql-test/r/ctype_eucjpms.result* mysql-test/r/ctype_euckr.result mysql-test/r/ctype_gb2312.result mysql-test/r/ctype_gbk.result mysql-test/r/ctype_sjis.result mysql-test/r/ctype_ujis.result mysql-test/t/ctype_big5.test mysql-test/t/ctype_cp932_binlog_stm.test mysql-test/t/ctype_eucjpms.test mysql-test/t/ctype_euckr.test mysql-test/t/ctype_gb2312.test mysql-test/t/ctype_gbk.test mysql-test/t/ctype_sjis.test mysql-test/t/ctype_ujis.test - Adding tests strings/ctype-big5.c strings/ctype-cp932.c strings/ctype-euc_kr.c strings/ctype-eucjpms.c strings/ctype-gb2312.c strings/ctype-gbk.c strings/ctype-sjis.c - Adding upper/lower case conversion data strings/ctype-mb.c - Adding handling of upper/lower conversion for multi-byte characters. strings/ctype-ujis.c - Implementing shared upper/lower conversion functions for ujis and eucjpms - Adding upper/lower case conversion data for ujis	16 years ago
Luis Soares	5ae7b3c996	BUG#50018: binlog corruption when table has many columns Small fix in the test case. Changed the UNLOCK tables to happen after each insert.	16 years ago
Luis Soares	ebc009c9b3	BUG#50018: automerge from 5.1-bt local --> 5.1-bt local latest.	16 years ago
Alexander Nozdrin	9b05972226	Auto-merge from mysql-next-mr.	16 years ago
Alexander Nozdrin	a6165accb3	Auto-merge from mysql-next-mr.	16 years ago
Georgi Kodinov	7ecd6c6d02	version change	16 years ago
Luis Soares	18a8f3c8cc	Disabled binlog_unsafe due to BUG#50312.	16 years ago
Kristofer Pettersson	a0fe99a859	automerge	16 years ago
Alfranio Correia	85df1ce4b4	merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge	16 years ago
Mats Kindahl	9b4470ecd4	Merging with mysql-5.1-rep+2-delivery1	16 years ago
Mats Kindahl	cf40bc3f56	Replacing error variable that was lost.	16 years ago
Mats Kindahl	4abdd9f14a	Merging with mysql-5.1-rep+2-delivery1	16 years ago
Alfranio Correia	40949a3110	merge mysql-next-mr --> mysql-5.1-rpl-merge Conflicts: Text conflict in sql/log.cc Text conflict in sql/slave.cc Text conflict in sql/sql_base.cc	16 years ago
Mats Kindahl	a561e53943	WL#5151: Conversion between different types when replicating Replace c_ptr() calls with c_ptr_safe() calls to avoid valgrind warnings. Adding code to to handle the case that no metadata was present in the table map for the column. Allow first parameter to unpack_row() to be NULL, in which case no source tables is used and hence no checks nor conversions are done. Clarifying some comments and fixing documentation for unpack_row().	16 years ago
Kristofer Pettersson	b3dd4d9486	Bug#33982 debug assertion and crash reloading grant tables after sighup or kill In certain rare cases when a process was interrupted during a FLUSH PRIVILEGES operation the diagnostic area would be set to an error state but the function responsible for the operation would still signal success. This would lead to a debug assertion error later on when the server would attempt to reset the DA before sending the error message. This patch fixes the issue by assuring that reload_acl_and_cache() always fails if an error condition is raised. The second issue was that a KILL could cause a console error message which referred to a DA state without first making sure that such a state existed. This patch fixes this issue in two different palces by first checking DA state before fetching the error message. sql/sql_acl.cc: * Make sure that there is an error to print before attempting to do so. * Minor style change: change 1 to TRUE for clarity. sql/sql_parse.cc: * Always fail reload_acl_and_cache() if the query was killed. sql/sql_servers.cc: * Make sure that there is an error to print before attempting to do so.	16 years ago
Martin Hansson	34e5c6750d	Merge of fix for Bug#48157.	16 years ago
Ramil Kalimullin	200f083c2d	Auto-merge.	16 years ago
Ramil Kalimullin	08dfd4ad0c	Auto-merge.	16 years ago
Georgi Kodinov	90274e3709	merge	16 years ago

1 2 3 4 5 ...

60367 Commits (ab61c15efdf8da4152a98ee218b537ad6da625a9) All Branches Search

60367 Commits (ab61c15efdf8da4152a98ee218b537ad6da625a9)

All Branches