Commit graph

21401 commits

Author SHA1 Message Date
cmiller@zippy.cornsilk.net
191172c8ae Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.0-maint
2006-09-23 09:57:17 -04:00
cmiller@zippy.cornsilk.net
3681b3ecb5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-09-23 09:55:16 -04:00
istruewing@chilla.local
af6b36e818 Merge chilla.local:/home/mydev/mysql-4.0-bug14400
into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty
2006-09-23 11:24:47 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
80dadacb03 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-09-23 07:11:32 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
7e45d80362 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-09-23 05:58:48 +02:00
kaa@polly.local
e9bdddfa28 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
2006-09-22 19:50:16 +04:00
kaa@polly.local
10a60b42f6 Merge polly.local:/tmp/22129/bug22129/my41-bug22129
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
2006-09-22 19:44:51 +04:00
kaa@polly.local
1530b51d8f Fixed bug : A small double precision number becomes zero
Better checks for underflow/overflow
2006-09-22 19:23:58 +04:00
istruewing@chilla.local
2b121cd0e1 Bug#14400 - Query joins wrong rows from table which is subject of
"concurrent insert"
After merge fix.
2006-09-22 17:23:25 +02:00
istruewing@chilla.local
9d0cedffad Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into  chilla.local:/home/mydev/mysql-4.0-bug14400
2006-09-22 15:06:01 +02:00
istruewing@chilla.local
bb2a7fec48 Merge chilla.local:/home/mydev/mysql-4.0--team
into  chilla.local:/home/mydev/mysql-4.0-bug14400
2006-09-22 15:03:50 +02:00
Kristofer.Pettersson@naruto.
2f33711f1d Bug#21811 Odd casting with date + INTERVAL arithmetic
- The definition of the result type of a type_date function didn't
  include INTERVAL_WEEK
- This patch adds an explicit test for INTERVAL_WEEK which results 
  in the result type for an item_date_add_intervall operation 
  being DATE rather than DATETIME when one parameter is
  INTERVAL_WEEK.
2006-09-22 11:22:01 +02:00
knielsen@bk-internal.mysql.com
4412755932 Merge knielsen.mysql.internal:/usr/local/mysql/mysql-4.1
into  bk-internal.mysql.com:/tmp/knielsen/mysql-4.1-maint
2006-09-21 21:23:38 +02:00
mskold/marty@mysql.com/linux.site
c854ecebf9 Bug Duplicate key error in NDB references wrong key: wrong indent for code block 2006-09-21 16:54:54 +02:00
mskold/marty@mysql.com/linux.site
42d64e4275 Bug Duplicate key error in NDB references wrong key: use MAX_KEY to signal unknown key 2006-09-21 16:49:07 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
9538acf5dc Adding proper setup phase for test case rpl_insert_id 2006-09-21 13:19:52 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
d3f503a0bd Fix for bug : "order by" changes the results returned
Item_substr's results are improperly stored in a temporary table due to       
wrongly calculated max_length value for multi-byte charsets if two            
arguments specified.
2006-09-21 16:05:01 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
43194fad43 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/mysql-4.1-maint
2006-09-21 09:35:17 +05:00
lars/lthalmann@mysql.com/dl145h.mysql.com
fe782f92d6 Vertical printout in test to make easier to read 2006-09-21 03:32:42 +02:00
igor@rurik.mysql.com
d957636471 Fixed bug .
Any default value for a enum fields over UCS2 charsets was corrupted
when we put it into the frm file, as it had been overwritten by its
HEX representation.
To fix it now we save a copy of structure that represents the enum
type and when putting the default values we use this copy.
2006-09-20 09:46:12 -07:00
lars/lthalmann@mysql.com/dl145j.mysql.com
0c03f9348d Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-09-20 16:17:30 +02:00
stewart@willster.(none)
0f3874dffa Merge willster.(none):/home/stewart/Documents/MySQL/4.1/ndb
into  willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2
2006-09-20 17:09:53 +10:00
istruewing@chilla.local
1782889d35 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty
2006-09-20 08:33:46 +02:00
svoj@mysql.com/april.(none)
c0ebc0fb2a BUG#10974 - No error message if merge table based on union of innodb, memory
Fixed confusing error message from the storage engine when
it fails to open underlying table. The error message is issued
when a table is _opened_ (not when it is created).
2006-09-20 01:40:59 +05:00
igor@rurik.mysql.com
294c0ccaa9 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into  rurik.mysql.com:/home/igor/mysql-4.1-opt
2006-09-19 08:42:58 -07:00
thek@kpdesk.mysql.com
59671a1b16 Merge kpdesk.mysql.com:/home/thek/dev2/bug21139/my41-bug21139
into  kpdesk.mysql.com:/home/thek/dev2/mysql-4.1-maint
2006-09-19 12:44:09 +02:00
thek@kpdesk.mysql.com
66fa757e1f Bug#21139 Handling of database differs in "embedded" , test lowercase_fs_off fails
- Access checks are omitted when compliled without --with-embedded-privilege-control
- Patch: skip this test
2006-09-19 12:40:31 +02:00
istruewing@chilla.local
47dc3fbe8a Merge bk-internal:/home/bk/mysql-4.0
into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty
2006-09-19 10:17:25 +02:00
stewart@willster.(none)
f819cac850 Merge willster.(none):/home/stewart/Documents/MySQL/4.1/ndb
into  willster.(none):/home/stewart/Documents/MySQL/4.1/ndb_size_51
2006-09-19 17:56:25 +10:00
gni/root@dev3-127.(none)
7279dde64b BUG#21585 The --help option shows a screen of command options for the ndbd,ndb_mgmd, ndb_mgm
and other commands related to ndb. For all of these, the help screen contains 
          "Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete.
