mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
29608 commits 2793 branches 343 tags 1.7 GiB
Commit graph

29608 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
tomas@poseidon.ndb.mysql.com
4b731ddfb4 wl2325 wl2324 2006-01-12 19:51:02 +01:00
jani@ua141d10.elisa.omakaista.fi
4d59111a1c Fixed a bug in merge. 2006-01-12 20:49:47 +02:00
jani@ua141d10.elisa.omakaista.fi
8f3645e6f0 Fix for Netware build. 2006-01-12 20:31:00 +02:00
jani@ua141d10.elisa.omakaista.fi
617585eb33 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2006-01-12 20:28:23 +02: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
jonas@perch.ndb.mysql.com
087f573168 sql/event.h 
remove extra qualification makeing gcc4 barf
 2006-01-12 18:30:47 +01:00
msvensson@neptunus.(none)
fac966560a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-01-12 18:25:51 +01:00
msvensson@neptunus.(none)
0dffbdfb61 Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-01-12 18:23:44 +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
jonas@perch.ndb.mysql.com
9e35866aa6 Merge perch.ndb.mysql.com:/home/jonas/src/51-new 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
 2006-01-12 17:04:57 +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
jonas@perch.ndb.mysql.com
4d7cfa322b Merge perch.ndb.mysql.com:/home/jonas/src/51-new 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
 2006-01-12 16:59:27 +01:00
jonas@perch.ndb.mysql.com
fc59260f8f ndb - 
Fix partial SR
 2006-01-12 16:58:41 +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
jani@ua141d10.elisa.omakaista.fi
8c6a32b997 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
 2006-01-12 17:47:58 +02: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
mskold@mysql.com
f20d2e2e5b 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-12 15:52: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
jani@ua141d10.elisa.omakaista.fi
af845f6eff NetWare specific change to increase thread stack size. 
Changes to Netware specific mysqld_safe.c
 2006-01-12 15:10:12 +02:00
monty@mysql.com
4d0fd66bdd Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/my/mysql-4.1
 2006-01-12 14:40:39 +02: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
bar@mysql.com
6301568290 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-01-12 16:07:06 +04:00
bar@mysql.com
5f17cbaba4 sql_show.cc: 
after-merge fix for
  bug#15581 COALESCE function truncates mutli-byte TINYTEXT values
 2006-01-12 16:05:46 +04:00
mskold@mysql.com
11db2391f8 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-12 13:00:16 +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
mskold@mysql.com
e037dddc35 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-12 11:51:01 +01:00