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

38320 commits

This branch
This branch
All branches
Author SHA1 Message Date
jani@a88-112-41-254.elisa-laajakaista.fi
5e2f69d1dd Added more tests of field conversions. 2006-09-26 17:20:14 +03:00
msvensson@neptunus.(none)
a09487b8ca Merge bk-internal:/home/bk/mysql-5.1-runtime 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-runtime
 2006-09-26 15:56:22 +02:00
jani@a88-112-41-254.elisa-laajakaista.fi
4bfe83d5d1 Fix for bug#20208 
A better fix for bug#10025.

Fixed test case plus added new tests.

After fixing Bug#20208 "Blobs greater than 8K are being truncated to 8K"
the fix to bug#10025 "Misleading error with COLLATE mediumtext and UNION"
became more accurate. Earlier mediumtext got converted to longtext,
although mediumtext was enough to contain the results. Now it converts
correctly to mediumtext, if the length does not exceed that and if none
of the original fields were type longtext.

Type longtext still converts correctly to type longtext, as the extra
tests prove.
 2006-09-26 13:19:25 +03:00
joerg@trift2.
3799f32f76 Merge trift2.:/MySQL/M50/clone-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-09-26 12:00:18 +02:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
5f14652ef5 Bug#20615 
"plugin name lost when loading an already-loaded name"
  Do not delete existing plugin when loading a new plugin which has the
  same name.
 2006-09-25 11:48:51 -07:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
6414330377 Bug#21610 
"Loaded engine does not load after restart."
  Junk characters caused plugin load to fail silently.
 2006-09-25 10:59:49 -07:00
andrey@example.com
f7a779acfb Fix for bug#22662 Inconsistent values displayed for event_scheduler 
when set to DISABLED
  
It was a silly ordering number error.
 2006-09-25 17:22:23 +02:00
andrey@example.com
db3a25fd78 Fix for bug#22397 Events: crash with procedure which alters events 
ALTER EVENT in stored procedure body led to a crash during the
procedure call. Affected was only ALTER EVENT which changed the
interval of the event. No problems with AT, STARTS, ENDS and so on.
 2006-09-25 16:49:25 +02:00
igor@rurik.mysql.com
df1376a542 Merge rurik.mysql.com:/home/igor/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug21646
 2006-09-25 07:40:54 -07:00
andrey@example.com
d993720268 cleanups - fix a test and remove unneeded declaration 2006-09-25 15:50:49 +02:00
igor@rurik.mysql.com
c0569012d0 Merge rurik.mysql.com:/home/igor/mysql-4.1-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-09-25 06:46:15 -07:00
igor@rurik.mysql.com
a661bdda19 Fixed bug #21646. 
Presence of a subquery in the ON expression of a join 
should not block merging the view that contains this join.
Before this patch the such views were converted into 
into temporary table views.
 2006-09-25 06:15:14 -07:00
igor@rurik.mysql.com
55dd569bab Fixed bug #21853: assert failure for a grouping query with 
an ALL/ANY quantified subquery in HAVING.
The Item::split_sum_func2 method should not create Item_ref
for objects of any class derived from Item_subselect.
 2006-09-25 05:24:07 -07:00
holyfoot/hf@mysql.com/deer.(none)
f8eeebbc4c Merge mysql.com:/home/hf/work/mysql-4.1.15428 
into  mysql.com:/home/hf/work/mysql-5.0-mrg
 2006-09-25 16:44:53 +05:00
holyfoot/hf@mysql.com/deer.(none)
14b16d89d9 Merge mysql.com:/home/hf/work/mysql-4.1.12991 
into  mysql.com:/home/hf/work/mysql-4.1.15428
 2006-09-25 16:35:57 +05:00
holyfoot/hf@mysql.com/deer.(none)
4a9cff00c5 Merge bk@192.168.21.1:mysql-4.1-opt 
into  mysql.com:/home/hf/work/mysql-4.1.15428
 2006-09-25 16:33:51 +05:00
msvensson@neptunus.(none)
18f04d48a4 Merge neptunus.(none):/home/msvensson/mysql/bug22379_runtime/my50-bug22379_runtime 
into  neptunus.(none):/home/msvensson/mysql/bug22379_runtime/my51-bug22379_runtime
 2006-09-25 09:34:34 +02:00
