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

34088 commits

This branch
This branch
All branches
Author SHA1 Message Date
evgen@moonbone.local
457b464cf3 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  moonbone.local:/home/evgen/bk-trees/mysql-5.0
 2006-11-26 22:57:04 +03:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
9d328d7d62 mysql-test-run.pl: 
Removed "use diagnostics", reduces Perl speed significantly. Can be
  enabled with "perl -Mdiagnostics mysql-test-run.pl".
mtr_report.pl:
  Don't try output "skipped" comment if there is none (bug#24471)
 2006-11-24 18:26:53 +01:00
df@kahlann.erinye.com
728357200c Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2006-11-24 15:36:51 +01:00
df@kahlann.erinye.com
34cedd8d77 fixes for mtr_unique.pl 2006-11-24 15:36:04 +01: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
msvensson@neptunus.(none)
fb55bd7a03 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-24 13:39:41 +01:00
msvensson@neptunus.(none)
7d8c8af5a2 Fix merge conflicts 2006-11-24 13:39:09 +01: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)
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)
86f0d1bb03 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-24 12:12:25 +01:00
msvensson@neptunus.(none)
354e9c4ea4 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-24 12:04:58 +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
anozdrin/alik@booka.
ea47e05f3c Fix for BUG##24415: Instance manager test im_daemon_life_cycle 
fails randomly.

The problem was that the test case used command line tool (mysql)
without specifying connect_timeout argument. In some cases,
this lead to hanging of the test case.

The fix is to specify --connect_timeout=1 when starting mysql.

Also, the patch contains polishing and various cleanups to simplify
analyzing of the problems further.

The patch affects only test suite, no server codebase has been
touched.
 2006-11-23 22:55:36 +03:00
msvensson@neptunus.(none)
91c3698aba Convert one more opt_source_dist 2006-11-23 20:08:48 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
35cfb3876d Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
 2006-11-23 20:08:12 +01:00
msvensson@neptunus.(none)
c99678df03 Fix netware compile failure 
Remove other warnings about unused variables
 2006-11-23 20:07:53 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f1ec3372be Many files: 
Adjuster project files to reflect move of "mySTL" directory
 2006-11-23 20:04:18 +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
monty@mysql.com/nosik.monty.fi
501333f694 Added option --mtr-build-thread to mysql-test-run.pl 
Load shared libraries from zlib (fixed that mysql-test-run.pl didn't work on some Solaris boxes)
Added connect timeout to test to make im_daemon_life_cycle more predictable
 2006-11-23 18:39:10 +02: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
monty@mysql.com/nosik.monty.fi
fb9bb62b1e Added some missing DBUG_RETURN 
Fixed that --valgrind works again with mysql-test-run.sh
Extended error messages when loosing connection during mysql_real_connect()
 2006-11-23 16:41:21 +02:00
msvensson@neptunus.(none)
bc59087a9a Add define for my_getpagesize to 8192(reworked in 5.0) 2006-11-23 12:06:04 +01:00
msvensson@neptunus.(none)
c76adf6021 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-release 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-23 11:57:18 +01:00
msvensson@neptunus.(none)
176313a679 mysql_upgrade should look for .sql script also in share/ directory 2006-11-23 11:56:05 +01:00
msvensson@neptunus.(none)
d3b4712bad Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-23 11:54:25 +01:00
msvensson@neptunus.(none)
2aa0d085e3 Build fixes for NetWare 2006-11-23 11:38:44 +01:00
msvensson@neptunus.(none)
8e6cf24d3b Fix my_system_gmt_sec function declaration to be same as definition 2006-11-23 09:56:50 +01:00
jonas@perch.ndb.mysql.com
1209eebdc1 ndb - bug#24503 
remove debug printouts
 2006-11-22 15:45:57 +01:00
jonas@perch.ndb.mysql.com
f2113a5f6e ndb - bug#24503 
Fix scan filter on bit types
  (note should probably be enabled in condition pushdown aswell)
 2006-11-22 15:42:03 +01:00
kroki/tomash@moonlight.intranet
3b9a8532f5 After merge fixes: remove const and add query buffer. 2006-11-22 16:49:32 +03:00
kroki/tomash@moonlight.intranet
21daae583d Cleanup: remove const. 2006-11-22 16:47:12 +03:00
jonas@perch.ndb.mysql.com
d5e17a5792 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-11-22 14:14:36 +01:00
jonas@perch.ndb.mysql.com
ec1ba9db28 ndb - bug#24461 
m  ove mlock to much earlier in startphases
  not to affect heartbeats
 2006-11-22 14:13:32 +01:00
jonas@perch.ndb.mysql.com
bd1612a51e Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-11-22 14:09:02 +01:00
jonas@perch.ndb.mysql.com
e9b1a8b848 ndb - bug#24461 - LockPagesInMemory ignored 
actually do run mlockall
 2006-11-22 14:05:40 +01:00
kroki/tomash@moonlight.intranet
b290ed7a97 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21635
 2006-11-22 14:17:24 +03:00
kroki/tomash@moonlight.intranet
608789eb26 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21635
 2006-11-22 14:15:23 +03:00
kroki/tomash@moonlight.intranet
003cd7b78f Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21635 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21635
 2006-11-22 14:05:26 +03:00
kroki/tomash@moonlight.intranet
ec7a6d15fc BUG#21635: MYSQL_FIELD struct's member strings seem to misbehave for 
expression cols.

The problem was that MYSQL_FIELD::org_name was set for MIN() and MAX()
functions (COUNT() is also mentioned in the bug report but was already
fixed).

After this patch for expressions MYSQL_FIELD::name is set to either
expression itself or its alias, and other data origin fields of
MYSQL_FILED (db, org_table, table, org_name) are empty strings.
 2006-11-22 13:58:00 +03:00
ramil/ram@mysql.com/myoffice.izhnet.ru
8512b7e5bd Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug21789/my41-bug21789
 2006-11-22 14:06:37 +04:00
msvensson@neptunus.(none)
88d2c9d130 Merge neptunus.(none):/home/msvensson/mysql/bug20589/my41-bug20589 
into  neptunus.(none):/home/msvensson/mysql/bug20589/my50-bug20589
 2006-11-22 09:52:56 +01:00
msvensson@neptunus.(none)
0a27881be5 Bug #20589 Missing some table level privileges after upgrade 
- Update comments to reflect correct version
 2006-11-22 09:52:31 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
802f7fc366 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug21789/my50-bug21789
 2006-11-22 12:40:15 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b11dba2f0b Merge mysql.com:/usr/home/ram/work/bug21789/my41-bug21789 
into  mysql.com:/usr/home/ram/work/bug21789/my50-bug21789
 2006-11-22 12:10:18 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
711b6a63be Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
 2006-11-22 10:52:44 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
c6e856de10 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug22029/my41-bug22029
 2006-11-22 10:30:46 +04:00