tomas@poseidon.ndb.mysql.com
644906bf9c
bitmap bug fixes and interface change
2005-06-02 18:40:25 +02:00
reggie@monster.
7b9d4eaa92
fixed compile problem by replacing W_OK with F_OK
2005-06-02 11:12:58 -05:00
igor@igor-inspiron.creware.com
e5ac58e64a
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into igor-inspiron.creware.com:/home/igor/mysql-5.0
2005-06-02 08:46:10 -07:00
heikki@hundin.mysql.fi
894de1686a
ha_innodb.cc:
...
Weaken InnoDB table locking at the start of a stored procedure call: this will make multi-transaction stored procedures less deterministic for binlogging, but since they are non-deterministic anyway, it is not that bad; this fix will remove the huge amount of InnoDB tranasctional deadlocks caused by table locking at the start of a stored procedure
2005-06-02 18:10:32 +03:00
mskold@mysql.com
9cebe281bb
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-06-02 17:06:51 +02:00
mskold@mysql.com
565e3ef640
Added update_used_tables to add_found_match_trig_cond, to make valgrind happy
2005-06-02 16:56:08 +02:00
igor@igor-inspiron.creware.com
380411607a
Merge igor-inspiron.creware.com:/home/igor/mysql-5.0
...
into igor-inspiron.creware.com:/home/igor/dev/mysql-5.0-0
2005-06-02 07:33:31 -07:00
igor@igor-inspiron.creware.com
186e8c5891
item_func.h:
...
Fixed bug #9939 : a wrong conversion of arguments
for functions COALESCE and IFNULL.
The str_op virtual method was added into Item_func_numhybrid.
item_func.cc:
Fixed bug #9939 : a wrong conversion of arguments
for functions COALESCE and IFNULL.
The str_op virtual method was added into Item_func_numhybrid.
item_cmpfunc.h, item_cmpfunc.cc:
Fixed bug #9939 : a wrong conversion of arguments
for functions COALESCE and IFNULL.
Item_func_coalesce and Item_func_ifnull now
inherit from a modified Item_func_numhybrid.
case.test, case.result:
Added test cases for bug #9939 .
2005-06-02 07:27:02 -07:00
serg@serg.mylan
cdb1474dae
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-02 15:46:55 +02:00
serg@serg.mylan
4df47b9e4a
cleanup
2005-06-02 15:45:20 +02:00
schwenke@lmy003.wdf.sap.corp
49e5fafeaf
Merge
2005-06-02 15:40:52 +02:00
schwenke@lmy003.xl.local
7d6b47c994
misc. fixes for windoze builds
2005-06-02 15:32:02 +02:00
evgen@moonbone.local
f89352602c
Fix bug #9669 Ordering on IF function with FROM_UNIXTIME function fails
...
Integer overflow results in wrong field sortlength.
2005-06-02 17:00:07 +04:00
mskold@mysql.com
ca679df824
Modified handling of guarded predicates at condition pushdown to storage engine, to make valgrind happy
2005-06-02 14:48:19 +02:00
mskold@mysql.com
cc524b4fda
Removed bug introduced when implementing support for IN and BETWEEN
2005-06-02 14:46:58 +02:00
bar@mysql.com
95484f7996
Merge mysql.com:/usr/home/bar/mysql-4.1.sysvar
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-06-02 17:13:37 +05:00
bar@mysql.com
e686057259
item_func.cc:
...
set_var.cc:
variables.result
variables.test
Bug #10904 Illegal mix of collations between a system variable and a constant
Changing coercibility of system variables to SYSCONST,
to be the same with USER(), DATABASE(), etc.
2005-06-02 16:17:44 +05:00
gluh@eagle.intranet.mysql.r18.ru
477feba00f
Fix for bug#10964: Information Schema:Authorization check on(2nd version, after review)
...
privilege tables is improper
added privilege check for USER_PRIVILEGES, SCHEMA_PRIVILEGES,
TABLE_PRIVILEGES, COLUMN_PRIVILEGES tables
2005-06-02 15:33:53 +05:00
ingo@mysql.com
9dc980b131
Merge mysql.com:/home/mydev/mysql-4.1-4100
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-06-02 11:44:49 +02:00
serg@serg.mylan
f3a95357fe
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-02 11:02:01 +02:00
tomas@poseidon.ndb.mysql.com
2dca9d5953
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-06-02 10:44:48 +02:00
ingo@mysql.com
3ba1b99034
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-06-02 10:02:08 +02:00
tomas@poseidon.ndb.mysql.com
bef102ec90
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-06-02 09:50:47 +02:00
brian@zim.(none)
d11ba2ca04
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-06-01 22:50:00 -07:00
brian@zim.(none)
113a99626d
Merge of 4.1->5.0. This contained the fixes for GCC 4.0
2005-06-01 21:56:30 -07:00
kent@mysql.com
f0fcc54b0c
Merge
2005-06-02 04:45:09 +02:00
brian@zim.(none)
efb5ed5bab
Merge
2005-06-01 18:48:29 -07:00
jimw@mysql.com
b884660a83
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-01 18:10:02 -07:00
jimw@mysql.com
1c387c8f71
Restore a bit of code accidently deleted during merge
2005-06-01 18:08:39 -07:00
kent@mysql.com
f889f0884c
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-06-02 02:57:18 +02:00
kent@mysql.com
bd48eed988
tztime.cc:
...
Set #pragma implementation" earlier
Many files:
Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
2005-06-02 02:43:32 +02:00
brian@zim.(none)
ba9b9f8993
Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed a number of dumb things in ha_tina.
2005-06-01 17:34:10 -07:00
tomas@poseidon.ndb.mysql.com
39f6972fd3
Makefile.am:
...
removed bitvector
2005-06-02 01:57:27 +02:00
tomas@poseidon.ndb.mysql.com
bd60e866ce
.del-bitvector.h~781aeab4a8d8c6da:
...
Delete: sql/bitvector.h
.del-bitvector.cc~604d2cbc5915345:
Delete: sql/bitvector.cc
2005-06-02 01:56:38 +02:00
tomas@poseidon.ndb.mysql.com
27b48cbaee
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-06-02 01:18:03 +02:00
jimw@mysql.com
ed18369236
Fix --with-bdb to be --with-berkeley-db in BUILD/SETUP.sh
2005-06-01 16:16:25 -07:00
jimw@mysql.com
8b0daa8445
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-01 16:13:25 -07:00
jimw@mysql.com
5a271e2c12
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-01 16:13:24 -07:00
tomas@poseidon.ndb.mysql.com
a60bdadb31
Bug #11019 mgmapi start backup in some cases returns wrong backupid
2005-06-02 01:13:23 +02:00
jimw@mysql.com
f5f88703b2
Fix compile error when HAVE_BERKELEY_DB
2005-06-01 16:03:41 -07:00
tomas@poseidon.ndb.mysql.com
85d0906201
configure.in:
...
merge
2005-06-02 00:52:51 +02:00
tomas@poseidon.ndb.mysql.com
925548d349
Merge
2005-06-02 00:51:30 +02:00
jimw@mysql.com
fb51d6eca5
Update results of test after merge of bugfix
2005-06-01 14:35:02 -07:00
jimw@mysql.com
d4be534815
Merge mysql.com:/home/jimw/my/mysql-4.1-8572
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-01 13:03:13 -07:00
jimw@mysql.com
b8f3c515ba
Merge mysql.com:/home/jimw/my/mysql-4.1-9660
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-01 13:02:26 -07:00
jimw@mysql.com
4f6db49795
Merge mysql.com:/home/jimw/my/mysql-4.1-10944
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-01 13:00:32 -07:00
jimw@mysql.com
0a2d95e983
Merge mysql.com:/home/jimw/my/mysql-4.1-8135
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-01 12:59:11 -07:00
tomas@poseidon.ndb.mysql.com
946e0f85dd
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-06-01 21:08:58 +02:00
serg@serg.mylan
0c69fe8428
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-01 20:04:53 +02:00
jimw@mysql.com
7ac7bfc3c8
Fix handling of NULL fields in FIELD(). (Bug #10944 )
2005-06-01 09:48:25 -07:00