2006-09-19 11:15:50 +08:00
kroki/tomash@moonlight.intranet
926106649f BUG#9678: Client library hangs after network communication failure
(back-port to 4.0)

Socket timeouts in client library were used only on Windows.
Additionally, in 4.0 write operations erroneously set read timeout.

The solution is to use socket timeouts in client library on all
systems were they are supported, and to differentiate between read
and write timeouts.

No test case is provided because it is impossible to simulate network
failure in current test suite.
2006-09-18 22:02:06 +04:00
svoj@may.pils.ru
43097593e3 Merge may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1
into  may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1-engines
2006-09-18 20:35:33 +05:00
gkodinov@dl145s.mysql.com
fcf99e859f Merge bk-internal:/home/bk/mysql-4.1-opt
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
2006-09-18 11:09:56 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
7f410eed5e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/usr/home/ram/work/bug21142/my41-bug21142
2006-09-18 09:06:05 +05:00
igor@rurik.mysql.com
dd3b8e4f9a Fixed bug : Crash on the execution of a prepared
statement that uses an aggregating IN subquery with 
HAVING clause.
A wrong order of the call of split_sum_func2 for the HAVING
clause of the subquery and the transformation for the 
subquery resulted in the creation of a andor structure
that could not be restored at an execution of the prepared
statement.
2006-09-16 11:50:00 -07:00
gkodinov/kgeorge@macbook.gmz
c73d2318a3 Merge bk-internal:/home/bk/mysql-4.1-opt
into  macbook.gmz:/Users/kgeorge/mysql/work/B21180-4.1-opt
2006-09-15 18:56:05 +03:00
gni/root@dev3-127.(none)
cdacbe3ffd BUG#21530 The ndb_mgm management client doesn't set the exit status on errors, making it
almost useless for any kind of shell script automation.
          Now add the return value that indicates the execution whether or not success 
          for many methods.
2006-09-15 20:04:59 +08:00
istruewing@chilla.local
45f7514d03 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
into  chilla.local:/home/mydev/mysql-4.1-bug14400
2006-09-15 14:02:43 +02:00
gkodinov@dl145s.mysql.com
325f820909 Merge dl145s.mysql.com:/data/bk/team_tree_merge/CLEAN/mysql-4.1
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
2006-09-15 11:43:28 +02:00
jonas@perch.ndb.mysql.com
0d36004550 ndb - bug#21756
Fix for alter table when node is down...that could cause pain and misery
2006-09-15 11:34:06 +02:00
tsmith/tim@siva.hindu.god
43e8890abc Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/40
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/41
2006-09-14 23:20:13 -06:00
tsmith/tim@siva.hindu.god
7b9f4086fa Bug : too many of "error 1236: 'binlog truncated in the middle of event' from master"
- Fix my_read/my_write to handle return values from read/write correctly
- Add debugging 'deprecated function' warning to my_lread/my_lwrite
- Add debugging 'error, read/write interrupt not handled' warning to my_quick_read/my_quick_write

There is no test case associated with these changes.  However, this is a conservative change,
and no repeatable test case is available.
2006-09-14 23:19:24 -06:00
tsmith/tim@siva.hindu.god
5ec2bfe94c Bug : too many of "error 1236: 'binlog truncated in the middle of event' from master"
- Detect read failure in my_read_charset_file
2006-09-14 21:06:14 -06:00
lars/lthalmann@mysql.com/dl145j.mysql.com
ec51f809b8 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-09-15 01:15:39 +02:00
istruewing@chilla.local
d53ac19620 Bug#14400 - Query joins wrong rows from table which is subject of
"concurrent insert"
After merge fix.
2006-09-14 16:55:57 +02:00
evgen@moonbone.local
5841147d4d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into  moonbone.local:/work/21677-bug-4.1-opt-mysql
2006-09-14 18:46:44 +04:00
evgen@moonbone.local
a33d1d8484 type_date.test, type_date.result:
Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN
2006-09-14 18:45:23 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
c2fa031b99 Merge mysql.com:/usr/home/bar/mysql-4.1.b20471v2
into  mysql.com:/usr/home/bar/mysql-4.1-kt
2006-09-14 15:13:53 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
6daf8b4e18 Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1-kt
2006-09-14 15:12:06 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
72af9c2fef Better comment text (thanks to SergeyP for suggestions made for the b#20471 patch) 2006-09-14 10:05:07 +05:00