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
38227 commits 2785 branches 343 tags 1.7 GiB
Commit graph

38227 commits

This branch
This branch
All branches
Author SHA1 Message Date
dlenev@mockturtle.local
93fed182eb Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20670
 2006-09-30 00:31:33 +04:00
dlenev@mockturtle.local
8b63a55b3a After merge fixes. 2006-09-29 21:05:12 +04:00
dlenev@mockturtle.local
5c2a51292d Merge mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
 2006-09-29 19:39:15 +04:00
dlenev@mockturtle.local
ae117f23a8 Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg20670-2 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20670
 2006-09-29 18:26:30 +04:00
dlenev@mockturtle.local
f9b3f1300b Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
 2006-09-29 13:25:33 +04:00
dlenev@mockturtle.local
76c5979f9e Merge mockturtle.local:/home/dlenev/src/mysql-4.1-bg22338-2 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge
 2006-09-29 12:36:12 +04:00
dlenev@mockturtle.local
b0e896960c Fixed test-case after merge (removed duplicate part). 2006-09-29 12:27:21 +04:00
dlenev@mockturtle.local
a4ee7ec153 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge
 2006-09-29 10:55:03 +04:00
dlenev@mockturtle.local
acaa584c55 Fix for bug#22338 "Valgrind warning: uninitialized variable in 
create_tmp_table()".

The fix for bug 21787 "COUNT(*) + ORDER BY + LIMIT returns wrong
result" introduced valgrind warnings which occured during execution
of information_schema.test and sp-prelocking.test in version 5.0.
There were no user visible effects.

The latter fix made create_tmp_table() dependant on
THD::lex::current_select value. Valgrind warnings occured when this
function was executed and THD::lex::current_select member pointed
to uninitialized SELECT_LEX instance.

This fix tries to remove this dependancy by moving some logic
outside of create_tmp_table() function.
 2006-09-28 23:47:49 +04:00
gluh@gluh.(none)
12b3672a69 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1
 2006-09-28 18:03:00 +05:00
gluh@mysql.com/gluh.(none)
353c5bd154 after merge fix 2006-09-28 18:00:44 +05:00
anozdrin/alik@alik.
107d6ca01d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2006-09-28 15:41:49 +04:00
anozdrin/alik@alik.
ba96c5aed6 5.0-rt -> 5.1-rt after-merge fixes. 2006-09-28 15:40:23 +04:00
anozdrin/alik@alik.
2c73dbfaac Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-rt 
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2006-09-28 15:10:18 +04:00
gluh@gluh.(none)
b7e59b7085 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.1
 2006-09-28 14:09:31 +05:00
andrey@example.com
00c54ad530 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  example.com:/work/mysql-5.1-runtime-fresh2
 2006-09-28 09:11:22 +02:00
dlenev@mockturtle.local
7897f061aa Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mockturtle.local:/home/dlenev/src/mysql-4.1-runtime
 2006-09-28 11:02:10 +04:00
petr/cps@owlet.local
64c2c0cb19 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/cps/mysql/trees/5.1-runtime-new
 2006-09-28 04:44:55 +04:00
andrey@example.com
3b672c9a3c Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  example.com:/work/mysql-5.0-runtime
 2006-09-27 22:25:23 +02:00
andrey@example.com
e9ecbf5b46 post-merge fix 2006-09-27 22:14:31 +02:00
andrey@example.com
c4afe67ff5 Merge example.com:/work/mysql-5.0-runtime 
into  example.com:/work/mysql-5.1-runtime-fresh2
 2006-09-27 21:31:34 +02:00
andrey@example.com
a4093f31d8 Fix for bug#21311: Possible stack overrun if SP has non-latin1 name 
There was possible stack overrun in an edge case which handles invalid body of
a SP in mysql.proc . That should be case when mysql.proc has been changed
manually. Though, due to bug 21513, it can be exploited without having access
to mysql.proc only being able to create a stored routine.
 2006-09-27 21:23:17 +02:00
gluh@mysql.com/gluh.(none)
4aaf7e34ff additional 'after merge' fix 2006-09-27 20:11:11 +05:00
gluh@mysql.com/gluh.(none)
c3d63bef2b after merge fix 2006-09-27 19:21:29 +05:00
petr/cps@mysql.com/owlet.local
6cb96bb8b4 Remove unused error messages (no release contains them 
at the moment, so we can safely do that). Update an error
mesage to make it translateable.
 2006-09-27 17:48:00 +04:00
gluh@mysql.com/gluh.(none)
437c94317b Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.0
 2006-09-27 18:06:46 +05:00
gluh@mysql.com/gluh.(none)
a039376c43 Patch for bug#21432 is reverted 2006-09-27 17:49:16 +05:00
kroki/tomash@moonlight.intranet
a53e628181 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21414
 2006-09-27 12:22:16 +04:00
kroki/tomash@moonlight.intranet
18dda5abaf Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21414
 2006-09-27 11:46:29 +04:00
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
msvensson@neptunus.(none)
f3c7b029d7 Merge neptunus.(none):/home/msvensson/mysql/bug22379_runtime/my50-bug22379_runtime 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-runtime
 2006-09-26 15:44:52 +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
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
andrey@example.com
d993720268 cleanups - fix a test and remove unneeded declaration 2006-09-25 15:50:49 +02: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
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