mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
43417 commits 2785 branches 343 tags 1.6 GiB
Commit graph

43417 commits

This branch
This branch
All branches
Author SHA1 Message Date
joerg@trift2.
b2d20b04fc Merge trift2.:/MySQL/M50/merge-5.0 
into  trift2.:/MySQL/M51/merge-5.1
 2007-02-21 09:45:13 +01:00
tomas@poseidon.mysql.com
d0d1eb770c Merge mysqldev@production.mysql.com:/data0/mysqldev/my/build-200702202011-5.1.16-beta/mysql-5.1-release 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-21 14:31:17 +07:00
tomas@poseidon.mysql.com
dd3239821f fix c++ syntac in c file 2007-02-21 14:26:47 +07:00
tomas@poseidon.mysql.com
7e9ec9a1f0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-02-21 14:00:28 +07:00
tomas@poseidon.mysql.com
6cbc6d91f9 Bug #26490 duplicate cluster error code 
- fixed error code
- added test program run in mysql-test-run bk version
 2007-02-21 11:41:22 +07:00
df@kahlann.erinye.com
4a8c734fb1 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1
 2007-02-20 23:53:11 +01:00
df@kahlann.erinye.com
7fecf1451d Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1
 2007-02-20 22:43:17 +01:00
kent/mysqldev@mysql.com/production.mysql.com
9b3254af96 Raise version number after cloning 5.1.16-beta 2007-02-20 21:42:45 +01:00
kaa@polly.local
5b5dc7f840 Merge polly.local:/home/kaa/src/maint/mysql-5.0-maint 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-02-20 23:23:49 +03:00
kaa@polly.local
41eccda1df Merge polly.local:/tmp/maint/bug25137/my51-bug25137 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-02-20 23:16:18 +03:00
msvensson@pilot.blaudden
63baad73ae Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-20 21:02:06 +01:00
msvensson@pilot.blaudden
9da1b427a7 Test for setting general_log_file to a directory fails 
since /tmp is used as the directory. It does not always
exist so let's use one that always exists MYSQLTEST_VARDIR
 2007-02-20 21:00:05 +01:00
kaa@polly.local
2a2382b284 Fixed the binlog numbering after changes introduced by patch for bug18743. 2007-02-20 22:29:18 +03:00
kaa@polly.local
b7e6df7cc9 Merge polly.local:/tmp/maint/bug25137/my50-bug25137 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2007-02-20 22:23:51 +03:00
joerg@trift2.
4cb11ae425 Merge trift2.:/MySQL/M41/merge-4.1 
into  trift2.:/MySQL/M50/merge-5.0
 2007-02-20 20:18:29 +01:00
istruewing@bk-internal.mysql.com
37cedb7efa Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-engines
 2007-02-20 18:53:41 +01:00
msvensson@pilot.blaudden
cf553c4361 Use "diff_files" instead ot "exec diff" 2007-02-20 18:47:47 +01:00
msvensson@pilot.blaudden
55b7f20a80 Use a temporary file to execute SQL commands with utf-8 chararcters 2007-02-20 18:35:59 +01:00
msvensson@pilot.blaudden
c282716844 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-20 18:22:50 +01:00
msvensson@pilot.blaudden
0d1d91e829 Replace "exec diff" with diff_files 2007-02-20 18:22:33 +01:00
msvensson@pilot.blaudden
dd74beb6be Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-20 18:21:14 +01:00
msvensson@pilot.blaudden
d6584a920b Add "diff_files" command to mysqltest 2007-02-20 18:20:58 +01:00
bteam/mysqldev@mysql.com/production.mysql.com
724a3b33ee Raise version number after cloning 5.0.36 2007-02-20 16:50:54 +01:00
msvensson@pilot.blaudden
0af1b19568 Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Fixes for 5.1
 2007-02-20 16:29:56 +01:00
msvensson@pilot.blaudden
0cc2e14040 Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166 
into  pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
 2007-02-20 16:26:30 +01:00
msvensson@pilot.blaudden
6caa0a232e Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Part 2, add @@hostname system variable
 2007-02-20 16:24:38 +01:00
msvensson@pilot.blaudden
c796468004 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-20 14:24:01 +01:00
msvensson@pilot.blaudden
c7d138cfa3 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-20 14:21:11 +01:00
msvensson@pilot.blaudden
26432d16e8 New version of 'do_cat_file' that will trim cr/lf to lf 2007-02-20 14:20:49 +01:00
joerg@trift2.
74fed0c305 After-merge fix: 
The declaration of "thr_client_alarm" had got lost, keep it in "mysys/thr_alarm.c".
 2007-02-20 13:10:27 +01:00
msvensson@pilot.blaudden
cab074cb22 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-20 13:06:25 +01:00
msvensson@pilot.blaudden
a799f2b637 Change "exec echo" commands with different delimiters that are also 
escape chars to use "write_file" to avoid confusion about what's what.
 2007-02-20 13:06:01 +01:00
joerg@trift2.
0daf91a62a Merge trift2.:/MySQL/M40/clone-4.0 
into  trift2.:/MySQL/M41/merge-4.1
 2007-02-20 13:02:39 +01:00
msvensson@pilot.blaudden
104995f2e7 Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166 
into  pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
 2007-02-20 12:48:56 +01:00
msvensson@pilot.blaudden
bcd368fcfb Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Add test of bootstrap mode
 - Make mysqld return error if bootstrap failed
 2007-02-20 12:48:15 +01:00
msvensson@pilot.blaudden
0b5c41acc7 Bug#25807 LOAD DATA INFILE does not work with Pipes 
- Additional fix for io_cache_init being called on a closed file
 2007-02-20 12:06:04 +01:00
istruewing@chilla.local
e9d7098082 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-02-20 10:05:22 +01:00
istruewing@chilla.local
0f4a84f002 Fixed a bad merge. Got a duplicate symbol on OSX. 2007-02-20 10:01:54 +01:00
knielsen@ymer.(none)
6db8fef5d3 A few minor cleanups for recent AbortOption behaviour change. 2007-02-20 09:52:18 +01:00
jonas@perch.ndb.mysql.com
a7aed14bc9 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-02-20 01:05:11 +01:00
jonas@perch.ndb.mysql.com
5d37bbee56 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-20 01:00:18 +01:00
jonas@perch.ndb.mysql.com
1d99e609ed Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2007-02-20 00:58:25 +01:00
jonas@perch.ndb.mysql.com
8801e8e7af fix compile error in testBitfield 2007-02-20 00:55:33 +01:00
jonas@perch.ndb.mysql.com
b4b35f9603 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-02-19 22:58:35 +01:00
jonas@perch.ndb.mysql.com
9bc3503489 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-19 22:56:15 +01:00
jonas@perch.ndb.mysql.com
f2e2e7a6e7 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2007-02-19 22:53:17 +01:00
jonas@perch.ndb.mysql.com
a51d58e641 ndb - fix correct argv/argc handling in testBitfield 2007-02-19 22:51:04 +01:00
jonas@perch.ndb.mysql.com
2ec6d9e2db Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-02-19 22:32:24 +01:00
jonas@perch.ndb.mysql.com
f0253235b8 ndb - 
forgott to add testcase for bug#26481
 2007-02-19 22:30:54 +01:00
jonas@perch.ndb.mysql.com
e882e4f674 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-19 21:40:34 +01:00