reggie@mdk10.(none)
a722daa1e3
Merge
2005-04-01 08:35:33 -06:00
reggie@mdk10.(none)
0eaafddfdd
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-04-01 08:18:49 -06:00
msvensson@neptunus.(none)
1a147cd744
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-01 12:40:54 +02:00
msvensson@neptunus.(none)
09b3d3e224
Manual merge
2005-04-01 12:35:49 +02:00
msvensson@neptunus.(none)
fe5384dad8
BUG#6554 Problem Building MySql on Fedora Core 3
...
- Remove the local static var
2005-04-01 12:32:47 +02:00
pekka@mysql.com
328b453c86
merge
2005-04-01 11:21:55 +02:00
pekka@mysql.com
57451feb1c
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/pekka/ndb/version/my50
2005-04-01 11:18:52 +02:00
msvensson@neptunus.(none)
6f9b118626
Merge
2005-04-01 11:15:11 +02:00
pekka@mysql.com
5b9bd8c0c8
Merge
2005-04-01 10:13:37 +02:00
sergefp@mysql.com
7ace3f1362
Better comment
2005-04-01 11:05:17 +04:00
bell@sanja.is.com.ua
45a79c9056
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-union_merge-5.0
2005-04-01 02:15:40 +03:00
bell@sanja.is.com.ua
1029e533df
postmerge 4.1->5.0 fixes
2005-04-01 02:14:30 +03:00
serg@serg.mylan
026dbe3a38
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-31 21:09:00 +02:00
svoj@mysql.com
47ed989639
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/mysql-5.0
2005-04-01 00:04:35 +05:00
svoj@mysql.com
8cffe4c382
BUG#9521 fix:
...
openssl_1 and rpl_openssl results difference
2005-04-01 00:03:26 +05:00
serg@serg.mylan
94ede0717a
include sql/examples in the window source distribution
2005-03-31 20:27:29 +02:00
mskold@mysql.com
1b0370c635
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-03-31 19:59:55 +02:00
mskold@mysql.com
b5e57be56b
Fixed so no merge conflict with 5.0
2005-03-31 19:18:50 +02:00
sergefp@mysql.com
70e677bd0f
Make the tests deterministic: change DELETE ... LIMIT to DELETE ... ORDER BY ... LIMIT
2005-03-31 20:23:10 +04:00
serg@serg.mylan
8d1a7a9752
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-31 17:50:22 +02:00
serg@serg.mylan
e5a50e1927
decimal_div bug#9501
2005-03-31 17:46:36 +02:00
reggie@mdk10.(none)
579124f03d
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-03-31 08:41:22 -06:00
reggie@mdk10.(none)
cca1e62b80
Bug #9175 seg fault on 'mysqldump --single-transaction --tab mysql nonexistent'
...
mysqldump.c:
Fixed get_actual_table_name so that it calls mysql_free_result in all cases that a non-NULl result is returned
2005-03-31 08:37:18 -06:00
pekka@mysql.com
af63ce9d22
ndb - fix small memory leak
2005-03-31 16:22:46 +02:00
magnus@msdesk.mysql.com
9c9149571d
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into msdesk.mysql.com:/home/magnus/mysql-5.0
2005-03-31 14:37:22 +02:00
mskold@mysql.com
75a4dc9644
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-03-31 14:33:51 +02:00
magnus@msdesk.mysql.com
e8434aadca
BUG#8585 ndb_cache2
...
- When deleting from a cursor the m_rows_changed variable was not properly incremented to indicate that m_share->commit_count should be cleared at end of trans.
2005-03-31 14:33:50 +02:00
mskold@mysql.com
9795e7eda9
Removed warnings
2005-03-31 14:31:06 +02:00
msvensson@neptunus.(none)
830b088fde
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-03-31 12:57:16 +02:00
petr@mysql.com
db9df14112
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/cps/mysql/trees/mysql-4.1
2005-03-31 14:36:56 +04:00
petr@mysql.com
8f5029b42c
Bug #9507 /etc/init.d/mysql script does not stop mysqld correctly
...
wait_for_pid function is fixed to wait for pid removal in "stop".
recomitted with post-review fix
2005-03-31 14:25:03 +04:00
pem@mysql.com
bb27307778
Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/bk/mysql-5.0
2005-03-31 10:54:15 +02:00
msvensson@neptunus.(none)
c732cae6e0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-03-31 10:51:00 +02:00
msvensson@neptunus.(none)
f4e3bcc015
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-31 10:47:32 +02:00
bell@sanja.is.com.ua
05d4ed14e4
merge 4.1->5.0
2005-03-31 10:39:48 +03:00
pekka@mysql.com
d2b78a2825
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my41
2005-03-31 05:01:22 +02:00
konstantin@mysql.com
3e2452024b
A fix for Bug#9443 "mysql_client_test fails on linux and some solaris
...
platforms": yet another issue with floating pointer comparisons.
The fix uses the workaround with volatiles.
2005-03-31 03:44:51 +04:00
monty@mysql.com
e9205dc0f0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-03-30 23:42:53 +03:00
monty@mysql.com
b43b7dc128
Enabled more tests of STR_TO_DATE()
...
Fixed that datetime gives warning for zero dates in traditional mode
2005-03-30 23:41:42 +03:00
pekka@mysql.com
10a03ce6c8
ndb - CSC#4927: ordered index + long pk, second half
2005-03-30 22:17:11 +02:00
bell@sanja.is.com.ua
7647ac833f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-union_merge-4.1
2005-03-30 23:09:19 +03:00
bell@sanja.is.com.ua
dc87075f86
postmerge fixes
2005-03-30 23:08:03 +03:00
msvensson@neptunus.(none)
e0be0546f6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-30 21:16:13 +02:00
bell@sanja.is.com.ua
c64efa6062
merge
2005-03-30 22:11:08 +03:00
joerg@mysql.com
9fdb18644f
Fix 'Bootstrap' to bypass a problem with "bk changes" by changing the directory before calling the command.
2005-03-30 20:39:37 +02:00
joerg@mysql.com
1314c4aaee
Portability fix (avoid bash-ism).
2005-03-30 18:38:54 +02:00
joerg@mysql.com
8e238f22b7
Ensure 'texi2html' is taken from the Docs tree, not to miss any corrections.
2005-03-30 17:59:36 +02:00
msvensson@neptunus.(none)
2e2ff0459f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-03-30 17:54:10 +02:00
pem@mysql.comhem.se
8df8afc270
Fixed BUG#6600: Stored procedure crash after repeated calls with check table.
...
Sedond attempt: Simply disallow CHECK in SPs, since it can't work.
2005-03-30 17:43:52 +02:00
ramil@mysql.com
8098ef79f0
after merge fix/
2005-03-30 18:57:56 +05:00
