msvensson@pilot.mysql.com
5fb96884d1
Merge pilot.mysql.com:/data/msvensson/mysql/bug31004/my50-bug31004
...
into pilot.mysql.com:/data/msvensson/mysql/bug31004/my51-bug31004
2007-11-01 16:49:39 +01:00
msvensson@pilot.mysql.com
53bc1d5c25
Bug#31004 mysqltest needs a --mkdir command
...
- Add new mysqltest command "mkdir" and "rmdir"
2007-11-01 15:42:19 +01:00
msvensson@pilot.mysql.com
3ef9cb4ed9
Backport mysqltests "change_user" command
2007-10-31 18:44:31 +01:00
msvensson@pilot.mysql.com
d3293988d8
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
2007-10-24 08:35:22 +02:00
msvensson@pilot.mysql.com
2f852c126f
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
2007-10-23 13:16:31 +02:00
msvensson@pilot.mysql.com
2595a8d01b
Merge pilot.mysql.com:/data/msvensson/mysql/bug30560/my50-bug30560
...
into pilot.mysql.com:/data/msvensson/mysql/bug30560/my51-bug30560
2007-10-23 12:54:26 +02:00
tnurnberg@white.intern.koehntopp.de
b3c2bc8cc4
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/scratch/tnurnberg/20901/51-20901
2007-10-23 12:38:09 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
017ba8dadb
Merge mysql.com:/home/ram/work/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b31604/b31604.5.1
2007-10-23 15:26:14 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
ccb83d681e
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b31349/b31349.5.1
2007-10-23 15:13:47 +05:00
msvensson@pilot.mysql.com
acd497ad71
Bug#30560 Valgrind option to mysql-test-run with spaces in cause strange error
2007-10-23 11:52:55 +02:00
kaa@polly.(none)
c2dd16065c
Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-23 13:44:04 +04:00
kaa@polly.(none)
e10f699931
Merge polly.(none):/home/kaa/src/maint/bug30453/my51-bug28878
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-23 13:39:31 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
30b8fdf535
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b31604/b31604.5.1
2007-10-23 14:31:53 +05:00
kaa@polly.(none)
0aa8710037
Merge polly.(none):/home/kaa/src/maint/bug30453/my50-bug28878
...
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-10-23 13:31:24 +04:00
kaa@polly.(none)
5fe9f0f7dd
Merge polly.(none):/home/kaa/src/maint/bug30453/my50-bug28878
...
into polly.(none):/home/kaa/src/maint/bug30453/my51-bug28878
2007-10-23 13:19:54 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
488e3e4943
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b31349/b31349.5.1
2007-10-23 14:07:44 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
c7528dff69
Merge mysql.com:/home/ram/work/b31349/b31349.5.0
...
into mysql.com:/home/ram/work/b31349/b31349.5.1
2007-10-23 13:55:06 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
a3bc9cd136
Merge mysql.com:/home/ram/work/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b31604/b31604.5.1
2007-10-23 13:54:40 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
4b7a4efa4f
Merge mysql.com:/home/ram/work/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b31285/b31285.5.1
2007-10-23 13:05:40 +05:00
tnurnberg@mysql.com/white.intern.koehntopp.de
e9229319c9
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/scratch/tnurnberg/20901/51-20901
2007-10-23 08:54:20 +02:00
tnurnberg@mysql.com/white.intern.koehntopp.de
b7599f4b1b
Merge mysql.com:/scratch/tnurnberg/20901/50-20901
...
into mysql.com:/scratch/tnurnberg/20901/51-20901
2007-10-23 07:09:56 +02:00
tnurnberg@mysql.com/white.intern.koehntopp.de
90f391c013
Bug #20901 : CREATE privilege is enough to insert into a table
...
CREATE TABLE IF NOT EXISTS ... SELECT let you insert into an existing
table as long as you had the CREATE privilege. CREATE ... SELECT
variants now always require INSERT privilege on target table.
2007-10-23 07:09:16 +02:00
tnurnberg@mysql.com/white.intern.koehntopp.de
30de60877c
Merge mysql.com:/scratch/tnurnberg/20901/41-20901
...
into mysql.com:/scratch/tnurnberg/20901/50-20901
2007-10-23 07:00:13 +02:00
tnurnberg@mysql.com/white.intern.koehntopp.de
c085e424f6
Bug #20901 : CREATE privilege is enough to insert into a table
...
CREATE TABLE IF NOT EXISTS ... SELECT let you insert into an existing
table as long as you had the CREATE privilege. CREATE ... SELECT
variants now always require INSERT privilege on target table.
2007-10-23 06:54:31 +02:00
tsmith@ramayana.hindu.god
5a42bb96f8
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-10-22 16:27:35 -06:00
tsmith@ramayana.hindu.god
e347c1413a
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-10-22 14:32:22 -06:00
tsmith@ramayana.hindu.god
c54e1855dc
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-10-22 14:31:41 -06:00
kaa@polly.(none)
78b61d3a50
Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-22 22:38:20 +04:00
kaa@polly.(none)
0b00717432
Fixed the Windows build failures introduced by the patch for bug #31207 : Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.
2007-10-22 22:35:08 +04:00
antony@anubis.xiphis.org
3f33002fc4
Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines.merge
...
into anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines.merge
2007-10-19 13:12:14 -07:00
antony@anubis.xiphis.org
9732efe7f8
Merge anubis.xiphis.org:/usr/home/antony/work/mysql-4.1-engines.merge
...
into anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines.merge
2007-10-19 13:10:41 -07:00
antony@pcg5ppc.xiphis.org
3b95727600
Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines
...
into anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines.merge
2007-10-19 13:06:37 -07:00
antony@pcg5ppc.xiphis.org
fb27ce61bc
Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines
...
into anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines.merge
2007-10-19 13:04:30 -07:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
8619e7df83
Merge anubis.xiphis.org:/usr/home/antony/work/mysql-4.1-engines
...
into anubis.xiphis.org:/usr/home/antony/work/mysql-4.1-engines.merge
2007-10-19 13:01:08 -07:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
b4f558419f
Fix for bug #31349 : ERROR 1062 (23000): Duplicate entry '' for key 'group_key'
...
Problem: lying to the optimizer that a function (Item_func_inet_ntoa)
cannot return NULL values leads to unexpected results (in the case group
keys creation/comparison is broken).
Fix: Item_func_inet_ntoa::maybe_null should be set properly.
2007-10-19 14:54:05 +05:00
malff@lambda.hsd1.co.comcast.net.
edec79d60a
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-runtime
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-runtime
2007-10-18 21:36:10 -06:00
malff@lambda.hsd1.co.comcast.net.
94b4f4a870
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-10-18 19:21:07 -06:00
malff@lambda.hsd1.co.comcast.net.
2d6fbbda59
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-base
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-10-18 16:57:51 -06:00
malff@lambda.hsd1.co.comcast.net.
6fa35a5d3b
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
2007-10-18 16:39:55 -06:00
antony@pcg5ppc.xiphis.org
407f73c821
Merge pcg5ppc.xiphis.org:/private/Network/Servers/anubis.xiphis.org/home/antony/work/p1-bug31473.1
...
into pcg5ppc.xiphis.org:/private/Network/Servers/anubis.xiphis.org/home/antony/work/p1-bug31473.1-merge-5.1-engines
2007-10-18 15:02:20 -07:00
antony@pcg5ppc.xiphis.org
f4a153c3c4
Bug#31473
...
"CSV does not work with NULL value in datetime fields"
Attempting to insert a row with a NULL value for a DATETIME field
results in a CSV file which the storage engine cannot read.
Don't blindly assume that "0" is acceptable for all field types,
Since CSV does not support NULL, we find out from the field the
default non-null value.
Do not permit the creation of a table with a nullable columns.
2007-10-18 14:48:04 -07:00
davi@moksha.com.br
5a2e5cf205
Merge moksha.com.br:/Users/davi/mysql/bugs/21557-5.1
...
into moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime
2007-10-18 17:31:36 -03:00
davi@moksha.com.br
a2aafb6034
Post merge fix for Bug 21557
2007-10-18 17:24:57 -03:00
davi@moksha.com.br
3b44d6e8b9
Merge moksha.com.br:/Users/davi/mysql/bugs/21557-5.1
...
into moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime
2007-10-18 15:47:22 -03:00
davi@moksha.com.br
dd135211d8
Bug#21557 entries in the general query log truncated at 1000 characters.
...
The general log write function (general_log_print) uses printf style
arguments which need to be pre-processed, meaning that the all arguments
are copied to a single buffer and the problem is that the buffer size is
constant (1022 characters) but queries can be much larger then this.
The solution is to introduce a new log write function that accepts a
buffer and it's length as arguments. The function is to be used when
a formatted output is not required, which is the case for almost all
query write-to-log calls.
This is a incompatible change with respect to the log format of prepared
statements.
2007-10-18 15:45:07 -03:00
istruewing@stella.local
672290b03d
Bug#31692 - binlog_killed.test crashes sometimes
...
The server crashed when a thread was killed while locking the
general_log table at statement begin.
The general_log table is handled like a performance schema table.
The state of open tables is saved and cleared so that this table
seems to be the only open one. Then this table is opened and locked.
After writing, the table is closed and the open table state is
restored. Before restoring, however, it is asserted that there is
no current table open.
After locking the table, mysql_lock_tables() checks if the thread
was killed in between. If so, it unlocks the table and returns an
error. open_ltable() just returns with the error and leaves closing
of the table to close_thread_tables(), which is called at
statement end.
open_performance_schema_table() did not take this into account.
It assumed that a failed open_ltable() would not leave an open
table behind.
Fixed by closing thread tables after open_ltable() and before
restore_backup_open_tables_state() if the thread was killed.
No test case. It requires correctly timed parallel execution.
Since this bug was detected by the test suite, it seems
dispensable to add another test.
2007-10-18 16:14:27 +02:00
kaa@polly.(none)
04b1c9ca40
Post-merge changes for bug #31207 : Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.
2007-10-18 15:17:21 +04:00
kaa@polly.(none)
97226f1027
Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-18 14:32:43 +04:00
kaa@polly.(none)
3af902ec47
Merge polly.(none):/home/kaa/src/maint/bug31207/my50-bug31174
...
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-10-18 13:47:35 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
8d589be34b
Merge mysql.com:/home/ram/work/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b31604/b31604.5.1
2007-10-18 09:50:23 +05:00