mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 23:34:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
42202 commits 2778 branches 343 tags 1.6 GiB
Commit graph

42202 commits

This branch
This branch
All branches
Author SHA1 Message Date
thek@kpdesk.mysql.com
ede1dba2f4 Merge kpdesk.mysql.com:/home/thek/dev/bug23010/my51-bug23010 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-build
 2007-01-09 14:34:04 +01:00
thek@kpdesk.mysql.com
63d38c64c1 Merge kpdesk.mysql.com:/home/thek/dev/bug23010/my51-bug23010 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
 2007-01-09 12:53:59 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
0fa12d2491 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/d2/hf/opt/my50-opt
 2007-01-09 15:37:31 +04:00
thek@kpdesk.mysql.com
5a10216511 Merge kpdesk.mysql.com:/home/thek/dev/bug23010/my50-bug23010 
into  kpdesk.mysql.com:/home/thek/dev/bug23010/my51-bug23010
 2007-01-09 12:37:11 +01:00
thek@kpdesk.mysql.com
16590668f1 Merge kpdesk.mysql.com:/home/thek/dev/bug23010/my41-bug23010 
into  kpdesk.mysql.com:/home/thek/dev/bug23010/my50-bug23010
 2007-01-09 12:33:02 +01:00
thek@kpdesk.mysql.com
98a9706edb Merge kpdesk.mysql.com:/home/thek/dev/test23010/my40-bug23010 
into  kpdesk.mysql.com:/home/thek/dev/bug23010/my41-fix23010
 2007-01-09 12:30:57 +01:00
thek@kpdesk.mysql.com
0906993457 Cset exclude: thek@kpdesk.mysql.com|ChangeSet|20061106104152|07628 2007-01-09 12:28:46 +01:00
joerg@trift2.
cca28699c8 configure.in : Fix a wrong comment. 2007-01-09 12:21:06 +01:00
evgen@moonbone.local
b6e162c66c Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt
 2007-01-09 13:12:35 +03:00
kroki/tomash@moonlight.home
067b80a8d3 Fix after manual merge. 2007-01-09 13:07:39 +03:00
kroki/tomash@moonlight.home
6a99943e15 Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug23443
 2007-01-09 12:47:10 +03:00
kroki/tomash@moonlight.home
69ec67fcd8 Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-4.1-runtime 
into  moonlight.home:/home/tomash/src/mysql_ab/mysql-4.1-bug23443
 2007-01-09 12:47:03 +03:00
kroki/tomash@moonlight.home
e1ea142c0a Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-4.0 
into  moonlight.home:/home/tomash/src/mysql_ab/mysql-4.0-bug23443
 2007-01-09 12:46:35 +03:00
kroki/tomash@moonlight.home
7bf893f551 Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug23443 
into  moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-bug23443
 2007-01-09 12:44:16 +03:00
kroki/tomash@moonlight.home
1eb5b28fb7 Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-4.1-bug23443 
into  moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug23443
 2007-01-09 12:40:34 +03:00
kroki/tomash@moonlight.home
45e9762027 Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-4.0-bug23443 
into  moonlight.home:/home/tomash/src/mysql_ab/mysql-4.1-bug23443
 2007-01-09 12:39:05 +03:00
kroki/tomash@moonlight.home
5b4d9d8706 BUG#23443: user-defined variables can consume too much memory in the 
server

The problem was that when memory was exhausted HEAP engine could crash
(GROUP BY uses HEAP TABLE).  Alternatively, if SET was used, it could
report an error "You may only use constant expressions with SET" instead
of "Out of memory (Needed NNNNNN bytes)".

The solution is:
 - pass MY_WME to (some) calls to my_malloc() to get correct message.
 - fix heap_write() so that the first key is skipped during cleanup
   on ENOMEM because it wasn't inserted and doesn't have to be
   deleted.

No test case is provided because we can't test out-of-memory behaviour
in our current test framework.
 2007-01-09 12:24:25 +03:00
holyfoot/hf@hfmain.(none)
ae836b4203 Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/d2/hf/opt/my51-opt
 2007-01-09 12:55:11 +04:00
igor@olga.mysql.com
ae6bee30fc Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug24345
 2007-01-09 00:17:48 -08:00
holyfoot/hf@mysql.com/hfmain.(none)
5dd6b5a217 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/d2/hf/opt/my50-opt
 2007-01-09 11:19:17 +04:00
guilhem@gbichot3.local
6712c0963d Manual merge of the fix for BUG#19725 "Calls to SF in other database are not replicated 
correctly in some cases", from 5.0.
In short, calls to a stored function located in another database
than the default database, may fail to replicate if the call was made
by SET, SELECT, or DO.
sp_head.cc automerged, only the test and test's result had to be hand-merged.
 2007-01-08 23:52:21 +01:00
guilhem@gbichot3.local
c144de06e4 Merge gbichot3.local:/home/mysql_src/mysql-5.0-rpl-19725 
into  gbichot3.local:/home/mysql_src/mysql-5.1-rpl-19725
 2007-01-08 22:06:19 +01:00
guilhem@gbichot3.local
3e760410a0 Fix for BUG#19725 "Calls to SF in other database are not replicated 
correctly in some cases".
In short, calls to a stored function located in another database
than the default database, may fail to replicate if the call was made
by SET, SELECT, or DO.
Longer: when a stored function is called from a statement which does not go
to binlog ("SET @a=somedb.myfunc()", "SELECT somedb.myfunc()",
"DO somedb.myfunc()"), this crafted statement is binlogged:
"SELECT myfunc();" (accompanied with a mention of the default database
if there is one). So, if "somedb" is not the default database,
the slave would fail to find myfunc(). The fix is to specify the
function's database name in the crafted binlogged statement, like this:
"SELECT somedb.myfunc();". Test added in rpl_sp.test.
 2007-01-08 22:01:06 +01:00
