mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-05 02:33:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
37260 commits 2856 branches 349 tags 1.7 GiB
Commit graph

17445 commits

Author SHA1 Message Date
brian@zim.(none)
8d83366bac Merge zim.(none):/home/brian/mysql/dep-5.1 
into  zim.(none):/home/brian/mysql/remove-bdb-5.1
 2006-08-15 13:53:13 -07:00
mskold/marty@mysql.com/linux.site
36042d81e4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-08-15 22:18:41 +02:00
pgalbraith/patg@govinda.patg.net
67513cafa5 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
 2006-08-15 09:02:53 -07:00
rburnett@bk-internal.mysql.com
344dd03774 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-08-15 17:58:39 +02:00
petr/cps@mysql.com/owlet
472279cec4 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
 2006-08-15 19:11:12 +04:00
rburnett@bk-internal.mysql.com
8d5e2dd644 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
 2006-08-15 17:02:08 +02:00
mskold/marty@mysql.com/linux.site
3b42e84c44 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-08-15 15:57:36 +02:00
holyfoot/hf@mysql.com/deer.(none)
81764f89cf Merge bk@192.168.21.1:mysql-5.0-kt 
into  mysql.com:/home/hf/work/mysql-5.0.20910
 2006-08-15 18:15:12 +05:00
mskold/marty@linux.site
604f3f8a69 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-08-15 14:39:48 +02:00
mskold/marty@mysql.com/linux.site
c8b93da355 Fix for bug Server crashes on join query with large dataset with NDB tables: do not release operation records for on-going read_multi_range 2006-08-15 14:31:21 +02:00
jonas@perch.ndb.mysql.com
3cd1826ef0 ndb - bug#20708 
init ndb_cache_check_time and honor value in my.cnf
 2006-08-15 14:22:47 +02:00
mskold/marty@mysql.com/linux.site
66e8255491 Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-08-15 13:37:39 +02:00
stewart@willster.(none)
916b151c6c BUG#21652 I_S.PROCESSLIST truncates STATE field compared to SHOW FULL PROCESSLIST 
increase maximum length to 64 (max length that ndb injector creates is currently 62)
 2006-08-15 19:18:57 +08:00
mskold/marty@mysql.com/linux.site
6a3143e2a0 ndb_lock.test, ndb_lock.result: 
bug   SELECT ... FOR UPDATE does not work..: New test case
ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
  Fix for bug   Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
 2006-08-15 13:12:27 +02:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
4c57a94b78 fix windows build 2006-08-15 01:54:14 -07:00
jonas@perch.ndb.mysql.com
b1d87126bf Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-08-15 09:39:26 +02:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
e2d4aa2ca4 Merge xiphis.org:/home/antony/work2/mysql-5.0-engines 
into  xiphis.org:/home/antony/work2/mysql-5.0-merge
 2006-08-14 21:27:36 -07:00
brian@zim.(none)
41f920b013 Merge zim.(none):/home/brian/mysql/dep-5.1 
into  zim.(none):/home/brian/mysql/remove-bdb-5.1
 2006-08-14 21:26:33 -07:00
stewart@willster.(none)
0d7beacf31 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
 2006-08-15 11:28:27 +08:00
brian@zim.(none)
8deb5beb9c Merge zim.(none):/home/brian/mysql/dep-5.0 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-08-14 15:24:29 -07:00
brian@zim.(none)
4d7f7fb878 Removed warnings for Windows build issues. Edited Windows README to remove reference to BDB. 2006-08-14 14:45:48 -07:00
patg@govinda.patg.net
a60a43c207 Post 5.0engines to 5.1 engines merge fix that didn't make it into that push. 2006-08-14 08:43:37 -07:00
rburnett@bk-internal.mysql.com
c189be6849 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-08-14 17:15:36 +02:00
kostja@bodhi.local
9b05865be4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-08-14 16:30:57 +04:00
brian@zim.(none)
7429c871b9 Fix for bug#20648 We introduce a new field method for knowing "real size", and we now in archive null unused bits of a row to null before writing. 2006-08-14 03:29:17 -07:00
kostja@bodhi.local
5dfdc8bfce Manual merge 5.0->5.1. Post-merge fixes. 2006-08-14 13:27:11 +04:00
jonas@perch.ndb.mysql.com
c9a41abb9d Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-08-14 09:53:38 +02:00
kostja@bodhi.local
04c97488f9 Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-08-12 21:06:51 +04:00
pgalbraith/patg@govinda.patg.net
9da072cb5b Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge
 2006-08-11 14:06:23 -07:00
