database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-19 19:03:26 +03:00
Code Activity
46,936 Commits 3,280 Branches 1,098 Tags
a5011de0a82b29a982bed1bb18eea57d29121100
Commit Graph

18094 Commits

Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
2923b52e38 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-26 21:02:14 +02:00
gkodinov/kgeorge@magare.gmz
101857299a WL3527: 5.1 
renamed "--old-mode" to "--old" to prevent
 ambiguity.
 "old" now appears in SHOW VARIABLES as a
 read-only option.
 2007-03-26 19:15:30 +03:00
gkodinov/kgeorge@magare.gmz
bd3a0ce1d9 Merge magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/WL3527-5.1-opt
 2007-03-26 17:03:57 +03:00
cbell/Chuck@mysql_cab_desk.
71c4bd1f0a Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629
 2007-03-26 09:57:16 -04:00
gkodinov/kgeorge@magare.gmz
ce9cc47a73 WL3527: 5.0 part: 
enabled the optional FOR JOIN to all the three
clauses : USE, FORCE and IGNORE
 2007-03-26 16:52:52 +03:00
gkodinov/kgeorge@magare.gmz
a65bc60d1a Merge magare.gmz:/home/kgeorge/mysql/work/B27164-4.1-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B27164-5.0-opt
 2007-03-26 14:14:23 +03:00
gkodinov/kgeorge@magare.gmz[kgeorge]
188c558a2b Merge bk-internal:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B26303-5.1-opt
 2007-03-26 14:04:20 +03:00
pekka@clam.ndb.mysql.com/clam.(none)
6ec8bb230a Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb 
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug24028
 2007-03-26 12:50:40 +02:00
gkodinov/kgeorge@magare.gmz[kgeorge]
e6d81ad338 Bug #27164: not reseting the data pointer 
to 0 causes wrong (large) length to be read
 from the row in _mi_calc_blob_length() when 
 storing NULL values in (e.g) POINT columns.
 This large length is then used to allocate
 a block of memory that (on some OSes) causes
 trouble.
 Fixed by calling the base class's 
 Field_blob::reset() from Field_geom::reset()
 that is called when storing a NULL value into
 the column.
 2007-03-26 13:17:40 +03:00
gkodinov/kgeorge@magare.gmz[kgeorge]
9348841346 Bug #26303: Reserve is not called before qs_append(). 
This may lead to buffer overflow.
The String::qs_append() function will append a string
without checking if there's enough space.
So qs_append() must be called beforehand to ensure 
there's enough space in the buffer for the subsequent 
qs_append() calls.
Fixed Item_case_expr::print() to make sure there's
enough space before appending data by adding a call to 
String::reserve() to make sure qs_append() will have 
enough space.
 2007-03-26 12:32:51 +03:00
brian@zim.(none)
68cdfea52a Merge zim.(none):/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/slap-5.1
 2007-03-26 02:29:09 -07:00
brian@zim.(none)
9a2a7071be Added pre and post option to test run (allows me to adjust an engine once all of the data has been loaded). 
Kinda obvious that this was going to come up ;)
 2007-03-26 02:24:49 -07:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
ebe44e6e31 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/home/ram/work/b25301/b25301.4.1
 2007-03-26 13:45:02 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
d0ed1216e2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b25301/b25301.5.0
 2007-03-26 13:43:20 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
47b07aaa9f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b25301/b25301.5.1
 2007-03-26 13:40:20 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
6baa89d054 after-merge fix: result adjusted. 2007-03-26 13:20:34 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
f5a24e5870 Merge mysql.com:/home/ram/work/b25993/b25993.5.0 
into  mysql.com:/home/ram/work/b25993/b25993.5.1
 2007-03-26 13:01:46 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
74b3cdb02e Fix for bug #25993: mysqldump crashes with merge table and -c option 
opt_complete_insert was improperly used by accident.
Use complete_insert flag instead.
 2007-03-26 12:56:41 +05:00
mats@romeo.(none)
6269e4f216 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/b22583-mysql-5.1-new-rpl
 2007-03-26 09:02:38 +02:00
pekka@clam.(none)
5f061a7e5c Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb 
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug24028
 2007-03-25 15:06:19 +02:00
aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi
f18d5d04f8 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 
into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/5.0-marvel-bug23333_sf_side_eff_binlog
 2007-03-24 19:21:27 +02:00
aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi
5a4bee6590 Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF() 
removing test host sensitive stuff for pushbuild
 2007-03-24 19:20:00 +02:00
serg@sergbook.mysql.com
237ed0c3e5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
 2007-03-24 17:16:53 +02:00
serg@sergbook.mysql.com
06d3329ea9 Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build 
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
 2007-03-24 14:41:44 +02:00
aelkin/elkin@andrepl.(none)
61f871e998 Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF() 
eliminating the unnecessary option; and replacing site-dependant stuff in the test
 2007-03-24 14:40:38 +02:00
aelkin/elkin@andrepl.(none)
8cfa54eb39 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 
into  andrepl.(none):/home/elkin/MySQL/MAIN/5.0-marvel-bug23333_sf_side_eff_binlog
 2007-03-24 14:14:46 +02:00
kostja@bodhi.local
4b7fa1876d Remove files that were checked in by mistake. 2007-03-24 13:13:54 +03:00
monty@narttu.mysql.fi
28a05d3b33 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  mysql.com:/home/my/mysql-5.1
 2007-03-24 11:06:09 +02:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
