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

40464 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@neptunus.(none)
298edec4c1 Merge neptunus.(none):/home/msvensson/mysql/bug19731/my51-bug19731 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-11-29 23:09:57 +01:00
msvensson@neptunus.(none)
a50f80636c Merge neptunus.(none):/home/msvensson/mysql/bug19731/my50-bug19731 
into  neptunus.(none):/home/msvensson/mysql/bug19731/my51-bug19731
 2006-11-29 23:05:33 +01:00
msvensson@neptunus.(none)
68724b3a8d Bug#19371 VARBINARY() have trailing zeros after upgrade from 4.1 
- chmod the saved files from 4.1 to make sure they are writable
 2006-11-29 23:03:45 +01:00
msvensson@neptunus.(none)
db863d826c Add command "chmod" to mysqltest 2006-11-29 23:02:06 +01:00
msvensson@neptunus.(none)
7aec43481d Change mode of the checked in 4.1 version files so they are writable 2006-11-29 21:38:38 +01:00
cmiller@zippy.cornsilk.net
42291995c3 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-11-29 12:50:07 -05:00
cmiller@zippy.cornsilk.net
d577e3d4a8 Fix merges. 2006-11-29 12:49:21 -05:00
thek@kpdesk.mysql.com
a17c01ff5c Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my51-bug22043 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
 2006-11-29 13:07:50 +01:00
thek@kpdesk.mysql.com
ea6a91757b Bug#22043 MySQL don't add "USE <DATABASE>" before "DROP PROCEDURE IF EXISTS" 
- Merge patch.
- Test case needed update because event number were off.
- Error code has changed because db name validation rules
  changes between 5.0 and 5.1
 2006-11-29 11:45:29 +01:00
msvensson@shellback.(none)
ebee55f48a Merge bk-internal:/home/bk/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
 2006-11-29 11:18:06 +01:00
msvensson@shellback.(none)
72ad912b0b Update result file for func_misc to 5.1 version format 2006-11-29 10:11:36 +01:00
msvensson@shellback.(none)
710e731e2f Merge shellback.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import 
into  shellback.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
 2006-11-29 09:27:43 +01:00
msvensson@shellback.(none)
838d1d53b4 Import version 1.50 of yaSSL 2006-11-29 09:21:37 +01:00
ramil/ram@myoffice.izhnet.ru
e4c17c72b7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug22229/my51-bug22229
 2006-11-29 10:59:52 +04:00
msvensson@shellback.(none)
284413154d Merge bk-internal:/home/bk/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-11-29 07:55:22 +01:00
ramil/ram@myoffice.izhnet.ru
726af26ac7 Merge mysql.com:/usr/home/ram/work/bug22229/my50-bug22229 
into  mysql.com:/usr/home/ram/work/bug22229/my51-bug22229
 2006-11-29 09:42:59 +04:00
tsmith/tim@siva.hindu.god
2a0e2d1d38 rpl_init_slave.result: 
Update test result due to fix for bug 23883.
 2006-11-28 16:39:04 -07:00
cmiller@zippy.cornsilk.net
80f695e3e6 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-11-28 13:12:47 -05:00
cmiller@zippy.cornsilk.net
45ea756c5f Revert charset breakage. 2006-11-28 13:08:41 -05:00
thek@kpdesk.mysql.com
81420d5e38 Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my50-bug22043 
into  kpdesk.mysql.com:/home/thek/dev/bug22043/my51-bug22043
 2006-11-28 17:34:03 +01:00
thek@kpdesk.mysql.com
294cb8432f Bug#22043 MySQL don't add "USE <DATABASE>" before "DROP PROCEDURE EXISTS" 
- CREATE PROCEDURE stores database name based on query context instead
  of 'current database' as set by 'USE' according to manual.
  The bug reporter interpret the filtering statements as bug for
   DROP PROCEDURE based on this behavior.
- Removed the code which changes db context.
- Added code to check that a valid db was supplied.
 2006-11-28 16:03:53 +01:00
ramil/ram@myoffice.izhnet.ru
2469ca2144 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug21587/my51-bug21587
 2006-11-28 13:54:55 +04:00
ramil/ram@myoffice.izhnet.ru
25b5024571 Merge mysql.com:/usr/home/ram/work/bug21587/my50-bug21587 
into  mysql.com:/usr/home/ram/work/bug21587/my51-bug21587
 2006-11-28 13:49:43 +04:00
