monty@mysql.com
1e2e9e2856
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2006-02-25 21:54:34 +02:00
monty@mysql.com
54274976e7
Fixed compiler warnings from gcc 4.0.2:
...
- Added empty constructors and virtual destructors to many classes and structs
- Removed some usage of the offsetof() macro to instead use C++ class pointers
2006-02-25 17:46:30 +02:00
monty@mysql.com
a7df038d16
Add back free that I accidently removed in last patch
2006-02-25 13:58:00 +02:00
monty@mysql.com
eff69e73a3
Fixed typo
2006-02-25 13:49:43 +02:00
monty@mysql.com
dd1d40f8f8
Fixed new introduced bug in binlog.test with --ps-protocol
2006-02-25 13:24:18 +02:00
brian@zim.(none)
066c7148fb
Someone modified the output to explain but did not run all tests before pushing, otherwise they would have realized that they broke this test.
2006-02-24 15:51:01 -08:00
brian@zim.(none)
ec15323dc1
Fix error messages. Someone pushed a change to an error message but did not update the tests.
...
AKA someone pushed without testing.
2006-02-24 14:16:06 -08:00
brian@zim.(none)
a6041bdba8
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-02-24 13:41:38 -08:00
sergefp@mysql.com
8bb9343688
Fix a typo in dbug printout
2006-02-25 00:41:37 +03:00
brian@zim.(none)
cb07d52a7e
This patch cleans up two tests which were a bit fragile from other failing tests. It also removes some variables associated with removed RAID support.
2006-02-24 13:20:51 -08:00
monty@mysql.com
82b77cdd90
Fixes to embedded server to be able to run tests with it
...
(Needed for "list of pushes" web page and autopush)
2006-02-24 18:34:15 +02:00
andrey@lmy004.
79c9ba9ee5
last second additions for bug#16411
2006-02-24 15:28:20 +01:00
andrey@lmy004.
b6f338e9e5
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16411
2006-02-24 14:14:51 +01:00
andrey@lmy004.
b8941aec8f
add this file to revision control. there was not new line at the end of the file
...
fix for bug#16411
2006-02-24 14:10:24 +01:00
andrey@lmy004.
11e5e40ede
fix for bug #16411 (microseconds are allowed)
...
last fixes
2006-02-24 14:08:34 +01:00
andrey@lmy004.
734bfe4759
fix for bug #16411 (Microseconds are allowed for events)
2006-02-24 14:02:26 +01:00
knielsen@mysql.com
44b24ba1d7
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2006-02-24 13:56:42 +01:00
knielsen@mysql.com
436587e997
Fix mysqldump.test to work with non-standard --vardir.
...
(Backported from mysql-5.1-new)
2006-02-24 13:51:04 +01:00
andrey@lmy004.
fe426cae48
fix test result
...
fix for bug #16412 (post-merge fix)
2006-02-24 13:34:28 +01:00
andrey@lmy004.
c4602da973
merge
2006-02-24 12:03:32 +01:00
andrey@lmy004.
a594cd080c
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16412
2006-02-24 11:56:16 +01:00
andrey@lmy004.
c04b3f4a91
Fix output per bug #16412 (Events: SHOW PRIVILEGES gives incorrect information)
...
WL#1034 (Internal CRON)
2006-02-24 11:52:03 +01:00
knielsen@mysql.com
97229ca7fc
Fix mysqldump.test to work with non-standard --vardir.
2006-02-24 10:15:39 +01:00
paul@snake-hub.snake.net
082e9ddbe3
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-23 13:56:00 -06:00
paul@snake-hub.snake.net
b11c033f49
mysqltest.c:
...
Rearrange out of order options in option struct.
2006-02-23 13:54:55 -06:00
paul@snake-hub.snake.net
85869e5fde
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-23 11:08:16 -06:00
paul@snake-hub.snake.net
f47ed62fb0
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-23 11:07:56 -06:00
paul@snake-hub.snake.net
4ca8a492e2
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-23 09:41:04 -06:00
mskold@mysql.com
c56641a600
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-02-23 16:27:07 +01:00
mskold@mysql.com
dc156c193d
Added missing DBUG_RETURN
2006-02-23 16:25:52 +01:00
msvensson@neptunus.(none)
f824345be6
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-23 16:11:47 +01:00
paul@snake-hub.snake.net
b2529c2ab2
mysqld.cc:
...
Fix out of order entries in option struct.
2006-02-23 09:11:05 -06:00
msvensson@neptunus.(none)
33140311f1
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-23 16:10:36 +01:00
msvensson@neptunus.(none)
36a1d6392b
Change snprintf to my_snprintf
2006-02-23 16:08:28 +01:00
msvensson@neptunus.(none)
167b625e62
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-23 14:35:57 +01:00
msvensson@neptunus.(none)
269ab365aa
Aix52 build fix
2006-02-23 14:06:29 +01:00
konstantin@mysql.com
54c11dbe40
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/opt/local/work/mysql-5.1-new
2006-02-23 14:19:26 +03:00
konstantin@mysql.com
0ff41a11d2
Fix an const char->char conversion error.
2006-02-23 14:18:17 +03:00
msvensson@neptunus.(none)
3fbf02d869
After merge fix
2006-02-23 10:57:33 +01:00
msvensson@neptunus.(none)
3ece1f3eda
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-23 10:54:56 +01:00
knielsen@mysql.com
630a8202be
Fix bad merge
2006-02-23 10:51:33 +01:00
msvensson@neptunus.(none)
71ef9102c1
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-23 10:45:39 +01:00
msvensson@neptunus.(none)
8d78cd3e3c
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-23 10:41:37 +01:00
msvensson@neptunus.(none)
5c4bf37259
Merge fixup
2006-02-23 10:35:53 +01:00
konstantin@mysql.com
0621428d79
Fix a bad merge of mine.
2006-02-23 12:32:54 +03:00
msvensson@neptunus.(none)
f80555880a
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-23 10:30:31 +01:00
msvensson@neptunus.(none)
ec91a79c9f
Add new parameter to do_eval so that only unescaped variables in input string is expanded and rest of string is left untouched.
2006-02-23 10:11:57 +01:00
knielsen@mysql.com
776dd75fac
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/tmpbuild-5.1
2006-02-23 09:07:30 +01:00
pekka@mysql.com
c9353db37d
ndb - enable rpl_ndb_blob* again, disabled by accident
2006-02-23 00:35:32 +01:00
pekka@mysql.com
a2edc49ecd
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/space/pekka/ndb/version/my51
2006-02-22 23:18:45 +01:00