mariadb

Tree: 5a53be655c

Author	SHA1	Message	Date
unknown	dad4291b78	Manual merge with Conflicts: sql_udf.cc	16 years ago
He Zhenxing	2b16517522	Backport Bug#37148 to 5.1	16 years ago
Hakan Kuecuekyilmaz	9308987362	Fix for https://bugs.launchpad.net/maria/+bug/509795 Result of reverse_lookup("localhost") is system depended. Therefore we disable the result of it.	16 years ago
Sergey Vojtovich	16471fecc7	Merge InnoDB snapshot with mysql-5.1-bugteam.	16 years ago
Sergey Vojtovich	d93550cb80	Applying InnoDB snapshot, fixes BUG#49396. Detailed revision comments: r6471 \| calvin \| 2010-01-16 01:43:27 +0200 (Sat, 16 Jan 2010) \| 4 lines branches/5.1: fix bug#49396: main.innodb test fails in embedded mode Change replace_result by using $MYSQLD_DATADIR. Tested in both embedded mode and normal server mode.	16 years ago
Sergey Glukhov	4a10f7b46c	Bug#49501 Inefficient information_schema check (system collation), addon removed wrongly introduced strlen calls sql/events.cc: removed wrongly introduced strlen calls sql/mysql_priv.h: removed wrongly introduced strlen calls sql/repl_failsafe.cc: removed wrongly introduced strlen calls sql/sql_db.cc: removed wrongly introduced strlen calls sql/sql_parse.cc: removed wrongly introduced strlen calls sql/sql_show.cc: removed wrongly introduced strlen calls	16 years ago
Sergey Vojtovich	f996e36de9	Disabled innodb-autoinc-44030 due to BUG#47621.	16 years ago
Sergey Vojtovich	b6a739f6d7	Applying InnoDB snapshot Detailed revision comments: r6492 \| sunny \| 2010-01-21 09:38:35 +0200 (Thu, 21 Jan 2010) \| 1 line branches/5.1: Add reference to bug#47621 in the comment.	16 years ago
Sergey Vojtovich	dab7c82fe5	Applying InnoDB snapshot Detailed revision comments: r6489 \| sunny \| 2010-01-21 02:57:50 +0200 (Thu, 21 Jan 2010) \| 2 lines branches/5.1: Factor out test for bug#44030 from innodb-autoinc.test into a separate test/result files.	16 years ago
Sergey Vojtovich	407e6e309e	Applying InnoDB snapshot Detailed revision comments: r6488 \| sunny \| 2010-01-21 02:55:08 +0200 (Thu, 21 Jan 2010) \| 2 lines branches/5.1: Factor out test for bug#44030 from innodb-autoinc.test into a separate test/result files.	16 years ago
Sergey Vojtovich	12665e79e4	Applying InnoDB snapshot, fixes BUG#46193. Detailed revision comments: r6424 \| marko \| 2010-01-12 12:22:19 +0200 (Tue, 12 Jan 2010) \| 16 lines branches/5.1: In innobase_initialize_autoinc(), do not attempt to read the maximum auto-increment value from the table if innodb_force_recovery is set to at least 4, so that writes are disabled. (Bug #46193) innobase_get_int_col_max_value(): Move the function definition before ha_innobase::innobase_initialize_autoinc(), because that function now calls this function. ha_innobase::innobase_initialize_autoinc(): Change the return type to void. Do not attempt to read the maximum auto-increment value from the table if innodb_force_recovery is set to at least 4. Issue ER_AUTOINC_READ_FAILED to the client when the auto-increment value cannot be read. rb://144 by Sunny, revised by Marko	16 years ago
Sergey Vojtovich	9aaa3cc4df	Applying InnoDB snapshot Detailed revision comments: r6422 \| marko \| 2010-01-12 11:34:27 +0200 (Tue, 12 Jan 2010) \| 3 lines branches/5.1: Non-functional change: Make innobase_get_int_col_max_value() a static function. It does not access any fields of class ha_innobase.	16 years ago
Sergey Vojtovich	f65b3f7889	Applying InnoDB snapshot, fixes BUG#49238. Detailed revision comments: r6421 \| jyang \| 2010-01-12 07:59:16 +0200 (Tue, 12 Jan 2010) \| 8 lines branches/5.1: Fix bug #49238: Creating/Dropping a temporary table while at 1023 transactions will cause assert. Handle possible DB_TOO_MANY_CONCURRENT_TRXS when deleting metadata in row_drop_table_for_mysql(). rb://220, approved by Marko	16 years ago
unknown	3cae7d1187	Bug #49132 Replication failure on temporary table + DDL In RBR, DDL statement will change binlog format to non row-based format before it is binlogged, but the binlog format was not be restored, and then manipulating a temporary table can not reset binlog format to row-based format rightly. So that the manipulated statement is binlogged with statement-based format. To fix the problem, restore the state of binlog format after the DDL statement is binlogged. mysql-test/extra/rpl_tests/rpl_tmp_table_and_DDL.test: Added the test file to verify if executing DDL statement before trying to manipulate a temporary table causes row-based replication to break with error 'table does not exist'. mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result: Correct the test result, all the above binlog event should be row-based after the bug49132 is fixed IN RBR. mysql-test/suite/ndb/r/ndb_tmp_table_and_DDL.result: Test result for bug#49132 base on ndb engine. mysql-test/suite/ndb/t/ndb_tmp_table_and_DDL.test: Added the test file to verify if executing DDL statement before trying to manipulate a temporary table causes row-based replication to break with error 'table does not exist' base on ndb engine. mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result: Test result for bug#49132 base on myisam engine. mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test: Added the test file to verify if executing DDL statement before trying to manipulate a temporary table causes row-based replication to break with error 'table does not exist' base on myisam engine. sql/event_db_repository.cc: Added code to restore the state of binlog format after the DDL statement is binlogged. sql/events.cc: Added code to restore the state of binlog format after the DDL statement is binlogged. sql/sp.cc: Added code to restore the state of binlog format after the DDL statement is binlogged. sql/sql_acl.cc: Added code to restore the state of binlog format after the DDL statement is binlogged. sql/sql_udf.cc: Added code to restore the state of binlog format after the DDL statement is binlogged.	16 years ago
Magne Mahre	f42a200e9e	Post-commit fix of two tests The WL#5154 commit added a couple of warning messages that was not fixed in the result files for two RPL tests.	16 years ago
Luis Soares	73f10f0662	BUG#49481: RBR: MyISAM and bit fields may cause slave to stop on delete: cant find record Some engines return data for the record. Despite the fact that the null bit is set for some fields, their old value may still in the row. This can happen when unpacking an AI from the binlog on top of a previous record in which a field is set to NULL, which previously contained a value. Ultimately, this may cause the comparison of records to fail when the slave is doing an index or range scan. We fix this by deploying a call to reset() for each field that is set to null while unpacking a row from the binary log. Furthermore, we also add mixed mode test case to cover the scenario where updating and setting a field to null through a Query event and later searching it through a rows event will succeed. Finally, we also change the reset() method, from Field_bit class, so that it takes into account bits stored among the null bits and not only the ones stored in the record. mysql-test/suite/rpl/t/rpl_set_null_innodb.test: InnoDB test. mysql-test/suite/rpl/t/rpl_set_null_myisam.test: MyISAM test. mysql-test/suite/rpl_ndb/t/rpl_ndb_set_null.test: NDB test. sql/field.h: Changed reset so that it also clears the bits among the null_bits for the Field_bit class. sql/rpl_record.cc: Resetting field after setting it to null when unpacking row.	16 years ago
Georgi Kodinov	679de2bb5e	Bug #50276 : Security flaw in INFORMATION_SCHEMA.TABLES check_access() returning false for a database does not guarantee that the access is granted to it. This wrong condition in filling the INFORMATION_SCHEMA tables causes extra tables to be returned to the user even if he has no rights to see them. Fixed by correcting the condition.	16 years ago
Georgi Kodinov	e4b7138561	Bug #49445 : Assertion failed: 0, file .\item_row.cc, line 55 with fulltext search and row op. The search for fulltext indexes is searching for some special predicate layouts. While doing so it's not checking for the number of columns of the expressions it tries to calculate. And since row expressions can't return a single scalar value there was a crash. Fixed by checking if the expressions are scalar (in addition to being constant) before calling Item::val_xxx() methods.	16 years ago
Magne Mahre	090c75d2b0	Cleanup fix for WL#5154 that splits commands handling for --default-character-set and --character-set-server such that only the first will give a deprecation warning. Apart from that, the two options should do the same.	16 years ago
Alexander Nozdrin	59f1be1b63	Revert a patch for Bug#48231, which introduced valgrind warnings. Original revision: ------------------------------------------------------------ revision-id: li-bing.song@sun.com-20100130124925-o6sfex42b6noyc6x parent: joro@sun.com-20100129145427-0n79l9hnk0q43ajk committer: <Li-Bing.Song@sun.com> branch nick: mysql-5.1-bugteam timestamp: Sat 2010-01-30 20:49:25 +0800 message: Bug #48321 CURRENT_USER() incorrectly replicated for DROP/RENAME USER; REVOKE/GRANT; ALTER EVENT. The following statements support the CURRENT_USER() where a user is needed. DROP USER RENAME USER CURRENT_USER() ... GRANT ... TO CURRENT_USER() REVOKE ... FROM CURRENT_USER() ALTER DEFINER = CURRENT_USER() EVENT but, When these statements are binlogged, CURRENT_USER() just is binlogged as 'CURRENT_USER()', it is not expanded to the real user name. When slave executes the log event, 'CURRENT_USER()' is expand to the user of slave SQL thread, but SQL thread's user name always NULL. This breaks the replication. After this patch, All above statements are rewritten when they are binlogged. The CURRENT_USER() is expanded to the real user's name and host. ------------------------------------------------------------	16 years ago
Davi Arnaut	2db684572e	Fix for valgrind warning: check whether pointer was initialized. storage/myisammrg/ha_myisammrg.cc: myisam pointer is not relevant if a error was raised.	16 years ago
Georgi Kodinov	1dafac6f35	fixed various pb2 test failures on windows.	16 years ago
Magne Mahre	132b46e96e	WL#5154 Remove deprecated 4.1 features Several items said to be deprecated in the 4.1 manual have never been removed. This worklog adds deprecation warnings when these items are used, and warns the user that the items will be removed in MySQL 5.6. A couple of previously deprecation decision have been reversed (see single file comments) client/client_priv.h: Macro similar to the one in the server (mysql_priv.h) for printing a deprecation warning message client/mysql.cc: no-auto-rehash will not be deprecated skip-line-numbers will not be deprecated skip-column-names will not be deprecated no-pager is deprecated set-variable is deprecated no-named-commands is deprecated client/mysqladmin.cc: set-variable is deprecated client/mysqlbinlog.cc: position is deprecated client/mysqldump.c: first-slave is deprecated no-set-names is deprecated set-variable is deprecated mysql-test/r/mysqlbinlog.result: Adding the [Warning] to the test case, just to show that the deprecation works. The test case will be changed in Celosia to use --start-position. mysys/my_getopt.c: set-variable (include -O) is deprecated scripts/mysqld_multi.sh: Warning for mysqld_multi sql/mysqld.cc: default-collation is deprecated log-bin-trust-routine-creators is deprecated set-variable is deprecated default-character-set is deprecated safe-show-database is deprecated sql/share/errmsg.txt: Added version number for sql_log_update deprecation message.	16 years ago
Davi Arnaut	9eae1881b3	Apply patch on behalf of Magnus: 3325 Magnus Blåudd 2010-01-05 Bug #49860 new compiler warning ha_archive - fix compiler warning by casting to ulong	16 years ago
Davi Arnaut	45d2799a15	Apply patch on behalf of the NDB team: 3321 Magnus Blåudd 2010-01-05 BUG#44840 - ndbapi compiler warning - type qualifier ignored for function return type - Remove the "const" - NOTE! This is an ABI incompatible change for some C++ compilers, NdbApi applications using any of the four changed functions may need a recompile if it's using dynamic linking.	16 years ago
Alfranio Correia	985c06d0a9	BUG#46364 MyISAM transbuffer problems (NTM problem) It is well-known that due to concurrency issues, a slave can become inconsistent when a transaction contains updates to both transaction and non-transactional tables in statement and mixed modes. In a nutshell, the current code-base tries to preserve causality among the statements by writing non-transactional statements to the txn-cache which is flushed upon commit. However, modifications done to non-transactional tables on behalf of a transaction become immediately visible to other connections but may not immediately get into the binary log and therefore consistency may be broken. In general, it is impossible to automatically detect causality/dependency among statements by just analyzing the statements sent to the server. This happen because dependency may be hidden in the application code and it is necessary to know a priori all the statements processed in the context of a transaction such as in a procedure. Moreover, even for the few cases that we could automatically address in the server, the computation effort required could make the approach infeasible. So, in this patch we introduce the option - "--binlog-direct-non-transactional-updates" that can be used to bypass the current behavior in order to write directly to binary log statements that change non-transactional tables. mysql-test/extra/rpl_tests/rpl_mixing_engines.inc: Backported this from Celosia to improve the test cases related to the NTM issue. sql/log.cc: Checks the --binlog-direct-non-transactional-updates before choosing to either use the trxn-cache or not. sql/mysqld.cc: Introduces the option --binlog-direct-non-transactional-updates. sql/set_var.cc: Introduces the option --binlog-direct-non-transactional-updates. sql/sql_class.h: Introduces the option --binlog-direct-non-transactional-updates.	16 years ago
Mattias Jonsson	4839c42619	post-push patch for bug#47343. Missing ha_rnd_end in copy_partitions, found due to a DBUG_ASSERT in mysql-pe sql/ha_partition.cc: Post-push patch for bug#47343 Must call ha_rnd_end since ha_rnd_init has been called.	16 years ago
unknown	80ac8858d5	Fix Windows test failures in binlog tests in certain time zones. On Unix systems TZ can be set to change the time zone for specific processes only. But on Windows this does not fully work. It changes some aspects of time zones in the system but not others (notably localtime() vs. file system time stamps). This causes test failures in Windows in certain time zones (but not all), where PURGE BEFORE DATE statements get the wrong files when TZ is set to +03:00 by default. Fix by only setting TZ in the small number of tests that really need it, and leave it untouched in the rest. Thanks to Alex Budovski for helping with this. mysql-test/include/ps_conv.inc: Explicitly set TIME_ZONE, as mysql-test-run.pl now does not set it. mysql-test/mysql-test-run.pl: Do not set TZ by default, as it causes problems on Windows. mysql-test/suite/binlog/r/binlog_unsafe.result: Explicitly set TIME_ZONE, as mysql-test-run.pl now does not set it. mysql-test/suite/binlog/t/binlog_unsafe.test: Explicitly set TIME_ZONE, as mysql-test-run.pl now does not set it. mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result: Explicitly set TIME_ZONE, as mysql-test-run.pl now does not set it. mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test: Explicitly set TIME_ZONE, as mysql-test-run.pl now does not set it. mysql-test/t/mysqlbinlog2-master.opt: mysql-test-run.pl no longer sets TZ by default, so set it explicitly for this particular test.	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
Sergey Petrunya	742afd8eae	Subquery optimizations: Backport into 5.3: - Enable semi-join handling in the join cache code	16 years ago
unknown	159ff4c12c	Fixes for some randomly occuring test failures in Buildbot. mysql-test/r/innodb-timeout.result: Make test more robust to scheduling delays on the host running the test suite. mysql-test/suite/rpl/r/rpl_relayspace.result: Apply patch from BUG#25228 and tweak timeout value in an attempt to fix random failure of this test in Buildbot (could not repeat locally). mysql-test/suite/rpl/t/rpl_relayspace.test: Apply patch from BUG#25228 and tweak timeout value in an attempt to fix random failure of this test in Buildbot (could not repeat locally). mysql-test/t/innodb-timeout.test: Make test more robust to scheduling delays on the host running the test suite. mysql-test/valgrind.supp: Add suppression for Glibc bug.	16 years ago
Mattias Jonsson	ae3e094191	merge	16 years ago
Sergey Petrunya	085e8b6935	Subquery optimizations, backport to 5.3: - Fix valgrind failure - Test result fixes (not finished)	16 years ago
unknown	e7effbdf9c	Merge MySQL 5.1.42 and XtraDB 9 into MariaDB trunk, after fixing test failures.	16 years ago
Sergey Petrunya	8f69764b75	Fix incorrect merge	16 years ago
Sergey Petrunya	788941f511	Merge	16 years ago
Sergey Petrunya	b83cb52e9e	Backport of subquery optimizations to 5.3. There are still test failures because of: - Wrong query results in outer join + semi join - EXPLAIN output differences	16 years ago
Michael Widenius	7b33b9f287	Fixed race condition when innobase_shutdown_for_mysql() was called before parser was initialized (as it's initialized on first usage)	16 years ago
unknown	9ca219eee3	Fix freed-twice error in XtraDB (from InnoDB plugin 1.0.6).	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
unknown	ccdd2c23a6	Result file updates following merge of MySQL 5.1.42 and XtraDB 9. mysql-test/suite/funcs_1/r/is_columns_is.result: XTRADB_ADMIN_COMMAND table added. Column name change: "accessed" -> "access" (XtraDB 9 change). mysql-test/suite/funcs_1/r/is_tables_is.result: XTRADB_ADMIN_COMMAND table added. mysql-test/suite/pbxt/r/func_group.result: Update results to be correct following fix of Bug#43668. mysql-test/suite/pbxt/r/mysqlshow.result: XTRADB_ADMIN_COMMAND table added.	16 years ago
unknown	62eee9346b	Apply to XtraDB MySQL/build-in innodb patches for Bug#49032 and Bug#47720.	16 years ago
unknown	ea328df58a	Fix crashes by taking kernel mutex when calling srv_table_reserve_slot() during thread startup.	16 years ago
unknown	a9ecb19832	After-merge fix for XtraDB 9: missing DBUG_RETURN.	16 years ago
Michael Widenius	fa2b339664	Automatic merge	16 years ago
Michael Widenius	fd3e17318b	Removed not needed test file (that caused embedded server to fail)	16 years ago
Michael Widenius	ae8d0b378e	Fixed that we use same flags when testing for assembler as by makefiles. Fixed bug in locking by triggers found by test case when compiling without query cache configure.in: Fixed that we use same flags when testing for assembler as by makefiles. sql/sql_yacc.yy: Fixed bug in locking by triggers found by test case when compiling without query cache The idea should be that triggers uses the same lock method (low_priority_locks...) as main tables.	16 years ago
unknown	2fdaf377a2	Raise version number after cloning 5.1.43	16 years ago
unknown	8997c04008	Merge XtraDB 9 with MariaDB 5.1.42.	16 years ago
unknown	13029651b5	Merge XtraDB 9 into MariaDB.	16 years ago

... 2 3 4 5 6 ...

60695 Commits (5a53be655cd68878fbe8c8bc0a0c3c30aeb98c45) All Branches Search

60695 Commits (5a53be655cd68878fbe8c8bc0a0c3c30aeb98c45)

All Branches