mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
36056 commits 2794 branches 343 tags 1.5 GiB
Commit graph

36056 commits

This branch
This branch
All branches
Author SHA1 Message Date
monty@mysql.com
a267b8f33c Don't read ~/.my.cnf in mysqldump.test 2006-06-30 04:10:27 +03:00
kent@mysql.com
593b359d92 mysql.spec.sh: 
Disable old RPM strip
my_global.h:
  Fixed wrong cast, which caused problems with gcc 4.0 and
  floats in prepared statements (Bug #19694)
mysqlmanager.vcproj:
  Place output files in common release/debug directory
 2006-06-30 02:49:28 +02:00
monty@mysql.com
b481762bae Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/my/mysql-4.1
 2006-06-30 02:44:13 +03:00
monty@mysql.com
d76830faa5 Merge mysql.com:/home/my/mysql-4.1 
into  mysql.com:/home/my/mysql-5.0
 2006-06-30 02:35:52 +03:00
evgen@sunlight.local
d126ca800c Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sunlight.local:/local_work/autopush/merge-4.1
 2006-06-30 03:34:54 +04:00
petr@mysql.com
157cc569a8 fix test failures 2006-06-30 03:28:58 +04:00
monty@mysql.com
8e2099295d Fixed include file usage 
hp_test2 now works again
Fixed wrong cast, which caused problems with gcc 4.0 and floats in prepared statements (Bug #19694)
 2006-06-30 02:25:35 +03:00
evgen@moonbone.local
3cc6d95d18 Merge 2006-06-30 02:03:09 +04:00
evgen@moonbone.local
9fd38baf13 Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt 
into moonbone.local:/work/merge-5.0
 2006-06-30 02:02:20 +04:00
tomas@poseidon.ndb.mysql.com
5f5c3f9ceb Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main 
into  poseidon.ndb.mysql.com:/home/tomas/5.0-merge
 2006-06-30 00:02:17 +02:00
tomas@poseidon.ndb.mysql.com
eb4a633a00 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/5.0-merge
 2006-06-30 00:00:27 +02:00
iggy@mysql.com
57e94d02c6 Merge mysql.com:/mnt/storeage/mysql-4.1 
into  mysql.com:/mnt/storeage/mysql-4.1_bug19298
 2006-06-29 17:30:50 -04:00
evgen@moonbone.local
83bc48f38e Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/merge-4.1
 2006-06-30 01:12:16 +04:00
tomas@poseidon.ndb.mysql.com
747c17ffa3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
 2006-06-29 23:12:15 +02:00
tomas@poseidon.ndb.mysql.com
97a19c1b9b Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-29 22:54:49 +02:00
monty@hasky.mysql.fi
0b00ae6bc5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-06-29 23:41:33 +03:00
kroki@mysql.com
21e1655f4d Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0 
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug20230
 2006-06-30 00:24:47 +04:00
monty@mysql.com
8eb9c06d70 Replaced assert with argument checking, as rpl_ndb_UUID caused slave to fail on x86 64 bit 
(It failed even if test was marked as skipped)
 2006-06-29 23:22:55 +03:00
kroki@mysql.com
1bcf6b1d09 Bug#20230: routine_definition is not null 
SHOW CREATE PROCEDURE and SHOW CREATE FUNCTION are fixed as well as
INFORMATION_SCHEMA.ROUTINES.ROUTINE_NAME.
 2006-06-30 00:21:55 +04:00
tomas@poseidon.ndb.mysql.com
3b3dde6f4e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-29 22:13:19 +02:00
tomas@poseidon.ndb.mysql.com
5d67b05203 corrected merge error 2006-06-29 22:11:29 +02:00
tomas@poseidon.ndb.mysql.com
9d902d4cf8 manual merge 2006-06-29 21:25:37 +02:00
tomas@poseidon.ndb.mysql.com
6fb6a1058c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-29 21:14:29 +02:00
tomas@poseidon.ndb.mysql.com
65cec4da00 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-29 21:07:07 +02:00
tomas@poseidon.ndb.mysql.com
6f318d1658 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-06-29 21:05:43 +02:00
tomas@poseidon.ndb.mysql.com
87460ec76a Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error 2006-06-29 20:55:21 +02:00
petr@owlet.
35b7eb7e22 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/home/cps/mysql/trees/5.1-team
 2006-06-29 21:48:53 +04:00
petr@mysql.com
4d76c28caa Fix Bug#20692 rpl_* tests failure on hpux 2006-06-29 21:43:52 +04:00
tomas@poseidon.ndb.mysql.com
dfce04fa67 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/5.0-merge
 2006-06-29 18:10:02 +02:00
joerg@mysql.com
7800da268a Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/merge-5.0 2006-06-29 17:35:59 +02:00
tomas@poseidon.ndb.mysql.com
42dfb7a88d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-29 17:26:22 +02:00
joerg@mysql.com
6f6b966d16 Test "federated" failed because the log contains fixed port numbers. 
Re-apply a patch by Knielsen in the 5.0.23 build clone: Replace port number by "SLAVE_PORT".
 2006-06-29 17:00:48 +02:00
joerg@mysql.com
1054e8f66e Increment the version number. 2006-06-29 16:38:14 +02:00
konstantin@mysql.com
7ca3749f59 Merge mysql.com:/opt/local/work/tmp_merge 
into  mysql.com:/opt/local/work/mysql-5.0-merge
 2006-06-29 18:34:49 +04:00
jonas@perch.ndb.mysql.com
ba1541c914 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-06-29 16:32:51 +02:00
jonas@perch.ndb.mysql.com
d7649bac06 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-06-29 16:32:23 +02:00
jonas@perch.ndb.mysql.com
52e248a7d7 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-06-29 16:23:38 +02:00
jonas@perch.ndb.mysql.com
a45f572dc8 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-06-29 16:22:20 +02:00
jonas@perch.ndb.mysql.com
f4a095a399 ndb - autotest 
Fix testNodeRestart -n DuringLCP and others (add stopTest() at end of test :-))
 2006-06-29 16:20:18 +02:00
konstantin@mysql.com
3010430ddf Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-06-29 18:17:37 +04:00
lars@mysql.com
f24851ee71 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.0-release
 2006-06-29 15:15:21 +02:00
konstantin@mysql.com
2d9d740dbe Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-06-29 16:44:21 +04:00
konstantin@mysql.com
1cb6eb00a5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-06-29 16:43:23 +04:00
stewart@willster.(none)
c3010c2497 Merge mysql.com:/home/stewart/Documents/MySQL/5.1/bug17928 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/ndb
 2006-06-29 22:36:27 +10:00
konstantin@mysql.com
5154bc6c47 A post-merge fix. 2006-06-29 16:31:08 +04:00
stewart@mysql.com
e343c0e214 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/ndb 
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
 2006-06-29 22:30:51 +10:00
lars@dl145k.mysql.com
f3d8d60259 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-06-29 14:24:02 +02:00
lars@mysql.com
0e45d26993 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-06-29 14:14:08 +02:00
lars@mysql.com
0707d4753f Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.0-release
 2006-06-29 14:03:41 +02:00
stewart@mysql.com
4e59b43512 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2006-06-29 22:00:50 +10:00