ccb9d448f3 BUG#26257 New Federated Server Functionality Doesn't support differently named tables 
* Modified Federated memory allocation to use MEM_ROOT
* Modified sql_servers and federated to allocate share connection
  parameters to use MEM_ROOT
* Modified Federated to allow tablename in addition to server name
* Implicit flushing of tables using altered/dropped server name
* Added tests to prove new functionality works

Contributors to this patch: Patrick Galbraith, Antony Curtis
 2007-03-24 01:18:19 -07:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
14ccc65994 Bug#25721 
"Concurrent ALTER/CREATE SERVER can lead to deadlock"
  Deadlock caused by inconsistant use of mutexes in sql_server.cc
  One mutex has been removed to resolve deadlock.
  Many functions were made private which should not be exported.
  Unused variables and function removed.
 2007-03-23 17:31:27 -07:00
tsmith@siva.hindu.god
bd5012a8ca Merge siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/50 
into  siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/51
 2007-03-23 17:48:03 -06:00
tsmith@siva.hindu.god
47cce188b3 Bug #24563: MBROverlaps does not seem to function propertly. 
Fix is to rewrite the MBR::overlaps() function, to compute the dimension of both
arguments, and the dimension of the intersection; test that all three dimensions are the
same (e.g., all are Polygons).

Add tests for all MBR* functions for various combinations of shapes, lines and points.
 2007-03-23 16:28:07 -06:00
tomas@whalegate.ndb.mysql.com
ac0da397db rpl_ndb_sync.result, ndb_partition_key.result: 
test case
 2007-03-23 21:49:49 +01:00
serg@sergbook.mysql.com
77718a3fc1 bug in im* tests - missing --no-defaults in the mysql command line 2007-03-23 22:16:32 +02:00
monty@mysql.com/narttu.mysql.fi
1933603647 Removed not used define YY_MAGIC_BELOW 
Made year 2000 handling more uniform
Removed year 2000 handling out from calc_days()
The above removes some bugs in date/datetimes with year between 0 and 200
Now we get a note when we insert a datetime value into a date column
For default values to CREATE, don't give errors for warning level NOTE
Fixed some compiler failures
Added library ws2_32 for windows compilation (needed if we want to compile with IOCP support)
Removed duplicate typedef TIME and replaced it with MYSQL_TIME

Better (more complete) fix for: Bug#21103 "DATE column not compared as DATE"
Fixed properly Bug#18997 "DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value"
Fixed Bug#23093 "Implicit conversion of 9912101 to date does not match cast(9912101 as date)"
 2007-03-23 22:08:31 +02:00
tnurnberg@sin.intern.azundris.com
3260dfd324 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  sin.intern.azundris.com:/home/tnurnberg/26817/51-26817
 2007-03-23 20:43:40 +01:00
tnurnberg@sin.intern.azundris.com
93db05429f Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 
into  sin.intern.azundris.com:/home/tnurnberg/26817/50-26817
 2007-03-23 20:40:35 +01:00
tnurnberg@sin.intern.azundris.com
998190ac55 Merge sin.intern.azundris.com:/home/tnurnberg/26817/50-26817 
into  sin.intern.azundris.com:/home/tnurnberg/26817/51-26817
 2007-03-23 20:39:37 +01:00
baker@bk-internal.mysql.com
503d7b20cb Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-03-23 20:25:36 +01:00
tnurnberg@sin.intern.azundris.com
7c63826894 Bug #26817: mysqldump fails to backup database containing view with invalid definer 
give some leeway on required permissions for SHOW FIELDS on views so
an unknonwn DEFINER will no longer break mysqldump
 2007-03-23 19:24:03 +01:00
Kristofer.Pettersson@naruto.
fe43de3929 Merge naruto.:C:/cpp/bug20777/my50-bug20777 
into  naruto.:C:/cpp/mysql-5.0-runtime
 2007-03-23 19:14:13 +01:00
dkatz/Damien@damiendev.
b712e2fe28 Merge damiendev.:C:/build/mysql-5.0 
into  damiendev.:C:/build/dev50
 2007-03-23 13:43:46 -04:00
dkatz/Damien@damiendev.
7e063af361 Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  damiendev.:C:/build/mysql-5.1
 2007-03-23 13:33:07 -04:00
Kristofer.Pettersson@naruto.
47b6b5750c Merge kpettersson@bk-internal:/home/bk/mysql-5.1-runtime 
into  naruto.:C:/cpp/mysql-5.1-runtime
 2007-03-23 18:30:54 +01:00
Kristofer.Pettersson@naruto.
fba7393b3e Merge kpettersson@bk-internal:/home/bk/mysql-5.1-runtime 
into  naruto.:C:/cpp/mysql-5.1-runtime
 2007-03-23 18:13:21 +01:00
aelkin/elkin@andrepl.(none)
ddb98f8d4e Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 
into  andrepl.(none):/home/elkin/MySQL/MAIN/5.0-marvel-bug23333_sf_side_eff_binlog
 2007-03-23 19:01:14 +02:00
joerg@trift2.
751531fca7 mysql-test/t/query_cache_sql_prepare.test : Prevent this test from running in "embedded". 2007-03-23 17:31:10 +01:00
aelkin/elkin@andrepl.(none)
364139c58b Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 
into  andrepl.(none):/home/elkin/MySQL/MAIN/mysql-5.0-marvel
 2007-03-23 18:26:07 +02:00
tomas@whalegate.ndb.mysql.com
972837350b result file updates, message format changes 2007-03-23 17:22:52 +01:00
tomas@whalegate.ndb.mysql.com
78dce2dd97 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-23 17:17:44 +01:00