dlenev@mysql.com
7b294bdc8d
Merge of patch for bug #3891 into 5.0 tree.
2005-04-03 10:36:18 +04:00
dlenev@mysql.com
da53d7bc88
Manual merge of fix for bug #8894 "TIMESTAMP values scrambled/misaligned
...
when using --new" into 4.1 tree.
2005-04-03 10:05:01 +04:00
dlenev@mysql.com
a663889569
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dlenev/src/mysql-4.0-bg8894
2005-04-03 09:48:09 +04:00
serg@serg.mylan
ddee2fa7fb
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-04-02 21:45:02 +02:00
serg@serg.mylan
4a0e73c63a
results updated
2005-04-02 21:36:50 +02:00
serg@serg.mylan
7ba99ee324
merged
2005-04-02 20:28:58 +02:00
serg@serg.mylan
3098b93ef8
bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
...
sql/sql_table.cc: print an error with a function that respects width modifiers (%.64s)
2005-04-02 20:13:19 +02:00
bell@sanja.is.com.ua
4e916e251b
postreview patch
2005-04-02 18:45:44 +03:00
bell@sanja.is.com.ua
3061a749e6
fix of required privileges for altering view VIEW (DELETE->DROP) (BUG#9260)
2005-04-02 18:05:00 +03:00
kent@mysql.com
2292480e79
mysqld.dsp:
...
Corrected wrong exe naming from bad merge
2005-04-02 03:35:28 +02:00
mskold@mysql.com
9f7ad11e34
Added more types
2005-04-01 22:14:30 +02:00
mskold@mysql.com
e95f19afca
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-01 20:58:25 +02:00
mskold@mysql.com
f2deb39f06
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-01 20:52:55 +02:00
mskold@mysql.com
5adfa12df2
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-01 18:02:51 +02:00
mskold@mysql.com
cf7c0e43cb
Fix for bug#9435: TIMESTAMP columns don't update
2005-04-01 17:59:46 +02:00
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
