mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
35989 commits 2791 branches 343 tags 1.7 GiB
Commit graph

35989 commits

This branch
This branch
All branches
Author SHA1 Message Date
monty@mysql.com/narttu.mysql.fi
44c32c0e26 Initialize thd->no_trans_update 
(Fixes valgrind warnings)
 2007-03-29 21:06:32 +03:00
monty@mysql.com/narttu.mysql.fi
a119195280 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 
into  mysql.com:/home/my/mysql-5.0
 2007-03-29 20:13:48 +03:00
monty@mysql.com/narttu.mysql.fi
4b813d9425 Fixed memory leak in mysql_upgrade 2007-03-29 19:51:42 +03:00
svoj@mysql.com/april.(none)
75f0416532 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.0-engines
 2007-03-29 21:50:54 +05:00
jamppa@bk-internal.mysql.com
71e5d064cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel
 2007-03-29 18:38:16 +02:00
gkodinov/kgeorge@magare.gmz
fca2a0c4ac Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B26815-5.0-opt
 2007-03-29 19:20:33 +03:00
iggy@recycle.(none)
6a9811b594 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  recycle.(none):/src/bug23491/my50-bug23491
 2007-03-29 12:20:13 -04:00
gkodinov/kgeorge@magare.gmz
57b71f3490 Merge magare.gmz:/home/kgeorge/mysql/work/B26815-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B26815-5.0-opt
 2007-03-29 19:20:04 +03:00
gkodinov/kgeorge@magare.gmz
c52e8b3e64 Bug #26815: 
When creating a temporary table the concise column type
 of a string expression is decided based on its length:
 - if its length is under 512 it is stored as either 
   varchar or char.
 - otherwise it is stored as a BLOB.
 
 There is a flag (convert_blob_length) to create_tmp_field 
 that, when >0 allows to force creation of a varchar if the
 max blob length is under convert_blob_length.
 However it must be verified that convert_blob_length 
 (settable through a SQL option in some cases) is 
 under the maximum that can be stored in a varchar column.
 While performing that check for expressions in 
 create_tmp_field_from_item the max length of the blob was
 used instead. This causes blob columns to be created in the
 heap temp table used by GROUP_CONCAT (where blobs must not
 be created in the temp table because of the constant 
 convert_blob_length that is passed to create_tmp_field() ).
 And since these blob columns are not expected in that place
 we get wrong results.
 Fixed by checking that the value of the flag variable is 
 in the limits that fit into VARCHAR instead of the max length
 of the blob column.
 2007-03-29 19:19:31 +03:00
msvensson@pilot.blaudden
f41764433c Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-29 14:37:29 +02:00
msvensson@pilot.blaudden
79b2bd53b2 Merge pilot.blaudden:/home/msvensson/mysql/bug25482/my41-bug25482-alt2 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-03-29 14:33:50 +02:00
msvensson@pilot.blaudden
f03ea622eb Update test result after merge 2007-03-29 14:21:45 +02:00
msvensson@pilot.blaudden
110c2961dd Merge bk-internal:/home/bk/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-03-29 14:21:26 +02:00
tomas@whalegate.ndb.mysql.com
51105a7781 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-29 14:20:34 +02:00
msvensson@pilot.blaudden
f9c5bb36b0 Merge pilot.blaudden:/home/msvensson/mysql/bug25482/my41-bug25482-alt2 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-29 14:16:28 +02:00
msvensson@pilot.blaudden
a71d195183 Bug#25482 GRANT statements are not replicated if you use "replicate-ignore-table" 
- GRANT and REVOKE statments didn't have the "updating" flag set and
   thus statements with a table specified would not replicate if
   slave filtering rules where turned on.
   For example "GRANT ... ON test.t1 TO ..." would not replicate.
 2007-03-29 14:12:32 +02:00
msvensson@pilot.blaudden
f5b888db39 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-29 13:44:49 +02:00
msvensson@pilot.blaudden
7cf0722474 Merge pilot.blaudden:/home/msvensson/mysql/bug24121/my50-bug24121 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-29 13:37:40 +02:00
tsmith@quadxeon.mysql.com
a778498fc1 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-03-29 13:37:32 +02:00
msvensson@pilot.blaudden
eac521a9f6 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-29 13:30:21 +02:00
tsmith@quadxeon.mysql.com
9e99b24305 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-03-29 13:09:16 +02:00
tsmith@quadxeon.mysql.com
a7f506db2a Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-03-29 12:52:31 +02:00
tsmith@quadxeon.mysql.com
91f4b48541 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-03-29 12:40:49 +02:00
msvensson@pilot.blaudden
0e2de06a2a Merge pilot.blaudden:/home/msvensson/mysql/bug26837/my50-bug26837 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-29 12:34:44 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
75668471d1 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-03-29 12:25:28 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
890bdb4fed Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b21976/my50-b21976
 2007-03-29 15:17:18 +05:00