joerg@trift2.
68d6f7ae52 Changes necessary to build version 4.0.28: 
- "make_binary_distribution" accepts a dummy "--platform=" argument.

- "MySQL-shared-compat.spec" uses a "version40" define symbol internally.
 2007-01-08 18:33:55 +01:00
gkodinov/kgeorge@macbook.local
23acc5b630 mi_check.c: 
added a missing DBUG_RETURN
 2007-01-08 17:27:28 +02:00
mmj@thorsen-consulting.dk
4e0e863a4e Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  thorsen-consulting.dk:/Users/mmj/bktrees/mysql-5.1-build
 2007-01-08 12:46:57 +01:00
gkodinov/kgeorge@macbook.local
a30c09c33f Merge macbook.local:/Users/kgeorge/mysql/work/mysql-5.0-opt 
into  macbook.local:/Users/kgeorge/mysql/work/merge-5.1-opt
 2007-01-08 12:32:48 +02:00
cmiller@zippy.cornsilk.net
993f325d37 Post-merge cleanup and fix minor BUILD/... "="-equality syntax 
error.
 2007-01-07 12:21:42 -05:00
cmiller@zippy.cornsilk.net
a16eaf3301 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener
 2007-01-07 09:31:49 -05:00
cmiller@zippy.cornsilk.net
1942fd0a49 Forgot to add result file to changeset. :( 2007-01-06 18:40:43 -05:00
cmiller@zippy.cornsilk.net
95e73e66f0 Use relative dates so that the tests don't fail when the year 
changes.
 2007-01-06 18:32:55 -05:00
cmiller@zippy.cornsilk.net
b54f20f865 A writability test in a prereq file polluted the binlog. 
Reset the info after using those files.
 2007-01-06 12:34:16 -05:00
brian@zim.(none)
05d05c776f Fix for when shell version of mysql-test-run is called. 2007-01-05 22:28:53 -08:00
brian@zim.(none)
77004aabf2 Cleaning up warning for windows. Innodb is compiled but disable on Windows, so it should be fine. NDB wasn't compiled in, which is what caused the issue. 2007-01-05 20:20:53 -08:00
tsmith@siva.hindu.god
eb8cf09388 Merge siva.hindu.god:/home/tsmith/m/inno/jan04/51 
into  siva.hindu.god:/home/tsmith/m/bk/51-build
 2007-01-05 16:05:48 -07:00
kent@kent-amd64.(none)
1a0e36ea6d Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-01-05 17:30:40 +01:00
kent@mysql.com/kent-amd64.(none)
fa5a359f07 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-01-05 16:57:23 +01:00
kent@mysql.com/kent-amd64.(none)
528b457644 mysql.spec.sh, make_binary_distribution.sh: 
Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
  correct "libgcc.a" path is returned for the 32/64 bit architecture
 2007-01-05 16:53:03 +01:00
gkodinov/kgeorge@macbook.gmz
a63df24a68 Bug #15881: cast problems 
The optimizer removes expressions from GROUP BY/DISTINCT
  if they happen to participate in a <expression> = <const>
  predicates of the WHERE clause (the idea being that if
  it's always equal to a constant it can't have multiple 
  values).
  However for predicates where the expression and the 
  constant item are of different result type this is not
  valid (e.g. a string column compared to 0).
  Fixed by additional check of the result types of the 
  expression and the constant and if they differ the 
  expression don't get removed from the group by list.
 2007-01-05 14:02:50 +02:00
tsmith@siva.hindu.god
7a2d8c14dd Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots. 
Fixes:
- Bug #24712: SHOW TABLE STATUS for file-per-table showing incorrect time fields
- Bug #24386: Performance degradation caused by instrumentation in mutex_struct
- Bug #24190: many exportable definitions of field_in_record_is_null
- Bug #21468: InnoDB crash during recovery with corrupted data pages: XA bug?
 2007-01-04 19:51:34 -07:00
mmj@tiger.mmj.dk
7e9361a34c Merge tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0-build 
into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.1-build
 2007-01-04 23:21:44 +01:00
mmj@tiger.mmj.dk
8941159ed8 Merge tiger.mmj.dk:/Users/mmj/bktrees/mysql-4.1-build 
into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0-build
 2007-01-04 23:20:04 +01:00
mmj@tiger.mmj.dk
f61a873c60 my_global.h: 
Patch from Alfredo for TARGET_FAT_BINARY
 2007-01-04 23:18:04 +01:00
mmj@tiger.mmj.dk
f0d503a8f2 Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0-build
 2007-01-04 22:33:34 +01:00
mmj@tiger.mmj.dk
e36b282f1f Merge tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0-build 
into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.1-build
 2007-01-04 22:24:07 +01:00
mmj@tiger.mmj.dk
37ae5bbbbe my_global.h: 
Add patch from Alfredo for TARGET_FAT_BINARY
 2007-01-04 22:22:25 +01:00
brian@zim.(none)
c578350e05 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/merge-5.1
 2007-01-04 12:06:40 -08:00
brian@zim.(none)
452a1331b2 The CSV format has always relied on numbers being quoted, which doesn't always happen. This fixes that so that numbers can now be unquoted (and the output does this as well so that the log takes up less space). 2007-01-04 11:41:17 -08:00
baker@bk-internal.mysql.com
9ffaf185f0 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-01-04 19:54:52 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
6b3c8dffaf Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/d2/hf/opt/my50-opt
 2007-01-04 16:06:09 +04:00