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

41685 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@neptunus.(none)
61dfec1540 Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2007-01-16 17:54:55 +01:00
msvensson@neptunus.(none)
c36a5390e4 Update xid's as an effect of not closing the prepared statements all the time 2007-01-16 17:52:17 +01:00
msvensson@neptunus.(none)
701033e7eb Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2007-01-16 17:51:59 +01:00
msvensson@neptunus.(none)
ae03f5d382 Don't reuse prepared statements if running with reconnect enabled 2007-01-16 17:47:41 +01:00
msvensson@neptunus.(none)
39b7275037 Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2007-01-16 13:59:33 +01:00
msvensson@neptunus.(none)
f507bb2cb3 Bug#15518 Reusing a stmt that has failed during prepare does not clear error 
- Always reset error when calling mysql_stmt_prepare a second time
 - Set stmt->state to MYSQL_STMT_INIT_DONE before closing prepared stmt in server.
 - Add test to mysql_client_test
 - Remove mysql_stmt_close in mysqltest after each query
 - Close all open statements in mysqltest if disable_ps_protocol is called.
 2007-01-16 13:39:42 +01:00
msvensson@neptunus.(none)
08cbe04670 Always use two masters for ndb tests 
Abandon attempt to only use one for some tests that don't use the second master
 2007-01-16 09:47:03 +01:00
msvensson@neptunus.(none)
52a19378d8 Remove wait until not readonly 2007-01-16 09:38:09 +01:00
msvensson@neptunus.(none)
8540eac24a Cset exclude: cmiller@221.54.57.10.in-addr.arpa.cmiller/221.54.57.10.in-addr.arpa|ChangeSet|20070111195403|30218 2007-01-15 21:50:31 +01:00
iggy@recycle.(none)
17b2160087 Merge recycle.(none):/src/bug19424/my51-bug19424 
into  recycle.(none):/src/mysql-5.1-maint
 2007-01-15 10:14:30 -05:00
iggy@recycle.(none)
e3646a119e Merge recycle.(none):/src/bug19424/my50-bug19424 
into  recycle.(none):/src/bug19424/my51-bug19424
 2007-01-15 10:05:33 -05:00