msvensson@pilot.blaudden
071783117f Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-29 11:54:59 +02:00
msvensson@pilot.blaudden
72cc8618d7 Merge pilot.blaudden:/home/msvensson/mysql/bug25309/my50-bug25309 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-29 11:40:38 +02:00
msvensson@pilot.blaudden
0e04aec960 Make the script detect --default-storage-engine=x and 
mark the test as requiring that storage engine(if we need to do that)
Make --ndb and --with-ndbcluster and alias for
--mysqld=--default-storage-engine=ndbcluster
 2007-03-29 11:31:50 +02:00
tsmith@quadxeon.mysql.com
07f94fa199 gis_generic test cases: 
Revert test case to NOT define any keys; the NDB warning can be handled, and ARCHIVE does not allow indexes
 2007-03-29 11:20:08 +02:00
gkodinov/kgeorge@magare.gmz
82ecff6a76 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B27300-5.0-opt
 2007-03-29 12:09:55 +03:00
tsmith@quadxeon.mysql.com
12535fd423 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-03-29 10:46:43 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
c132038451 Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b21976/my50-b21976
 2007-03-29 13:37:07 +05:00
gkodinov/kgeorge@magare.gmz
1a2ca44e2b Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B27300-5.0-opt
 2007-03-29 11:01:32 +03:00
df@pippilotta.erinye.com
5dad363c41 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-03-29 09:39:46 +02:00
sergefp@mysql.com
399bc9861e Merge of BUG#26624 and BUG#26625 2007-03-29 10:35:28 +04:00
sergefp@mysql.com
9939b3b75e BUG#26624: high mem usage (crash) in range optimizer 
- Post-review fixes
 2007-03-29 10:27:58 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
73f0c5d7c6 Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b26359/b26359.5.0
 2007-03-29 11:06:15 +05:00
bar@mysql.com
d5c6680443 Code layout fix for bug N 27079 
Thanks to Gluh for suggestion.
 2007-03-29 10:32:38 +05:00
bar@mysql.com
6d290278cc Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-5.0.b27079
 2007-03-29 10:19:45 +05:00
bar@mysql.com
98a4bb356a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-5.0.b22378
 2007-03-29 10:00:01 +05:00
tsmith@siva.hindu.god
83694ca440 Apply innodb-5.0-ss1372 snapshot 
Bug #27381: InnoDB exits when attempting to rename table to non-existant database
  Fix Bug#27381 by calling os_file_handle_error_no_exit() instead of
  os_file_handle_error().
 2007-03-28 22:41:21 -06:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e3c34c9cbf Fix for bugs 
#27176: Assigning a string to an year column has unexpected results
#26359: Strings becoming truncated and converted to numbers under STRICT mode

Problems: 
1. storing a string to an integer field we don't check 
   if strntoull10rnd() returns MY_ERRNO_EDOM error.
   Fix: check for MY_ERRNO_EDOM.
2. storing a string to an year field we use my_strntol() function.
   Fix: use strntoull10rnd() instead.
 2007-03-29 09:08:30 +05:00
tsmith@siva.hindu.god
024be23a82 Fix warning on Windows 2007-03-28 19:49:30 -06:00
tsmith@siva.hindu.god
d4e0de8fda Update test for bug #24563 (MBROverlaps does not seem to function propertly.); ARCHIVE doesn't support AUTO_INCREMENT, so specify PK values explicitly 2007-03-28 19:39:43 -06:00
tsmith@siva.hindu.god
979102de3b Remove warning when compiling libmysqld/log.cc 2007-03-28 17:50:06 -06:00
tsmith@siva.hindu.god
8350721c88 Update test for bug #24563 (MBROverlaps does not seem to function propertly.): 
- Add primary key to test table, so NDB with binlog doesn't complain
- Add extra results for bdb_gis.result
 2007-03-28 17:40:42 -06:00
tsmith@siva.hindu.god
ecd22993cf Bug #26642: create index corrupts table definition in .frm 
Thanks to Martin Friebe for finding and submitting a fix for this bug!

A table with maximum number of key segments and maximum length key name
would have a corrupted .frm file, due to an incorrect calculation of the
complete key length.  Now the key length is computed correctly (I hope) :-)

MyISAM would reject a table with the maximum number of keys and the maximum
number of key segments in all keys.  It would allow one less than this total
maximum.  Now MyISAM accepts a table defined with the maximum.  (This is a
very minor issue.)
 2007-03-28 15:25:13 -06:00
kent@mysql.com/kent-amd64.(none)
7a2e0ee7d7 configure.in: 
Don't install ndb man pages if no ndb configured
config-win.h, CMakeLists.txt, README, configure.js:
  Removed Cybozu patches
 2007-03-28 23:00:50 +02:00
tsmith@siva.hindu.god
7366ecdb0e Merge siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/50 
into  siva.hindu.god:/home/tsmith/m/bk/maint/50
 2007-03-28 12:27:37 -06:00