msvensson@neptunus.(none)
3d478a6d9f
Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-01-12 18:45:49 +01:00
msvensson@neptunus.(none)
254e626a56
Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
...
into neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup
2006-01-12 18:21:35 +01:00
msvensson@neptunus.(none)
7f919f9ef7
Use "test ! -s" to check that file does not exist
2006-01-12 18:19:57 +01:00
bar@mysql.com
77e9461f88
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.fscs3
2006-01-12 11:48:48 +04:00
bar@mysql.com
28ed7c0c9f
sql_table.cc:
...
Typo fix.
Thanks Serg for noticing this.
2006-01-12 11:41:57 +04:00
brian@zim.tangent.org
fb7288c2a2
Fixed typo.
...
Really dumb typo....
2006-01-11 22:59:08 -08:00
brian@zim.tangent.org
c30f88f86d
Added bitfield support and a test for it.
...
Archive uses native row format, so honestly this is just the change in a flag.
2006-01-11 21:16:51 -08:00
brian@zim.(none)
ee872b266a
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/archive-5.1
2006-01-11 19:16:56 -08:00
andrey@lmy004.
0a140a3752
delete the stale file and this should fix the build
...
after my push of WL#1034 (Internal CRON) into 5.1
2006-01-12 01:22:52 +01:00
brian@zim.(none)
605f3ab586
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/archive-5.1
2006-01-11 12:06:30 -08:00
andrey@lmy004.
b9de3d7f32
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-11 19:50:59 +01:00
tomas@poseidon.ndb.mysql.com
25af1c1daf
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-01-11 19:50:58 +01:00
tomas@poseidon.ndb.mysql.com
0a0fe2b1c0
bug: replication of table spaces to work
...
bug: check if storage engine is enabled to avoif code dump
2006-01-11 19:49:38 +01:00
andrey@lmy004.
a6d4732ccb
WL #1034
...
- add a bit more debug messages
- disable events.test for now due to a bug
2006-01-11 19:31:21 +01:00
jmiller@mysql.com
d228d61a5c
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-11 18:50:53 +01:00
jmiller@mysql.com
f95ebd12ba
Changes done from Jonas's review of pervious commit
2006-01-11 18:50:04 +01:00
brian@zim.(none)
bee896be2d
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/archive-5.1
2006-01-11 09:37:48 -08:00
andrey@lmy004.
50ca86f9d6
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-11 18:10:27 +01:00
andrey@lmy004.
71eb7d7ec9
WL #1034 (Internal CRON) pre-push updates
...
- various fixes of test cases
(hopefully the last pre-push update before the push)
2006-01-11 18:09:05 +01:00
jmiller@mysql.com
68ef8b07cd
Test clean up and moving over from old clone.
2006-01-11 17:06:14 +01:00
msvensson@devsrv-b.mysql.com
a8ce050acf
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into devsrv-b.mysql.com:/space/magnus/my51-wl2930_fixup
2006-01-11 16:16:50 +01:00
andrey@lmy004.
079237a90f
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-11 16:06:05 +01:00
svoj@april.(none)
be55de4ff3
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into april.(none):/home/svoj/devel/mysql/warnings/mysql-5.1-new
2006-01-11 17:20:44 +04:00
knielsen@mysql.com
dd3dc1e398
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/tmpbuild2
2006-01-11 14:04:44 +01:00
mats@mysql.com
67a48b02bf
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/bkroot/mysql-5.1-new
2006-01-11 13:53:35 +01:00
knielsen@mysql.com
aaca50207d
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-11 13:06:20 +01:00
msvensson@devsrv-b.mysql.com
7e97a12212
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into devsrv-b.mysql.com:/space/magnus/my51-wl2930_fixup
2006-01-11 13:03:09 +01:00
andrey@lmy004.
b7117c448e
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-11 12:51:17 +01:00
andrey@lmy004.
c326d96535
WL #1034 (Internal CRON) pre-push fixes
...
after another merge fixes.
2006-01-11 12:49:56 +01:00
gluh@mysql.com
2f27c6499d
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-01-11 15:45:03 +04:00
jonas@perch.ndb.mysql.com
b2d5ea4676
Fix handlerton alter_tablespace for example storage engine
2006-01-11 12:39:09 +01:00
gluh@mysql.com
f07d2aaac6
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-01-11 15:05:40 +04:00
gluh@eagle.intranet.mysql.r18.ru
9f729c45d7
Additional fix for wl#2506
2006-01-11 15:04:18 +04:00
andrey@lmy004.
8515610f2e
manual merge
2006-01-11 12:01:36 +01:00
mats@mysql.com
0933a3bc34
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/b16095-mysql-5.1-new
2006-01-11 11:50:09 +01:00
jonas@perch.ndb.mysql.com
161645c81e
wl2723 - ndb opt. nr
2006-01-11 11:35:25 +01:00
msvensson@neptunus.(none)
4bcc1845eb
Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
...
into neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup
2006-01-11 11:21:23 +01:00
msvensson@neptunus.(none)
f60f757689
Add comments that groups and describes the inits
2006-01-11 11:10:58 +01:00
msvensson@neptunus.(none)
f4ad824df9
Remove obsolete comment
2006-01-11 11:07:17 +01:00
msvensson@neptunus.(none)
2f48e4f1dc
Fix problem with strange printout of line numbers, detected on aix52, but existing on all platforms, just being masked by init of vars to zero.
2006-01-11 11:06:26 +01:00
knielsen@mysql.com
adce077dfb
Merge mysql.com:/usr/local/mysql/mysql-5.0-sol10-sparc-a-fix
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-11 09:21:11 +01:00
mats@mysql.com
31c3ae5603
Bug#16095 (INSERT DELAYED crashes mysqld server):
...
Checking that binlog is open before calling binlog_query().
2006-01-11 09:16:24 +01:00
brian@zim.(none)
b56432cd19
Added support for CREATE TABLE AUTO_INCREMENT and added more tests. Also non-unique index scans of autoincrement not function.
2006-01-10 22:54:34 -08:00
msvensson@neptunus.(none)
d42d399464
Disable code for "let" to assign each column from query to it's own variable
2006-01-11 00:24:57 +01:00
andrey@lmy004.
cda83534b1
WL #1034 (Internal CRON) pre-push update
...
fix errmsg.txt
2006-01-10 21:47:12 +01:00
mskold@mysql.com
0f7214d9dc
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-01-10 21:43:09 +01:00
mskold@mysql.com
cb1bd7d7ae
Can't repeat bug#15004, enable tests again
2006-01-10 21:39:12 +01:00
andrey@lmy004.
7c049782fa
WL #1034 (Internal CRON)
...
merge before push
2006-01-10 21:02:19 +01:00
andrey@lmy004.
d2f0002e77
WL #1034 (Internal CRON) pre-push updates
...
- fixed test results
- fixed bug caught by information_schema.test . Bison temporal
variables are very nice but extremely error-prone (Count one more
time just to be sure).
2006-01-10 19:16:58 +01:00
msvensson@neptunus.(none)
43d563b073
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2006-01-10 18:09:39 +01:00