iggy@recycle.(none)
f10a24314d Bug#19424 InnoDB: Possibly a memory overrun of the buffer being freed (Win64) 
- Re-enabling optimization on all except innodb/mem/*.
 2007-01-15 10:00:29 -05:00
tnurnberg@sin.azundris.com
c8bc42ccff Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/tnurnberg/work/mysql-5.1-maint-24660
 2007-01-12 00:15:22 +01:00
cmiller@221.54.57.10.in-addr.arpa.cmiller/221.54.57.10.in-addr.arpa
2706b3d737 Revert to old behavior. Including code to verify that a cluster is not 
readonly seems like a good idea, but the test suite isn't expecting those
statements in some places.

Figure out how we want to use this code later.
 2007-01-11 14:54:03 -05:00
thek@kpdesk.mysql.com
85c33ace3f Merge kpettersson@bk-internal:/home/bk/mysql-5.1-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
 2007-01-11 15:25:13 +01:00
thek@kpdesk.mysql.com
f4f37a8049 Merge kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
 2007-01-11 14:10:04 +01:00
thek@kpdesk.mysql.com
f7688d5f10 Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
 2007-01-11 14:08:12 +01:00
thek@kpdesk.mysql.com
0982a1d9b4 Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
 2007-01-11 14:04:01 +01:00
Kristofer.Pettersson@naruto.
a27ca8d0ad Merge naruto.:C:/cpp/bug24751/my51-bug24751 
into  naruto.:C:/cpp/mysql-5.1-maint
 2007-01-11 12:22:15 +01:00
Kristofer.Pettersson@naruto.
552e9a5d4b Merge naruto.:C:/cpp/bug24751/my50-bug24751 
into  naruto.:C:/cpp/bug24751/my51-bug24751
 2007-01-11 10:43:14 +01:00
Kristofer.Pettersson@naruto.
3adcf75e1d Merge naruto.:C:/cpp/bug24751/my41-bug24751 
into  naruto.:C:/cpp/bug24751/my50-bug24751
 2007-01-11 09:41:44 +01:00
Kristofer.Pettersson@naruto.
270752654e Bug#24751 - Possible infinit loop in init_io_cache() when insufficient memory 
- When cache memory can't be allocated size is recaclulated using 3/4 of
  the requested memory. This number is rounded up to the nearest 
  min_cache step. 
  However with the previous implementation the new cache size might
  become bigger than requested because of this rounding and thus we get
  an infinit loop.
- This patch fixes this problem by ensuring that the new cache size
  always will be smaller on the second and subsequent iterations until
  we reach min_cache.
 2007-01-11 09:40:17 +01:00
tnurnberg@mysql.com/sin.azundris.com
34122240cf Bug#24660: "enum" field type definition problem 
ENUMs weren't allowed to have character 0xff, a perfectly good character in many locales.
This was circumvented by mapping 0xff in ENUMs to ',', thereby prevent actual commas from
being used (because they too would get converted to 0xff on load). Now if 0xff makes an
appearance, we find a character not used in the enum and use that as a separator. If no
such character exists, we throw an error.

Any solution would have broken some sort of existing behaviour. This solution should
serve both fractions (those with 0xff and those with ',' in their enums), but
WILL REQUIRE A DUMP/RESTORE CYCLE FROM THOSE WITH 0xff IN THEIR ENUMS. :-/
That is, mysqldump with their current server, and restore when upgrading to one with
this patch.

(port of the original 4.1 patch. incorporates some suggestions by kaamos.)
 2007-01-09 20:23:12 +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
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
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
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
brian@zim.(none)
6ff7092698 Split out the hidden class from the ha_tina file (probably should have just deleted it...) but this is a bit better. 2007-01-03 17:26:45 -08:00
joerg@trift2.
60a3f102a4 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  trift2.:/MySQL/M51/mysql-5.1
 2007-01-02 17:13:42 +01:00
joerg@trift2.
c445abef91 server-tools/instance-manager/Makefile.am 
Delete compiler-specific flag setting - it makes builds break.
 2007-01-02 17:11:15 +01:00
kent@kent-amd64.(none)
7281ab80c8 Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2007-01-02 11:06:16 +01:00
kent@mysql.com/kent-amd64.(none)
499eb4d8ba view.result: 
Temporary work around for bug#25359
 2007-01-02 11:01:48 +01:00
kent@mysql.com/kent-amd64.(none)
67868597bb Many files: 
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
  Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
  Changed copyright header formatting some
plugin_example.c, daemon_example.c:
  Added "Copyright (C) 2006 MySQL AB" to GPL header
 2006-12-31 02:29:11 +01:00
kent@kent-amd64.(none)
58763e383e Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-31 01:32:21 +01:00
kent@kent-amd64.(none)
895e442dbf Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-31 01:04:59 +01:00
kent@mysql.com/kent-amd64.(none)
1b8bd0d246 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.0
 2006-12-31 01:04:07 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729 my_strtoll10-x86.s: 
Corrected spelling in copyright text
Makefile.am:
  Don't update the files from BitKeeper
Many files:
  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
Many files:
  Added GPL copyright text
Removed files:
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/xwf
 2006-12-31 01:02:27 +01:00
cmiller@calliope.local
0fa22f5a59 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  calliope.local.cmiller:/Volumes/Source/src/mysql-5.1-maint
 2006-12-29 16:37:05 -05:00
cmiller@calliope.local.cmiller/calliope.local
ee120139ab Bug#23950: misplaced code in mysqld.cc, main() 
Moved MY_INIT() to top of main(), where it should be.
 2006-12-29 16:07:33 -05:00