mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
49956 commits 2784 branches 343 tags 1.6 GiB
Commit graph

49956 commits

This branch
This branch
All branches
Author SHA1 Message Date
istruewing@stella.local
5777cc2998 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  stella.local:/home2/mydev/mysql-5.1-bug15522
 2007-10-10 16:52:56 +02:00
mattiasj@mattiasj-laptop.(none)
312886fc2f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-bug30484
 2007-10-10 08:30:02 +02:00
istruewing@stella.local
ac70638d5a Merge stella.local:/home2/mydev/mysql-5.0-bug15522 
into  stella.local:/home2/mydev/mysql-5.1-bug15522
 2007-10-09 14:18:10 +02:00
istruewing@stella.local
a1caefe36c Merge stella.local:/home2/mydev/mysql-5.0-bug15522-old 
into  stella.local:/home2/mydev/mysql-5.0-bug15522
 2007-10-09 13:38:46 +02:00
istruewing@stella.local
1285baf608 Bug#15522 - create ... select and with merge tables 
Added test case.
The fix for Bug#20662 does also fix this one.
 2007-10-09 13:10:51 +02:00
acurtis/antony@ltamd64.xiphis.org
bb6bf6792c Merge xiphis.org:/anubis/antony/work/p1-bug31382.1.fix-5.1 
into  xiphis.org:/anubis/antony/work/p1-bug31382.1.merge-5.1
 2007-10-04 17:37:51 -07:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
159d5c51f2 fix undefined variable which can lead to crash 2007-10-04 17:34:28 -07:00
acurtis/antony@ltamd64.xiphis.org
bf54b8e636 Merge xiphis.org:/anubis/antony/work/mysql-5.1-engines 
into  xiphis.org:/anubis/antony/work/p1-bug31382.1.merge-5.1
 2007-10-04 11:22:52 -07:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
3060f0be8e Bug#31382 
"Disabled plugin is provoking Valgrind error"
  If there are any auto-alloced string plug-in options, memory is
  allocated during the call for handle_options(). We must free this
  memory if we are not installing the plug-in.
 2007-10-04 10:55:08 -07:00
mattiasj@mattiasj-laptop.(none)
8edc46ff16 Bug #30484: Partitions: crash with self-referencing trigger 
Two cases in ha_partition::extra() was missing
(HA_EXTRA_DELETE_CANNOT_BATCH and HA_EXTRA_UPDATE_CANNOT_BATCH)
which only is currently used by NDB (which not uses ha_partition)
 2007-10-04 14:56:33 +02:00
svoj@june.mysql.com
0a81f49b25 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG30583/mysql-5.1-engines
 2007-10-01 14:23:16 +05:00
istruewing@stella.local
358fedc307 Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-09-28 15:13:10 +02:00
istruewing@stella.local
32fb502bd7 Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-09-28 09:54:21 +02:00
istruewing@stella.local
4e615503d2 Merge stella.local:/home2/mydev/mysql-4.1-axmrg 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2007-09-28 09:13:50 +02:00
istruewing@stella.local
74ce2d1304 Merge stella.local:/home2/mydev/mysql-5.0-amain 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2007-09-28 09:13:21 +02:00
istruewing@stella.local
ab95dad7a4 Merge stella.local:/home2/mydev/mysql-4.1-amain 
into  stella.local:/home2/mydev/mysql-4.1-axmrg
 2007-09-28 08:43:24 +02:00
dfischer/mysqldev@mysql.com/production.mysql.com
6257abbc83 Raise version number after cloning 5.0.50 2007-09-26 19:15:42 +02:00
df@pippilotta.erinye.com
7ef6e66bc6 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-09-25 17:53:01 +02:00
df@pippilotta.erinye.com
43310df9d9 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-09-25 17:44:53 +02:00
df@pippilotta.erinye.com
461f559adf Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-09-25 17:42:25 +02:00
jperkin@production.mysql.com
d6db96fb55 Merge production.mysql.com:/usersnfs/jperkin/bk/build-5.0 
into  production.mysql.com:/usersnfs/jperkin/bk/build-5.1
 2007-09-24 11:48:27 +02:00
jonathan@bagpuss.adsl.perkin.org.uk
3b3be2ada1 Revert previous attempt to fix bug#27693, the files removed from the 
cmake list are auto-generated and thus still required.  Correct fix
not yet known.
 2007-09-22 16:29:15 +02:00
