tsmith@ramayana.hindu.god
f5fdb53a35
Bug #27014 : Imperfect error/warning message for STR_TO_DATE for invalid datetime value
...
Fix name of function in warning message.
2007-08-30 23:57:39 -06:00
tsmith@ramayana.hindu.god
cefe7a3c8b
Merge ramayana.hindu.god:/home/tsmith/m/bk/51-target22
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-30 14:56:24 -06:00
tsmith@ramayana.hindu.god
ebe3894004
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-30 14:54:19 -06:00
tsmith@ramayana.hindu.god
58ecaaa859
Disable rpl_ndb_2other, which has never worked on bigendian machines.
2007-08-30 14:13:05 -06:00
msvensson@pilot.(none)
45667e6429
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-30 07:25:18 +02:00
tsmith@sita.local
653f7341bb
Post-merge fixes, and disable buggy test case on embedded
2007-08-29 16:58:00 -06:00
brian@piggy.tangent.org
52ae4496c5
Added ORDER BY to udf select so that results are ordered.
2007-08-29 14:36:08 -07:00
tsmith@sita.local
e32bdff6f0
Merge sita.local:/Users/tsmith/m/bk/maint/51-target22
...
into sita.local:/Users/tsmith/m/bk/maint/51
2007-08-29 15:28:38 -06:00
antony@pcg5ppc.xiphis.org
6969ff2481
Fix pushbuild test failures which occur on big-endian systems.
...
Do not convert innodb autoincrement value to little endian when on
big endian systems.
2007-08-29 13:02:02 -07:00
msvensson@pilot.(none)
8efb5ab34e
Merge pilot.(none):/data/msvensson/mysql/my51-m-imsuite
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-29 19:08:35 +02:00
msvensson@pilot.(none)
61dbfb3a01
Move instance manager tests to it's own suite
2007-08-29 19:02:33 +02:00
msvensson@pilot.(none)
50320790d5
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-29 17:54:40 +02:00
msvensson@pilot.(none)
b1fdece307
Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-29 17:54:16 +02:00
msvensson@pilot.(none)
ac5309cb04
Remove any old pidfile before starting mysqld to make sure that
...
'mysqld_wait_started' don't return prematurely because of an old
pidfile
2007-08-29 17:54:02 +02:00
mats@kindahl-laptop.dnsalias.net
f85fa9c06f
Merge kindahl-laptop.dnsalias.net:/home/bk/b29968-merge-5.1-rpl
...
into kindahl-laptop.dnsalias.net:/home/bk/merge-5.1-target-5.1.22
2007-08-29 16:12:54 +02:00
mats@kindahl-laptop.dnsalias.net
65399a4bb5
BUG#29968 (rpl_ndb_circular.test and rpl_ndb_log.test fail):
...
Removing unguarded read of slave_running field from inside
terminate_slave_threads(). This could cause premature exit in the event
that the slave thread already were shutting down, but isn't finished yet.
The fields slave_running, io_thd, and sql_thread are guarded by an
associated run_lock. A read of these fields were not guarded inside
terminate_slave_threads(), which caused an assertion to fire. The
assertion was removed, and the code reorganized slightly.
2007-08-29 16:06:59 +02:00
msvensson@pilot.(none)
d3d25d114a
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-29 14:46:33 +02:00
msvensson@pilot.(none)
1a1bbf2da0
Remove unportable use of "system rm"
2007-08-29 14:44:23 +02:00
msvensson@pilot.(none)
4c571eb3e8
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-29 14:40:38 +02:00
msvensson@pilot.(none)
2028c2b696
Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-29 14:39:59 +02:00
msvensson@pilot.(none)
f164a136e1
Fix typo: '$$' => '$'
2007-08-29 14:39:40 +02:00
msvensson@pilot.(none)
758f2fc71e
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-29 12:47:28 +02:00
msvensson@pilot.(none)
aa57f6106c
Remove unportable use of "system rm"
2007-08-29 12:47:00 +02:00
msvensson@pilot.(none)
9ffb05dbbf
Remove unportable "system rm"
2007-08-29 12:44:43 +02:00
msvensson@pilot.(none)
e10fb4ffb3
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-29 11:55:03 +02:00
msvensson@pilot.(none)
bce2f6bba8
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-29 11:54:26 +02:00
msvensson@pilot.(none)
044f7a3270
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-29 11:54:21 +02:00
msvensson@pilot.(none)
523cddeec3
Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-29 11:53:36 +02:00
msvensson@pilot.(none)
b68689172f
Remove unportable use of "exec chmod"
2007-08-29 11:53:15 +02:00
msvensson@pilot.(none)
387990f78d
Add 'mtr_rmtree'
2007-08-29 11:51:34 +02:00
tomas@whalegate.ndb.mysql.com
afb817e95a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
2007-08-29 09:50:20 +02:00
tomas@whalegate.ndb.mysql.com
53eaf05bb2
Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
...
- reverting patch as there where unknows sideeffects that we do not have time to follow up on just now
2007-08-29 09:44:37 +02:00
tsmith@ramayana.hindu.god
9410759277
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-28 13:25:06 -06:00
tsmith@ramayana.hindu.god
044cd7b471
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/b27694/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-28 13:24:31 -06:00
tsmith@ramayana.hindu.god
0af6a5fa9e
Fix another compiler warning on Windows in InnoDB.
2007-08-28 10:17:15 -06:00
msvensson@pilot.(none)
3df9790e41
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-28 16:47:41 +02:00
msvensson@pilot.(none)
4a7087526f
Streamline "do_close_connection" and "do_send_quit"
...
Fix typo, "next_con" -> "con"
2007-08-28 16:47:05 +02:00
msvensson@pilot.(none)
d11d6ea773
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-28 16:44:51 +02:00
msvensson@pilot.(none)
397fbd0289
Remove unportable constructs in loaddata.test
2007-08-28 16:44:31 +02:00
msvensson@pilot.(none)
dc4d29bf23
Remove unportable construct in loaddata.test
2007-08-28 15:35:42 +02:00
msvensson@pilot.(none)
221dba148e
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-28 15:33:14 +02:00
msvensson@pilot.(none)
440caf3e10
Remove unportable constructs in loaddata.test
2007-08-28 15:32:44 +02:00
msvensson@pilot.(none)
4a013e295d
Move "analyze_testcase_failure" to mysqltest(since it knows best when
...
to perform this analyzis)
2007-08-28 15:32:13 +02:00
msvensson@pilot.(none)
26afeffa74
Temp disable of icheck
2007-08-28 12:41:25 +02:00
msvensson@pilot.(none)
ccfbae831f
Fix warning
2007-08-28 11:39:29 +02:00
msvensson@pilot.(none)
cae9149d7c
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-28 11:36:10 +02:00
msvensson@pilot.(none)
bce8ea54ff
Merge pilot.(none):/data/msvensson/mysql/bug28812/my50-bug28812
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-28 11:35:22 +02:00
msvensson@pilot.(none)
c2b817013c
Merge pilot.(none):/data/msvensson/mysql/yassl_import/my50-yassl_import
...
into pilot.(none):/data/msvensson/mysql/bug28812/my50-bug28812
2007-08-28 11:35:05 +02:00
msvensson@pilot.(none)
ec421a02a9
Bug#28812 rpl_ssl fails due to assert in extra/yassl/src/socket_wrapper.cpp:117
...
- Merge sslaccept and sslconnect.
- Atomically "reset" vio to VIO_TYPE_SSL when the SSL connection has
succeeded, this avoids having to revert anything and thus protects
against "close_active_vio" in the middle.
- Add some variance to the testcase
2007-08-28 11:34:43 +02:00
msvensson@pilot.(none)
bb4ce6d212
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-28 11:16:26 +02:00