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

10131 commits

Author SHA1 Message Date
lars@mysql.com
2d3fcf26b6 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
 2006-02-13 10:59:12 +01:00
brian@zim.tangent.org
0c487a79c9 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.tangent.org:/home/brian/mysql/dep-5.1
 2006-02-12 13:27:56 -08:00
brian@zim.tangent.org
0a5a30bef3 This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work. 2006-02-12 13:26:30 -08:00
kent@mysql.com
eb9683442d Merge 2006-02-12 20:45:03 +01:00
kent@mysql.com
38108ee634 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-02-12 20:19:33 +01:00
kent@mysql.com
4294f877fd disabled.def: 
Reenabled tests 'innodb_concurrent', 'innodb_unsafe_binlog', 'rpl_ndb_log' as bugs 3300 15650 17081 are solved
 2006-02-12 20:17:11 +01:00
kent@mysql.com
edbbfee4f5 Merge 2006-02-12 20:07:19 +01:00
kent@mysql.com
633cd03468 disabled.def: 
Disabled 'rpl_until' until 15886 is solved
libmysqld.vcproj:
  Added "my_user.c"
 2006-02-12 19:36:21 +01:00
petr@mysql.com
45ac20b9ef fix race condition in the log_tables test 2006-02-12 14:47:59 +03:00
kent@mysql.com
73de951abc Merge 2006-02-12 04:48:52 +01:00
kent@mysql.com
f9a23667b2 Merge 2006-02-12 04:33:50 +01:00
kent@mysql.com
30b8a9c1fb spatial.cc: 
Added { ... } around float8get() macro, avoids VC7 error
  message "illegal else without matching if"
mtr_report.pl:
  Parse error logs to create "warnings" file
mtr_cases.pl:
  Added optoion --ignore-disabled-def
  Windows build now let TZ pass, removed
  work around
mysql-test-run.pl, mtr_process.pl:
  Back port of changes from 5.0
 2006-02-12 04:13:24 +01:00
knielsen@mysql.com
5346bf7392 Merge mysql.com:/usr/local/mysql/mysql-4.1-fixrace 
into  mysql.com:/usr/local/mysql/mysql-5.0
 2006-02-12 00:10:43 +01:00
kent@mysql.com
6595c64958 Merge 2006-02-11 23:59:21 +01:00
kent@mysql.com
c94b3638f1 Merge 2006-02-11 23:44:56 +01:00
kent@mysql.com
2619c54bd1 mysql-test-run.{pl,sh}: 
Give space for second and third slave port
 2006-02-11 23:35:23 +01:00
knielsen@mysql.com
cbe5fb2e01 Merge mysql.com:/usr/local/mysql/mysql-4.1-fixrace 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2006-02-11 23:32:51 +01:00
kent@mysql.com
40596fa00d Merge 2006-02-11 23:23:39 +01:00
knielsen@mysql.com
43189fd8ad Fix a race on some platforms in mysql-test-run.pl, where it would sometimes 
errorneously abort reporting failure to kill child processes, where in
reality the problem was merely that the child had become a zombie because
of missing waitpid() call.
 2006-02-11 22:50:59 +01:00
ingo@mysql.com
8efa06bd68 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-wl1563-msg
 2006-02-10 22:28:59 +01:00
ingo@mysql.com
66883d76dd WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX 
After merge fix.
 2006-02-10 22:26:04 +01:00
ingo@mysql.com
b9bc1e9108 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-wl1563-msg
 2006-02-10 20:00:22 +01:00
kent@mysql.com
5fe2e8fd7d mysql-test-run.pl: 
Display instance manager port
mysql-test-run.sh:
  Give port space for more than one slave
 2006-02-10 19:56:34 +01:00
kent@mysql.com
f8e08f38fe Merge 2006-02-10 19:47:46 +01:00
kent@mysql.com
d23d02be18 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2006-02-10 19:18:45 +01:00
petr@mysql.com
2e01c8b0d0 Merge mysql.com:/home/cps/mysql/devel/5.0-mike 
into  mysql.com:/home/cps/mysql/devel/5.1-merge
 2006-02-10 21:03:49 +03:00
tomas@poseidon.ndb.mysql.com
9663f6cbee Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-02-10 18:16:34 +01:00
tomas@poseidon.ndb.mysql.com
f0d95d0af3 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-10 18:04:46 +01:00
tomas@poseidon.ndb.mysql.com
cbac75de91 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2006-02-10 17:53:13 +01:00
tomas@poseidon.ndb.mysql.com
27a14f93eb Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-02-10 17:50:17 +01:00
tomas@poseidon.ndb.mysql.com
7050a7586e Bug #17249 ndb, delete statement with join where clause fails when table do not have pk 
Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key

change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
 2006-02-10 17:40:22 +01:00
msvensson@neptunus.(none)
332a1a1f18 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-10 11:27:30 +01:00
knielsen@mysql.com
344c334141 Merge mysql.com:/usr/local/mysql/mysql-5.1-sp-destruct 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2006-02-10 10:44:09 +01:00
tomas@poseidon.ndb.mysql.com
f8b0345503 MySQL Bugs: #17283: Issues with killing "bankTransactionMaker" (and others) in 86 tests 2006-02-10 10:34:18 +01:00
knielsen@mysql.com
1bc91adcef Fix missing test cleanup 2006-02-10 10:18:57 +01:00
msvensson@neptunus.(none)
5690dd8b85 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-10 09:14:22 +01:00
petr@mysql.com
f037d4772e Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/devel/5.0-mike
 2006-02-10 10:56:27 +03:00
petr@mysql.com
c5794763e4 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug
 2006-02-10 10:24:30 +03:00
petr@mysql.com
f3d73e8cbe Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/cps/mysql/devel/5.1-im-fixes
 2006-02-10 03:38:29 +03:00
petr@mysql.com
392f93c0aa Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug
 2006-02-10 03:37:13 +03:00
petr@mysql.com
8488498545 IM changes by GUI team: add a version_no column to the 
SHOW INSTANCE STATUS output
 2006-02-10 03:35:07 +03:00
petr@mysql.com
1c7bc08537 a bunch of IM fixes from the GUI team 2006-02-10 02:15:55 +03:00
tomas@poseidon.ndb.mysql.com
76f6331aed changed to use temporary heap table on a ndb test 
corrected multiple --log-bin options in mysql-test-run
 2006-02-10 00:15:07 +01:00
tomas@poseidon.ndb.mysql.com
fe0ff3e21c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-09 23:48:52 +01:00
andrey@lmy004.
541e67342f from fix for bug#16414 (Events: Crash or hang if event drops itself) 
WL #1034
 2006-02-09 23:15:47 +01:00
tomas@poseidon.ndb.mysql.com
246d0ea290 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-09 23:15:46 +01:00
andrey@lmy004.
24c010892c Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-events_i_s
 2006-02-09 23:15:46 +01:00
aivanov@mysql.com
f8f8af970e Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/innodb/mysql-5.1-merged
 2006-02-10 01:15:45 +03:00
tomas@poseidon.ndb.mysql.com
930641a5c1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-09 21:28:22 +01:00
andrey@lmy004.
67985360f0 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-events_i_s
 2006-02-09 20:20:22 +01:00