gkodinov/kgeorge@macbook.local
ed7e4b82c1 fixed warnings by bug 30639 2007-09-21 12:17:09 +02:00
gkodinov/kgeorge@macbook.local
4eee02dd3d fixed type conversion warnings revealed by bug 30639 2007-09-21 10:15:16 +02:00
gluh@eagle.(none)
7dbcdf9a64 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-09-20 16:28:46 +05:00
gluh@mysql.com/eagle.(none)
eef0772b89 result fix 2007-09-20 16:27:58 +05:00
gluh@eagle.(none)
2a02dd13e2 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-09-20 14:40:24 +05:00
gluh@mysql.com/eagle.(none)
4ffcc4f266 result fix 2007-09-20 14:38:41 +05:00
gluh@eagle.(none)
88a4df4ec0 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-09-20 14:10:05 +05:00
gluh@mysql.com/eagle.(none)
6b81174cde Bug#27747 database metadata doesn't return sufficient column default info 
added get_field_default_value() function which obtains default value from the field
(used in store_create_info() & get_schema_column_record() functions)
 2007-09-20 13:54:46 +05:00
gkodinov/kgeorge@magare.gmz
3dd2ed30ae Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B30639-5.1-opt
 2007-09-19 18:02:59 +03:00
gkodinov/kgeorge@magare.gmz
c2abf960f9 Bug #30639: limit offset,rowcount wraps when rowcount >= 2^32 in windows 
The parser uses ulonglong to store the LIMIT number. This number
 then is stored into a variable of type ha_rows. ha_rows is either
 4 or 8 byte depending on the BIG_TABLES define from config.h
 So an overflow may occur (and LIMIT becomes zero) while storing an
 ulonglong value in ha_rows.
 Fixed by :
  1. Using the maximum possible value for ha_rows on overflow
  2. Defining BIG_TABLES for the windows builds (to match the others)
 2007-09-19 17:47:52 +03:00
gluh@eagle.(none)
7c87dc6e52 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-09-19 14:10:01 +05:00
gluh@eagle.(none)
e7a9c4d648 Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-09-19 14:09:23 +05:00
gluh@eagle.(none)
56c927e696 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-09-19 13:50:38 +05:00
gshchepa@devsrv-b.mysql.com
2e26008c3e Many files: 
Post-merge fix.
 2007-09-15 07:39:58 +02:00
gshchepa@devsrv-b.mysql.com
6234432241 Merge devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt 
into  devsrv-b.mysql.com:/data0/gshchepa/mysql-5.1-opt
 2007-09-15 07:08:07 +02:00
gshchepa@devsrv-b.mysql.com
0aa6e95768 select.test: 
Post-fix for bug#27695.
 2007-09-15 07:04:32 +02:00
gkodinov/kgeorge@magare.gmz
3b58ae43c8 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31001-5.1-opt
 2007-09-14 23:48:23 +03:00
gshchepa@devsrv-b.mysql.com
3dc13a6444 Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  devsrv-b.mysql.com:/data0/gshchepa/mysql-5.1-opt
 2007-09-14 21:17:07 +02:00
gshchepa@devsrv-b.mysql.com
4bf2408ed4 Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt
 2007-09-14 21:15:43 +02:00
joerg@trift2.
f724efee59 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-09-14 19:52:07 +02:00
joerg@trift2.
0cdf470a2e Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-09-14 19:47:38 +02:00
joerg@trift2.
8fd3d71109 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-09-14 19:29:26 +02:00
joerg@trift2.
100f69154d Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-09-14 19:23:05 +02:00
joerg@trift2.
e78513165c Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-09-14 19:21:02 +02:00
sergefp@mysql.com
df1eb8ac5d Fix compile failure on windows 2007-09-14 21:15:57 +04:00
gkodinov/kgeorge@magare.gmz
0133bc639c Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31001-5.0-opt
 2007-09-14 19:04:47 +03:00
gkodinov/kgeorge@magare.gmz
6927e67dd9 Merge magare.gmz:/home/kgeorge/mysql/work/B31001-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B31001-5.1-opt
 2007-09-14 19:03:14 +03:00
gshchepa@devsrv-b.mysql.com
ca15f7b190 Many files: 
Merge with 5.0-opt.
 2007-09-14 17:21:50 +02:00