baker/brian@zim.(none)
a06a582212 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  zim.(none):/home/brian/mysql/remove-bdb-5.1
 2006-08-11 13:30:55 -07:00
jimw@rama.(none)
2e87907e40 Merge rama.(none):/home/jimw/my/mysql-5.0-21284 
into  rama.(none):/home/jimw/my/mysql-5.1-clean
 2006-08-11 12:19:41 -07:00
cmiller@zippy.cornsilk.net
1257062ef4 German translations. 2006-08-11 09:27:44 -04:00
baker/brian@zim.(none)
5a466cc48c Removed bdb test cases. 2006-08-10 18:29:25 -07:00
pgalbraith/patg@govinda.patg.net
b2ce951b81 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge
 2006-08-10 15:31:44 -07:00
patg@govinda.patg.net
4371749996 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge
 2006-08-10 14:28:39 -07:00
brian@zim.(none)
e8289bfbc1 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  zim.(none):/home/brian/mysql/remove-bdb-5.1
 2006-08-10 13:44:04 -07:00
rburnett@bk-internal.mysql.com
4f626dc83c Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-08-10 19:28:55 +02:00
rburnett@bk-internal.mysql.com
6b399a498b Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
 2006-08-10 19:24:46 +02:00
tnurnberg@salvation.intern.azundris.com
170392850d Bug#19844: time_format in Union truncates values 
time_format() claimed %H and %k would return at most two digits
(hours 0-23), but this coincided neither with actual behaviour
nor with docs.  this is not visible in simple queries; forcing
a temp-table is probably the easiest way to see this.  adjusted
the return-length appropriately; the alternative would be to
adjust the docs to say that behaviour for > 99 hours is undefined.
---
Bug#19844: time_format in Union truncates values

time_format() claimed %H and %k would return at most two digits
(hours 0-23), but this coincided neither with actual behaviour
nor with docs.  this is not visible in simple queries; forcing
a temp-table is probably the easiest way to see this.  adjusted
the return-length appropriately; the alternative would be to
adjust the docs to say that behaviour for > 99 hours is undefined.
 2006-08-10 15:37:24 +02:00
kroki/tomash@moonlight.intranet
b341356abd Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-runtine-merge
 2006-08-10 16:16:16 +04:00
kroki/tomash@moonlight.intranet
aca2c3761a Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
 2006-08-10 16:11:55 +04:00
jonas@perch.ndb.mysql.com
29eaad6288 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-08-10 13:47:20 +02:00
serg@janus.mylan
069131e28a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  janus.mylan:/usr/home/serg/Abk/m51
 2006-08-10 12:39:59 +02:00
andrey@example.com
81efea724e revert part of the code 
how did it get in?!? (it's only in local csets so no other tree is affected)
 2006-08-10 12:26:43 +02:00
brian@zim.(none)
65e9ae97b0 This is the second patch for bdb removeal. This takes care of all options and variables that rely on bdb. 2006-08-10 01:50:37 -07:00
kroki/tomash@moonlight.intranet
f6dda7f1e1 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
 2006-08-10 12:10:48 +04:00
cmiller@zippy.cornsilk.net
543fcde9b9 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0
 2006-08-09 22:23:41 -04:00
pgalbraith/patg@govinda.patg.net
6b96294223 autopush test - sorry for the commit messages, ignore 2006-08-09 17:41:35 -07:00
brian@zim.(none)
c37e1b4839 First stage removeal of BDB. 2006-08-09 17:33:08 -07:00
evgen@moonbone.local
2e7f47c6f8 sql_base.cc, table.cc: 
After merge fix
 2006-08-10 00:37:08 +04:00