tsmith/tim@siva.hindu.god
37d1d86d9f raise max_connections default to avoid conflicts with apache max_childs settings (Bug #23883) 2006-11-27 15:01:14 -07:00
jpipes@shakedown.(none)
03a5dcd7ce Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
 2006-11-27 14:58:57 -05:00
jpipes@shakedown.(none)
7c7b1ede76 Merge shakedown.(none):/home/jpipes/dev/mysql-5.0-maint 
into  shakedown.(none):/home/jpipes/dev/mysql-5.1-new-maint2
 2006-11-27 14:46:48 -05:00
msvensson@neptunus.(none)
e09616e1ac Add my_getpagesize.c as source for mysys 2006-11-27 16:04:52 +01:00
msvensson@neptunus.(none)
545fac620f Add mysys/my_getpagesize as source file foir mysql_upgrade 
Don't link mysql_upgrade with mysys
 2006-11-27 15:00:08 +01:00
msvensson@neptunus.(none)
a45b64b134 Move misplaced #endif 2006-11-27 14:02:14 +01:00
msvensson@neptunus.(none)
a6ce7b89a9 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-27 10:48:41 +01:00
msvensson@neptunus.(none)
1bd6e4f66a Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-27 10:39:40 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
55aa6e04bd Fix for bug #21587: FLUSH TABLES causes server crash when used with HANDLER statements 
Problems (appear only under some circumstances): 
  1. we get a reference to a deleted table searching in the 
     thd->handler_tables_hash in the mysql_ha_read().

  2. DBUG_ASSERT(table->file->inited == handler::NONE); assert fails in the
     close_thread_table().

Fix: end open index scans and table scans and remove references to the 
tables from the handler tables hash. After this preparation it is safe 
to close the tables. The close can no longer fail on open index/table 
scans and the closed table will not be used again by handler functions.
 2006-11-27 13:24:24 +04:00
kaa@polly.local
332afaa7b6 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2006-11-24 23:45:31 +03:00
kaa@polly.local
699898c82c Merge polly.local:/tmp/maint/bug22077/my50-bug22077 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2006-11-24 17:01:43 +03:00
kaa@polly.local
9ff59261bd Merge polly.local:/tmp/maint/bug22077/my50-bug22077 
into  polly.local:/tmp/maint/bug22077/my51-bug22077
 2006-11-24 16:23:40 +03:00
knielsen@ymer.(none)
c6986359f9 Merge ymer.(none):/usr/local/mysql/tmp/mysql-5.0-maint 
into  ymer.(none):/usr/local/mysql/tmp/mysql-5.0-gca
 2006-11-24 12:42:56 +01:00
knielsen@ymer.(none)
f007ff64e0 Merge ymer.(none):/usr/local/mysql/tmp/mysql-5.0-gca 
into  ymer.(none):/usr/local/mysql/tmp/mysql-5.1-new-maint
 2006-11-24 12:40:23 +01:00
knielsen@ymer.(none)
eb9dfafa65 Merge ymer.(none):/usr/local/mysql/tmp/mysql-4.1-maint 
into  ymer.(none):/usr/local/mysql/tmp/mysql-5.0-gca
 2006-11-24 12:39:16 +01:00
knielsen@ymer.(none)
d4595f3c57 Do not link /usr/lib/debug/* on Debian <=3.1, as it causes broken stack 
traces in Valgrind (broken libc6-dbg).
Installing libc6-dbg on Debian will still provide proper bactraces, even
without setting LD_LIBRARY_PATH explicitly.
 2006-11-24 12:38:39 +01:00
msvensson@neptunus.(none)
d4d675a6e2 mysql_fix_priviileg_tables.sql might be in share/ but not in $path_share 
since that is where  the lang files etc are
 2006-11-23 21:12:50 +01:00
msvensson@neptunus.(none)
c4af2f26a7 Add mysys/my_getpagesize.c as source file for mysql_upgrade 2006-11-23 21:07:41 +01:00
msvensson@neptunus.(none)
91c3698aba Convert one more opt_source_dist 2006-11-23 20:08:48 +01:00
msvensson@neptunus.(none)
c99678df03 Fix netware compile failure 
Remove other warnings about unused variables
 2006-11-23 20:07:53 +01:00
msvensson@neptunus.(none)
0e4d97edf0 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-23 18:38:27 +01:00
msvensson@neptunus.(none)
58a8b34e20 Merge bk-internal:/home/bk/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-11-23 18:28:16 +01:00
msvensson@neptunus.(none)
54649b06a3 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-23 18:23:35 +01:00
msvensson@neptunus.(none)
8c2efdf4bd Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-23 18:19:54 +01:00
msvensson@neptunus.(none)
cdbc79b500 Make source_dist a "local" global variable 
And it's not an "opt"
 2006-11-23 17:30:32 +01:00
msvensson@neptunus.(none)
8f85eaf925 Remove duplicate "$report_features" 2006-11-23 17:26:06 +01:00
msvensson@neptunus.(none)
7053ef84bf Rework my_getpagesize function 
- Put 'my_getpagesize' in it's own .c file
 - Map the call 'my_getpagesize' directly to 'getpagesize' if it exists
 - Add default implementation for 'my_getpagesize' to be used if no platform
   specfic function exists
 2006-11-23 17:23:29 +01:00