Commit graph

50749 commits

Author SHA1 Message Date
joerg@trift2.
5779d062e2 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-10-22 11:08:55 +02:00
holyfoot/hf@hfmain.(none)
9e6091fcbc Merge mysql.com:/home/hf/work/30638/my50-30638
into  mysql.com:/home/hf/work/30638/my51-30638
2007-10-22 10:30:09 +05:00
holyfoot/hf@hfmain.(none)
f5bc9d3c82 Merge bk@192.168.21.1:mysql-5.1-opt
into  mysql.com:/home/hf/work/30638/my51-30638
2007-10-22 10:28:12 +05:00
holyfoot/hf@hfmain.(none)
5b67dca442 Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/home/hf/work/30638/my50-30638
2007-10-22 10:27:35 +05:00
holyfoot/hf@hfmain.(none)
bf19259d83 Merge mysql.com:/home/hf/work/29801/my50-29801
into  mysql.com:/home/hf/work/30638/my50-30638
2007-10-22 10:26:16 +05:00
holyfoot/hf@hfmain.(none)
f4785845b4 Merge mysql.com:/home/hf/work/29801/my51-29801
into  mysql.com:/home/hf/work/30638/my51-30638
2007-10-22 10:25:35 +05:00
holyfoot/hf@hfmain.(none)
0065b7800e Merge mysql.com:/home/hf/work/30638/my50-30638
into  mysql.com:/home/hf/work/30638/my51-30638
2007-10-22 10:24:12 +05:00
holyfoot/hf@hfmain.(none)
5a20acc709 Merge mysql.com:/home/hf/work/29801/my50-29801
into  mysql.com:/home/hf/work/29801/my51-29801
2007-10-22 10:21:32 +05:00
tnurnberg@white.intern.koehntopp.de
478079b2e8 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/scratch/tnurnberg/31588/50-31588
2007-10-22 01:57:49 +02:00
tnurnberg@white.intern.koehntopp.de
44fbb702b9 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/scratch/tnurnberg/31588/51-31588
2007-10-21 22:49:16 +02:00
kaa@polly.(none)
079bdfc5af Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
2007-10-21 22:01:12 +04:00
kaa@polly.(none)
d998b471c9 Merge polly.(none):/home/kaa/src/opt/bug28550/my51-bug28550
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
2007-10-21 21:57:57 +04:00
kaa@polly.(none)
f9ba86ee86 Merge polly.(none):/home/kaa/src/opt/bug28550/my50-bug28550
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
2007-10-21 21:55:26 +04:00
kaa@polly.(none)
d55d309380 Merge polly.(none):/home/kaa/src/opt/bug28550/my50-bug28550
into  polly.(none):/home/kaa/src/opt/bug28550/my51-bug28550
2007-10-21 21:49:30 +04:00
kaa@polly.(none)
349841118f Bug #28550 "Potential bugs related to the return type of the CHAR function".
Since, as of MySQL 5.0.15, CHAR() arguments larger than 255 are converted into multiple result bytes, a single CHAR() argument can now take up to 4 bytes. This patch fixes Item_func_char::fix_length_and_dec() to take this into account.
  
This patch also fixes a regression introduced by the patch for bug21513. As now we do not always have the 'name' member of Item set for Item_hex_string and Item_bin_string, an own print() method has been added to Item_hex_string so that it could correctly be printed by Item_func::print_args().
2007-10-21 21:45:31 +04:00
tnurnberg@sin.intern.azundris.com
b8feb23321 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  sin.intern.azundris.com:/misc/mysql/31588/51-31588
2007-10-20 17:18:23 +02: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
jonas@perch.ndb.mysql.com
9cd83c5365 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2007-10-19 21:25:07 +02:00
joerg@trift2.
9aad83672b Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-10-19 19:27:05 +02:00
joerg@trift2.
5e95b3c34c Merge trift2.:/MySQL/M51/bug31644-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-10-19 19:22:27 +02:00
joerg@trift2.
eee35f91f0 Merge trift2.:/MySQL/M50/bug31644-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-10-19 19:19:15 +02:00
joerg@trift2.
f3668c9f03 Merge trift2.:/MySQL/M50/bug31644-5.0
into  trift2.:/MySQL/M51/bug31644-5.1
2007-10-19 19:06:30 +02:00
df@pippilotta.erinye.com
af22cc408c export patch for bug#31221 2007-10-19 17:07:08 +02:00
gkodinov/kgeorge@magare.gmz
c95b24cba7 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B31157-5.1-opt
2007-10-19 17:01:13 +03:00
gkodinov/kgeorge@magare.gmz
fb640797b8 Bug #31157: crash when select+order by the avg of some field within the group by
The uncacheable flag should be set at fix_fields() stage.
Fixed by moving the flag setting to match the one in 5.1
2007-10-19 15:43:19 +03:00
joerg@trift2.
b3fc7aac86 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-10-19 11:50:55 +02:00
joerg@trift2.
7af6d8bf05 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-10-19 11:41:15 +02:00
joerg@trift2.
06b226658b Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-10-19 11:18:15 +02: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
jonas@perch.ndb.mysql.com
5cf8e94bf8 ndb - bug#31701 Node failure with repl. wo/ load, can lead to endless out of order buckets
Correct check for buffer/no buffer
2007-10-18 23:21:18 +02: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
mleich@four.local.lan
09e1c1b0a7 Merge four.local.lan:/WORK2/merge/mysql-5.1-31556
into  four.local.lan:/WORK/mysql-5.1-build/src-clean
2007-10-18 16:14:27 +02: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
tnurnberg@white.intern.koehntopp.de
30dd4d9fca Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/scratch/tnurnberg/31588/50-31588
2007-10-18 16:09:03 +02:00
gkodinov/kgeorge@magare.gmz
7f8c4aacf6 Merge magare.gmz:/home/kgeorge/mysql/work/B31221-5.0-gca-opt
into  magare.gmz:/home/kgeorge/mysql/work/B31221-5.1-opt
2007-10-18 15:57:59 +03:00
gkodinov/kgeorge@magare.gmz
abdc597b78 Merge magare.gmz:/home/kgeorge/mysql/work/B31221-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/B31221-5.0-gca-opt
2007-10-18 15:53:45 +03:00
gkodinov/kgeorge@magare.gmz
976e0ca154 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B31221-5.0-opt
2007-10-18 15:32:48 +03:00
gkodinov/kgeorge@magare.gmz
d67cd9e8af Bug #31221: Optimizer incorrectly identifies impossible WHERE clause
No warning was generated when a TIMESTAMP with a non-zero time part
 was converted to a DATE value. This caused index lookup to assume
 that this is a valid conversion and was returning rows that match 
 a comparison between a TIMESTAMP value and a DATE keypart.
 Fixed by generating a warning on such a truncation.
2007-10-18 15:19:04 +03:00