mariadb

Tree: d2139f3135

Author	SHA1	Message	Date
Alexander Nozdrin	6b1d61ecb0	Manual merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	ae71ffc1c8	Auto-merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	e6d79c2bc9	Auto-merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	ea0bbb7248	Manual merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	7cd11f45be	Manual merge from mysql-trunk-merge.	16 years ago
Mikael Ronstrom	bf7771df3f	Review fixes for BUG#48161 and BUG#48447	16 years ago
Alexander Nozdrin	5462a6dbcc	Auto-merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	b3b4137d52	Null-merge patch for Bug#47627 (revision-id: kristofer.pettersson@sun.com-20091019074333-g2ces0lo4c2ejar7), because it broke the tree and was reverted later.	16 years ago
Alexander Nozdrin	e253068bee	Manual-merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	85929aacc8	Auto-merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	1a07288310	Auto-merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	52b1bfe405	Manual merge from mysql-trunk-merge. Fix partition_column.test.	16 years ago
Alexander Nozdrin	eed607b829	Manual merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	cd14c47c99	Manual merge from mysql-trunk-merge.	16 years ago
Alexander Nozdrin	e0c62aad36	Manual merge from mysql-5.1.	16 years ago
Alexander Nozdrin	120425ccfd	Fix automerge: use 'thd->query()' instead of 'thd->query'.	16 years ago
Mikael Ronstrom	ca9fe97e9f	BUG#48447, BUG#48161, fixed a regression from fix of BUG#6045, where binary collations can use indexes/partition pruning for cases using equality conditions, however it cannot be used for any other condition like <, >, <=, >=, <>, also added test case for verification of BUG#47774 in this patch	16 years ago
Sergey Vojtovich	45c2de8ffd	Manually applied fix for innodb_bug39438 test from 5.1.	16 years ago
Sergey Vojtovich	345c79edf7	Updates for test cases from innodb-zip-ss6129.	16 years ago
Sergey Vojtovich	ced8719400	Merge of innodb-zip-ss6129 from 5.1 to mysql-trunk.	16 years ago
Alexander Nozdrin	3e2c9aac11	Auto-merge from mysql-5.1.	16 years ago
Alexander Nozdrin	d74f9f8805	Null-merge revid:svoj@sun.com-20091103091902-vwszwwpfi1f4zrpn from mysql-5.1	16 years ago
Alexander Nozdrin	d476bbb0be	Auto-merge from mysql-next-mr.	16 years ago
Alexander Nozdrin	e1a2211ad9	Auto-merge from mysql-5.1.	16 years ago
Alexander Nozdrin	99d2c97208	Auto-merge from mysql-5.1.	16 years ago
Alexander Nozdrin	132c439a0b	Manual merge from mysql-5.1.	16 years ago
Alexander Nozdrin	89cfb564e3	Auto-merge from mysql-5.1.	16 years ago
Alexander Nozdrin	ff867d21f4	Auto-merge from mysql-5.1.	16 years ago
Alexander Nozdrin	660043abaf	Auto-merge from mysql-5.1.	16 years ago
Magne Mahre	bda76437ae	Fix compile error on HP/UX. SIGWINCH is not defined in termios.h on HP/UX.	16 years ago
Alexander Nozdrin	5bbacc5214	Manual merge from mysql-5.1.	16 years ago
Alexander Nozdrin	c063bd171e	Manual merge from mysql-5.1.	16 years ago
Alexander Nozdrin	b40aed07bf	Auto-merge from mysql-5.1.	16 years ago
Alexander Nozdrin	0fd7ff87bb	Auto-merge from mysql-5.1.	16 years ago
Alexander Nozdrin	bd659be6ec	Auto-merge from mysql-5.1.	16 years ago
Alexander Nozdrin	a35e013144	Manual merge from mysql-5.1.	16 years ago
Alexander Nozdrin	b30c1886dc	Manual merge from mysql-5.1.	16 years ago
unknown	a95f54c6d8	Raise version number after cloning 5.1.41	16 years ago
Magne Mahre	a5ab2c30df	BUG #8368 "mysqldump needs --slave-data option" Added this option, named as "--dump-slave". The purpose of this option is to be able to produce a dump from a slave used for making backups of the master. Originally, dumping from the main master was fine, but as more data accumulated, the dump process would take over 30 minutes, locking up the master database hence website for 30 minutes. A slave dedicated to producing backups was the answer, but I needed a dump that could be used to restore a slave instantly and in order to do that, it has to have three things contained in the dump: 1. "STOP SLAVE;" at the beginning 2. "CHANGE MASTER TO ...<the master - info from 'show slave status'>" 3. "START SLAVE;" at the end These options in this changeset contain this. --stop-slave adds "STOP SLAVE" to the beginning of the dump and "STOP SLAVE" to the end of the dump. --include-host gives the user the option to have the host explicitely added to the "CHANGE MASTER TO ..." line. --dump-slave adds the "CHANGE MASTER ..." to the dump representing not the slave's master binlog info, but the slave's master's info from "SHOW SLAVE STATUS" client/client_priv.h: Added OPT_SLAVE_DATA to client_priv.h client/mysqldump.c: * Added --dump-slave option (name per Brian) * Added --stop-slave to print "STOP SLAVE;" into the dump * Added --include-host option to include "MASTER_HOST=..." and "MASTER_PORT=..." to the dump since unlike --master-data, the host can't be assumed to be the local host * Added do_start_slave and do_stop_slave to stop the slave sql thread upon start of the dump process, and to start the slave sql upon finish of dump process - to keep the log information frozen during this time. * Added do_show_slave_status for obtaining slave information needed to compose "CHANGE MASTER ..." output to the master of this slave. * Added necessary long options and defines required for new options	16 years ago
Magne Mahre	77b8e5d9b5	Bug#26780: automatic vertical output for wide results Feature from Eric Bergen, CLA signed 2007-06-27. Adds new mysql client option "--auto-vertical-output", which causes the client to test whether a result table is too wide for the current window (where available) and emit vertical results in that case. Otherwise, it sends normal tabular results. client/client_priv.h: Add another enum value to client options, for automatic vertical output. client/mysql.cc: Add another command-line option, "auto-vertical-output". Add functions to get the terminal width and functions to get the widths of fields. Use them together to emit vertical output when some output table is too wide to fit in the terminal. If the terminal doesn't support reading its width, then assume 80-positions wide. mysql-test/r/mysql.result: Show that various select statements do work as expected. Wide tables become vertical and narrow ones do not. mysql-test/t/mysql.test: Show that various select statements do work as expected. These should be suitable for a wide range of window capabilities and sizes. Under extreme circumstances, the results could be arbitrary.	16 years ago
Jon Olav Hauglid	17a6040fbc	Bug #43867 ALTER TABLE on a partitioned table causes unnecessary deadlocks Backport of revno: 2617.68.35 The problem was that if one connection is running a multi-statement transaction which involves a single partitioned table, and another connection attempts to alter the table to drop a non-existing partition, (which of course will fail), the first connection still gets ER_LOCK_DEADLOCK and cannot proceed anymore. This bug is no longer reproducable. This has also been tested with the patch for Bug#46654 "False deadlock on concurrent DML/DDL with partitions, inconsistent behavior" which concerned a similar problem but where the ALTER TABLE is semantically correct. Test case added in partition_sync.test.	16 years ago
Magne Mahre	a5d74eb1b4	Bug#42664: Sign ignored for TIME types when not comparing as longlong Another code-path dropped sign of TIME, presuming all time is positive. Minds sign now. Patch depends on ChangeSet for 42661. mysql-test/r/type_time.result: Show we now no longer ignore sign of TIME-type in this code-path. mysql-test/t/type_time.test: Show we now no longer ignore sign of TIME-type in this code-path. sql/item_cmpfunc.cc: TIME_to_ulonglong() (somewhat obviously) loses sign of its argument, so we put it back in where needed.	16 years ago
Georgi Kodinov	9b7a7f06c1	merge	16 years ago
Georgi Kodinov	3778d52d11	merge	16 years ago
Magne Mahre	6f5418515f	Backport to 5.6.0	16 years ago
Georgi Kodinov	252cb16f20	version change	16 years ago
Georgi Kodinov	d66b794ec5	Disabled the rpl_killed_ddl test in 5.0 because of bug #45520	16 years ago
Magne Mahre	9c5a86377a	Bug#42661: sec_to_time() and signedness Bug#42662: maketime() and signedness Item_time_typecast::val_int() dropped sign from MYSQL_TIME gotten using from get_time(). Propagates sign now. Backported to 5.5.0 (6.0-codebase revid: 1810.3897.1)	16 years ago
Mikael Ronstrom	16b603a8b0	Fixed a use of non-initialised variable, cannot use NULL flags if RANGE == NO_MAX_RANGE or NO_MIN_RANGE, so need to check NULL flags after checking the RANGE isn't NO_MAX_RANGE	16 years ago
Sergei Golubchik	1a8f08b006	unit tests for my_vsnprintf, bug fixes for my_vsnprintf include/mysql/service_my_snprintf.h: typo fixed strings/my_vsnprintf.c: bugfixes: correct handling of %08p (%p with zero-padding) assert crash on .*$n (positional argument as precision)	16 years ago

1 2 3 4 5 ...

59442 Commits (d2139f313583aa7f6e09a505ea44aff0073d0d0d) All Branches Search

59442 Commits (d2139f313583aa7f6e09a505ea44aff0073d0d0d)

All Branches