msvensson@neptunus.(none)
0c23f81dcb
C99 Portability fix
2005-04-21 21:47:58 +02:00
lenz@mysql.com
d4b4cab910
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/my/mysql-5.0
2005-04-21 21:28:13 +02:00
lenz@mysql.com
a70a3a8ed9
Merge mysql.com:/space/my/mysql-4.1-build
...
into mysql.com:/space/my/mysql-5.0-build
2005-04-21 21:17:42 +02:00
lenz@mysql.com
11bb365f68
- added missing file config_readline.h to the source distribution
2005-04-21 21:15:35 +02:00
acurtis@xiphis.org
310c360465
C99 Portability fix
2005-04-21 18:38:34 +01:00
ramil@mysql.com
50ada0a01c
A fix (Bug #9489 : Problem with BIT_OR and MySQL 5.0.3)
2005-04-21 21:06:08 +05:00
acurtis@xiphis.org
a6b68d51ec
Bug#8861
...
Correct previous bugfix
2005-04-21 15:36:10 +01:00
acurtis@xiphis.org
c5d94db336
Merge
2005-04-21 13:34:39 +01:00
acurtis@xiphis.org
f67507588f
Bug#8861 - If Return is a YEAR data type, value is not shown in year format
...
Bug partially fixed by 9775/9102 work on SP function return.
2005-04-21 13:22:47 +01:00
mskold@mysql.com
564eb3dc98
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-21 13:12:59 +02:00
mskold@mysql.com
29f8460e7b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-21 13:10:05 +02:00
mskold@mysql.com
ad9fba9f38
Fix for failing ps_7ndb.test, force write_row when batching inserts so that update of primary key is done before next value to insert
2005-04-21 13:09:19 +02:00
pekka@mysql.com
f0c6908a5a
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/export/space/pekka/ndb/version/my50
2005-04-21 12:55:19 +02:00
pekka@mysql.com
ae2346dd94
ndb - fix typo
2005-04-21 12:53:40 +02:00
lenz@mysql.com
acfd4070cb
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/my/mysql-5.0
2005-04-21 12:43:12 +02:00
sergefp@mysql.com
c2a8d2c061
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug9912
2005-04-21 13:36:06 +04:00
sergefp@mysql.com
0e7e062465
Fix for BUG#9912: make the test handle both possible optimizer choices
2005-04-21 13:32:46 +04:00
mskold@mysql.com
8ee8108cb5
Disabled test for embedded
2005-04-21 11:11:37 +02:00
mskold@mysql.com
fcf18dafee
Re-generated
2005-04-21 10:59:21 +02:00
lenz@mysql.com
22bed10007
Merge mysql.com:/space/my/mysql-5.0
...
into mysql.com:/space/my/mysql-5.0-build
2005-04-21 10:39:15 +02:00
mskold@mysql.com
8c45ec5607
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-21 10:32:58 +02:00
hf@deer.(none)
f83481923b
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-04-21 13:29:06 +05:00
ingo@mysql.com
eeda9b3f8c
After merge fix.
2005-04-21 10:29:05 +02:00
lenz@mysql.com
f9a44aa249
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-04-21 10:27:37 +02:00
mskold@mysql.com
b1c8e44ead
Merge
2005-04-21 10:26:14 +02:00
hf@deer.(none)
64f4fd2bbd
Merging
2005-04-21 13:19:02 +05:00
mskold@mysql.com
e0fe3e75c7
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-21 09:27:20 +02:00
lenz@mysql.com
03fccad9b4
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-04-21 09:08:09 +02:00
lenz@mysql.com
918ce29557
- manual merge
2005-04-21 08:30:59 +02:00
ingo@mysql.com
5ed49fbfef
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-04-21 08:22:43 +02:00
hf@deer.(none)
53b496a356
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.7344
2005-04-21 11:10:28 +05:00
hf@deer.(none)
c6464cab0d
Fix for bug #7344 (Repeating mysql_server_start/mysql_server_end crash clients)
...
One more free_charset call added
2005-04-21 10:58:58 +05:00
igor@rurik.mysql.com
ca35e36310
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-04-20 16:39:31 -07:00
igor@rurik.mysql.com
20250dc497
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-04-20 15:08:22 -07:00
sergefp@mysql.com
c2959178ca
Fix for BUG#10037
...
* Add 0.01 to cost of 'range'+'using index' scan to avoid optimizer choice races with
'index' scan.
2005-04-21 01:55:33 +04:00
ingo@mysql.com
bee3f9e95f
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-04-20 23:04:27 +02:00
lenz@mysql.com
7ca62cc674
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-04-20 20:44:18 +02:00
joerg@mysql.com
eaa79cb452
Step 2 of the switch to support configuration with NPTL:
...
Define a new CPP symbol that the target OS is Linux, and use it where only the OS matters and not the threads Library.
Until now, 'HAVE_LINUXTHREADS' was used to indicate "Target is Linux" in many places.
When we support configuration with NPTL but no Linuxthreads, this misuse must cease.
2005-04-20 20:38:57 +02:00
joerg@mysql.com
48ba5e4956
Step 1 of the switch to support configuration with NPTL:
...
Rename 'IS_LINUX' configuration variable to 'TARGET_LINUX'.
2005-04-20 20:10:28 +02:00
acurtis@xiphis.org
8689083aca
Bug#9775 - Stored procedures: crash if create function that returns enum or set
...
Fix bug and implement return type casting.
2005-04-20 18:08:42 +01:00
heikki@hundin.mysql.fi
8974ce0836
Many files:
...
Semi-synchronous replication for InnoDB type tables; before telling the client that a commit has been processed, wait that the replication thread has returned from my_net_send() where it sends the binlog to the slave; note that TCP/IP, even with the TCP_NODELAY option does not guarantee that the slave has RECEIVED the data - this is just heuristic at the moment; this is useful in failover: in almost all cases, every transaction that has returned from the commit has been sent and processed in the slave, which makes failover to the slave simpler if the master crashes; the code does not work yet as is, because MySQL should call innobase_report_binlog_offset_and_commit() in a commit; we will most probably return that call to 5.0.x, to make InnoDB Hot Backup and group commit to work again; XA code broke them temporarily in 5.0.3
2005-04-20 19:27:46 +03:00
pem@mysql.com
ab0ff5349d
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-04-20 18:00:51 +02:00
pem@mysql.comhem.se
54dfe4a66a
Fixed BUG#7047: Stored procedure crash if alter procedure
...
by simply disallowing alter procedure/function in an SP (as for drop).
2005-04-20 17:59:28 +02:00
pekka@mysql.com
737a866faa
ndb - dbug aid for api signal log
2005-04-20 16:09:00 +02:00
ingo@mysql.com
692093c041
Hand merge, which needs fixes.
2005-04-20 15:50:29 +02:00
pem@mysql.comhem.se
189d6b502b
Fixed BUG#6898: Stored procedure crash if GOTO statements exist
...
Bug in the optimizer caused an infinite loop for weird code.
2005-04-20 15:37:07 +02:00
ingo@mysql.com
c179d0c1cc
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug7806
2005-04-20 15:04:00 +02:00
ingo@mysql.com
8faed37945
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug7806
2005-04-20 12:24:22 +02:00
msvensson@neptunus.(none)
32a872938e
manual merge
2005-04-20 12:06:11 +02:00
msvensson@neptunus.(none)
b26d29a081
After review fix
2005-04-20 12:02:07 +02:00