Commit graph

29435 commits

Author SHA1 Message Date
brian@zim.tangent.org
be993c9a23 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.tangent.org:/home/brian/mysql/slap-5.1
2006-01-12 13:31:12 -08:00
brian@zim.tangent.org
650731acf0 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.tangent.org:/home/brian/mysql/slap-5.1
2006-01-12 12:29:02 -08:00
brian@zim.tangent.org
0f50bfa486 Fixed bug #16167
Added --use-threads option for porting to Windows.
2006-01-12 12:27:25 -08:00
ingo@mysql.com
acb31ce696 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-wl1563
2006-01-12 20:21:20 +01:00
andrey@lmy004.
4f792bbdf5 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-12 19:53:23 +01:00
andrey@lmy004.
4621320edf WL #1034 (Internal CRON) post-push fix
fix problem that gcc4 does not like at all
2006-01-12 19:51:13 +01:00
brian@zim.tangent.org
efd00c65f2 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.tangent.org:/home/brian/mysql/slap-5.1
2006-01-12 10:23:41 -08:00
brian@zim.tangent.org
ca560db79f Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.tangent.org:/home/brian/mysql/slap-5.1
2006-01-12 09:55:22 -08:00
msvensson@neptunus.(none)
9772563d78 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-01-12 18:47:16 +01:00
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
ingo@mysql.com
54c1827245 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-wl1563
2006-01-12 18:06:12 +01:00
jmiller@mysql.com
6a65263a9c 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-12 17:50:51 +01:00
ingo@mysql.com
01d8c6678e Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-wl1563
2006-01-12 17:29:14 +01:00
jmiller@mysql.com
340e0c0738 rpl_sp.test, disabled.def, rpl_stm_mystery22.test:
Test cleanip per lars
.del-rpl_row_sp000.result~2b24650b123e20a9:
  Delete: mysql-test/r/rpl_row_sp000.result
.del-rpl_row_sp000.test~645e2807516682b6:
  Delete: mysql-test/t/rpl_row_sp000.test
.del-rpl_row_sp000-slave.opt~d84baa1f59616d77:
  Delete: mysql-test/t/rpl_row_sp000-slave.opt
.del-rpl_row_sp000-master.opt~da625c0a51a2f08a:
  Delete: mysql-test/t/rpl_row_sp000-master.opt
rpl_sp.result:
  Rename: mysql-test/r/rpl_stm_sp.result -> mysql-test/r/rpl_sp.result
rpl_sp-master.opt:
  Rename: mysql-test/t/rpl_stm_sp-master.opt -> mysql-test/t/rpl_sp-master.opt
rpl_sp-slave.opt:
  Rename: mysql-test/t/rpl_stm_sp-slave.opt -> mysql-test/t/rpl_sp-slave.opt
rpl_sp.test:
  Rename: mysql-test/t/rpl_stm_sp.test -> mysql-test/t/rpl_sp.test
2006-01-12 17:05:25 +01:00
pekka@mysql.com
582488e8ac Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-01-12 17:01:34 +01:00
andrey@lmy004.
bd70a170b5 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-12 17:01:33 +01:00
andrey@lmy004.
e385a68fc0 WL #1034 (Internal CRON) post-push update
- fix compile failure on QNX and FreeBSD
2006-01-12 16:51:45 +01:00
pekka@mysql.com
3bf2255400 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-01-12 16:43:51 +01:00
knielsen@mysql.com
b5631897e4 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmpbuild-5.1
2006-01-12 16:43:50 +01:00
pekka@mysql.com
f71e3d631c ndb - wl#2972 tiny bugfix 2006-01-12 16:34:57 +01:00
pekka@mysql.com
5768d298a6 Merge mysql.com:/space/pekka/ndb/version/my51
into  mysql.com:/space/pekka/ndb/version/my51-rbr
2006-01-12 16:17:40 +01:00
knielsen@mysql.com
e533cfe6f6 Sun compiler fixes. 2006-01-12 15:40:38 +01:00
jmiller@mysql.com
4cc78e19d8 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-12 14:43:59 +01:00
jmiller@mysql.com
e4ecc367eb ndb_dd_ddl.test:
Added requested changes to test.
2006-01-12 14:31:42 +01:00
ingo@mysql.com
a1dd235f96 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-wl1563
2006-01-12 14:29:17 +01:00
andrey@lmy004.
8f86eac14f Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-12 14:20:35 +01:00
andrey@lmy004.
570db08105 WL #1034 (Internal CRON) post-push fixes.
fix INSERT/REPLACE statements so test suite runs again.
The question is why we have 2 parallel universes - 2 different
ways to start the test suite, a shell and perl version. One more case
where redundancy makes life nightmare.
2006-01-12 14:17:00 +01:00
jmiller@mysql.com
2158cbded8 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-12 13:34:58 +01:00
ingo@mysql.com
1bced005e3 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-wl1563
2006-01-12 12:37:54 +01:00
andrey@lmy004.
9f82755b81 WL #1034 (Internal CRON) post-push fix
- add Event_priv to db and host tables
2006-01-12 12:06:13 +01:00
andrey@lmy004.
e95d5b2aa1 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/tmp/mysql-5.1-new
2006-01-12 11:54:31 +01:00
andrey@lmy004.
2aba65db85 revert change to SETUP.sh which went through with my push of WL#1034 2006-01-12 11:51:34 +01:00
ingo@mysql.com
e22352b835 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-wl1563
2006-01-12 11:48:06 +01:00
jonas@perch.ndb.mysql.com
619ca4176b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/51-new
2006-01-12 11:31:51 +01:00
jonas@perch.ndb.mysql.com
c505553bd9 ndb_dd_ddl - fix bug 2006-01-12 11:30:17 +01:00
jonas@perch.ndb.mysql.com
6a0eac8418 ndb -
fix Suma get buffer ptr, adopt to new page pool in tup
2006-01-12 10:48:36 +01:00
pekka@mysql.com
f78e602895 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-01-12 10:36:05 +01:00
jonas@perch.ndb.mysql.com
c87e9032ef Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/51-new
2006-01-12 10:11:58 +01:00
ingo@mysql.com
16437321cb WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
NDB cluster is not fully supported. This will be added with
WL 1892 (NDB Handler: Add support for CREATE/DROP INDEX).
Some preparatory code for this is already present though.
A change for the "duplicate key" error message is planned
for another changeset.
2006-01-12 10:05:07 +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
19dbafc28c Adding a --use-threads options which I believe will allow it to be ported to windows. 2006-01-11 21:30:52 -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
pekka@mysql.com
49932a62b5 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-01-12 05:16:23 +01: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
pekka@mysql.com
7219ad013e Merge mysql.com:/space/pekka/ndb/version/my51
into  mysql.com:/space/pekka/ndb/version/my51-rbr
2006-01-12 00:17:11 +01:00