jani@a88-112-41-254.elisa-laajakaista.fi
98e224eb12 Fixed a test result. Value of MAX_BLOB_WIDTH changed. 2006-09-25 10:30:23 +03:00
msvensson@neptunus.(none)
d2ebe6be03 Bug #22379 im_daemon_life_cycle.test fails on merge of 5.1 -> 5.1-engines 
Remove race situations that occur when removing pidfiles. Primarily each process should remove its own
pidfile, secondly it should be removed by the process that created it and _only_ if it's
certain the process is dead. Third, mysql-test-run.pl will remove the pidfile when process has been killed.
- Set state of an instance to STARTING _before_ calling instance->start()
- Check that pidfile of instance has been created before changing STARTING => STARTED
- Only remove the pidfile if IM kills an instance with SIGKILL, otherwise the instance will remove it itself
 2006-09-25 09:28:52 +02:00
jani/jamppa@production.mysql.com
201b810cf4 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  production.mysql.com:/usersnfs/jamppa/mysql-5.1-bug-20208
 2006-09-25 08:10:58 +02:00
kent@c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se
3a65bd1616 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1
 2006-09-25 01:36:14 +02:00
kent@mysql.com/c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se
bf29b9db98 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2006-09-25 01:32:55 +02:00
kent@mysql.com/c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se
878416e054 mysql_config.sh: 
Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
  Filter out icc specific options from cflags/libs(_r)
 2006-09-25 00:54:46 +02:00
brian@zim.(none)
8b80901dcf Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-23 18:03:35 -07:00
kent@mysql.com/c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se
e826f7490e mysql.spec.sh: 
Added "test" RPM package
  Install all binaries "make install" would
make_binary_distribution.sh:
  Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)
 2006-09-24 00:41:20 +02:00
brian@zim.(none)
0a0f1aa386 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-23 12:13:30 -07:00
istruewing@chilla.local
2da8058cd4 Merge chilla.local:/home/mydev/mysql-5.0-bug14400-monty 
into  chilla.local:/home/mydev/mysql-5.1-bug14400-monty
 2006-09-23 14:52:59 +02:00
istruewing@chilla.local
f1db460851 Merge chilla.local:/home/mydev/mysql-4.1-bug14400-monty 
into  chilla.local:/home/mydev/mysql-5.0-bug14400-monty
 2006-09-23 13:25:45 +02:00
istruewing@chilla.local
af6b36e818 Merge chilla.local:/home/mydev/mysql-4.0-bug14400 
into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty
 2006-09-23 11:24:47 +02:00
lars/lthalmann@dl145k.mysql.com
60e178bb73 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1
 2006-09-23 08:45:26 +02:00
brian@zim.(none)
97d1b44fc4 Merge zim.(none):/home/brian/mysql/merge-5.1 
into  zim.(none):/home/brian/mysql/arch-5.1
 2006-09-22 23:35:43 -07:00
brian@zim.(none)
48381342d8 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-22 23:33:08 -07:00
brian@zim.(none)
4a3bf4ae84 Required file for next tests (taken from work by JimW in Falcon) 2006-09-22 23:32:47 -07:00
lars/lthalmann@dl145k.mysql.com
bab374162f Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-23 07:54:40 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
7a761a2545 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-09-23 07:37:41 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
7ce96bb579 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-09-23 07:12:00 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
80dadacb03 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
 2006-09-23 07:11:32 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
bbbb3901af Disabling test case 2006-09-23 07:07:29 +02:00
lars/lthalmann@dl145h.mysql.com
b8556c82a9 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-23 06:06:06 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
bbf84d6b9e Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-09-23 06:00:50 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
7e45d80362 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
 2006-09-23 05:58:48 +02:00
mskold/marty@linux.site
5e60232da9 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-09-22 21:14:58 +02:00
joerg@trift2.
4525ea4bfb Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2006-09-22 17:24:06 +02:00
istruewing@chilla.local
2b121cd0e1 Bug#14400 - Query joins wrong rows from table which is subject of 
"concurrent insert"
After merge fix.
 2006-09-22 17:23:25 +02:00
jani@ua141d10.elisa.omakaista.fi
0fb727866f Fixed result file. Blob width 8192 changed to 16777216. 2006-09-22 16:35:52 +03:00
istruewing@chilla.local
9d0cedffad Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into  chilla.local:/home/mydev/mysql-4.0-bug14400
 2006-09-22 15:06:01 +02:00
istruewing@chilla.local
bb2a7fec48 Merge chilla.local:/home/mydev/mysql-4.0--team 
into  chilla.local:/home/mydev/mysql-4.0-bug14400
 2006-09-22 15:03:50 +02:00
georg@lmy002.wdf.sap.corp
67a701003c Fix for bug #19121: Windows incompatible udf_example 2006-09-22 14:42:43 +02:00
aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
724ea113f8 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  dsl-hkigw8-feb9fb00-191.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
 2006-09-22 12:39:29 +03:00
aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
0c788a30dd BUG#22067 rpl_rbr_to_sbr and some other fail if NDB is default storage 
local file slipped into a previous commit, fixing ignore.
 2006-09-22 11:08:47 +03:00