Commit graph

30879 commits

Author SHA1 Message Date
ingo@mysql.com
7c06b0a4c1 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-14 15:22:24 +01:00
serg@serg.mylan
8a242d96e5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1-nl
2006-02-14 15:09:28 +01:00
mskold@mysql.com
36715c70f7 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work
2006-02-14 15:01:41 +01:00
jmiller@mysql.com
904b5304d7 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-14 14:36:00 +01:00
aelkin@mysql.com
bce89a9f5b Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-02-14 15:26:01 +02:00
evgen@moonbone.local
8f904e9cab Fixed bug#16272: IF function with decimal args can produce wrong result
The Item_func_if::fix_length_and_dec() function when calculating length of 
result doesn't take into account unsigned_flag. But it is taken when 
calculating length of temporary field. This result in creating field that 
shorter than needed. Due to this, in the reported query 40.0 converted to 9.99.

The function Item_func_if::fix_length_and_dec() now adds 1 to the max_length if 
the unsigned_flag isn't set.
2006-02-14 16:22:37 +03:00
ingo@mysql.com
726ec9fa7a Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-14 13:46:19 +01:00
serg@serg.mylan
9db19fdf9e Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1-nl
2006-02-14 13:26:47 +01:00
serg@serg.mylan
b283fb79d0 MATCH(a,b) AGAINST (... IN NATURAL LANGUAGE MODE)
remove explicit $<ulong_num>$ from sql_yacc.yy
2006-02-14 13:19:54 +01:00
mskold@mysql.com
5230866f59 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work
2006-02-14 11:51:44 +01:00
aelkin@mysql.com
5bd5967bdb Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-02-14 12:44:26 +02:00
aelkin@mysql.com
4f85993945 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-02-14 12:42:27 +02:00
msvensson@neptunus.(none)
52391f3e04 Bug#16333 Assertion failure in lock.cc in the sysbench test
- Set the value of mp->thread before mp->count to avoid race condition.
2006-02-14 11:34:46 +01:00
svoj@april.(none)
7e8b145b94 BUG#17117: header fille "plugin.h" does not have a namespace prefix
plugin.h has been moved into include/mysql/plugin.h
2006-02-14 13:51:25 +04:00
msvensson@neptunus.(none)
ebdf131244 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-14 10:00:23 +01:00
gluh@mysql.com
49606011f0 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-02-14 12:53:49 +04:00
gluh@eagle.intranet.mysql.r18.ru
c42a608d6f Bug#16591 Partitions: crash using information_schema.partitions
Bug#16695 Reading I_S.PARTITIONS with pre-5.1.6 partitioned tables crashes server
 issue a warning in case of error during table opening
2006-02-14 12:52:38 +04:00
evgen@moonbone.local
84a775ca3c Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/16752-bug-5.0-mysql
2006-02-14 11:33:46 +03:00
ingo@mysql.com
b4b5dc18c4 Merge mysql.com:/home/mydev/mysql-5.0-bug8841
into  mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-14 09:29:37 +01:00
msvensson@neptunus.(none)
0a531dcec9 Make sure slave cluster is stopped if there is cluster support 2006-02-14 09:15:51 +01:00
msvensson@neptunus.(none)
581b3dbb1d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-14 09:07:03 +01:00
msvensson@neptunus.(none)
8b35d14e8e Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-14 09:06:52 +01:00
tomas@poseidon.ndb.mysql.com
dfe8bb9d4f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-14 08:33:52 +01:00
tomas@poseidon.ndb.mysql.com
69280e63bc disabled non deterministic test 2006-02-14 08:32:39 +01:00
jonas@perch.ndb.mysql.com
a4d419320d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-new
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2006-02-14 08:09:45 +01:00
jonas@eel.(none)
7ee44703f9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  eel.(none):/home/jonas/src/mysql-5.1-new
2006-02-14 08:01:57 +01:00
jonas@eel.(none)
635ce25bc3 ndb dd -
fix undo of bitmap
2006-02-14 07:57:43 +01:00
bar@mysql.com
d967e6200c Merge mysql.com:/usr/home/bar/mysql-5.0.cs_fs
into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs
2006-02-14 09:41:34 +04:00
bar@mysql.com
4f6ee962b7 Merge mysql.com:/usr/home/bar/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs
2006-02-14 08:50:52 +04:00
bar@mysql.com
561d7a03aa Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.cs_fs
2006-02-14 08:25:09 +04:00
bar@mysql.com
cc3623aecf Many files:
Backporting character_set_filesystem from 5.0 to 5.1.
2006-02-14 08:24:01 +04:00
brian@zim.tangent.org
abf4f17761 Fixed comments bug#17239 2006-02-13 19:09:10 -08:00
lars@mysql.com
e9a8a765ef Removed version information from test 2006-02-14 02:18:41 +01:00
jmiller@mysql.com
a918b12148 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-14 00:49:42 +01:00
serg@serg.mylan
e27d2a5873 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1-nl
2006-02-13 23:27:51 +01:00
tomas@poseidon.ndb.mysql.com
dd92e9a31a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-13 23:27:50 +01:00
aivanov@mysql.com
e1a316bcc0 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss115x
2006-02-14 01:27:49 +03:00
aivanov@mysql.com
434c60bdf0 Deleted innodb_unsafe_binlog.test erroneously merged from
the innodb-5.0-ss115 snapshot.
2006-02-14 01:25:13 +03:00
aelkin@mysql.com
9321f6747c Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug16217
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-02-13 23:38:12 +02:00
aelkin@mysql.com
1603a83120 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-02-13 23:36:23 +02:00
tomas@poseidon.ndb.mysql.com
efd6779c80 Bug #17340 SHOW CREATE TABLE from second session crashes the server
- no check was made that ndb thd object was allocated
2006-02-13 21:55:49 +01:00
aelkin@mysql.com
a5da4ce669 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug16217
2006-02-13 22:00:11 +02:00
kent@mysql.com
08b8448e64 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-02-13 20:52:43 +01:00
tomas@poseidon.ndb.mysql.com
b04be2212f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-13 20:52:42 +01:00
aelkin@mysql.com
a744ab78ba Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-4.1
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217
2006-02-13 21:47:23 +02:00
aelkin@mysql.com
0d54c27d50 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-02-13 21:37:32 +02:00
tomas@poseidon.ndb.mysql.com
b1967abdce Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-13 20:35:35 +01:00
tomas@poseidon.ndb.mysql.com
87a6266fa4 Bug #17179 schema creation fails
-flag was set on field intable share instead of table
2006-02-13 20:34:36 +01:00
kent@mysql.com
d60b10d565 mysqlimport.c:
Removed C++ comment, changed types for pthread_create() usage
2006-02-13 20:21:15 +01:00
lars@mysql.com
5b66df060f BUG#17339: Missed line in previous patch 2006-02-13 19:52:57 +01:00