mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
46969 commits 2778 branches 343 tags 1.6 GiB
Commit graph

603 commits

Author SHA1 Message Date
serg@janus.mylan
e55719ac3b Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-02-22 17:05:24 +01:00
monty@mysql.com/narttu.mysql.fi
e5cc397f33 Fixed compiler warnings (for linux and win32 and win64) 
Fixed a couple of usage of not initialized warnings (unlikely cases)
 2007-02-22 16:59:57 +02:00
monty@mysql.com/narttu.mysql.fi
6946fa682f After merge fixes 
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
 2007-02-21 19:38:40 +02:00
monty@mysql.com/narttu.mysql.fi
26aa385bc5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2007-02-21 14:07:08 +02:00
serg@janus.mylan
689eed7406 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-02-21 11:36:23 +01:00
joerg@trift2.
b2d20b04fc Merge trift2.:/MySQL/M50/merge-5.0 
into  trift2.:/MySQL/M51/merge-5.1
 2007-02-21 09:45:13 +01:00
joerg@trift2.
4cb11ae425 Merge trift2.:/MySQL/M41/merge-4.1 
into  trift2.:/MySQL/M50/merge-5.0
 2007-02-20 20:18:29 +01:00
serg@janus.mylan
3dafdf7de2 /usr/share/aclocal/mysql.m4 2007-02-14 12:42:11 +01:00
msvensson@neptunus.(none)
e4001b3b5a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2007-02-06 15:46:17 +01:00
msvensson@neptunus.(none)
ede3afe470 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2007-02-06 14:45:08 +01:00
svoj@june.mysql.com
4a6770e06e Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-02-05 15:31:20 +04:00
istruewing@chilla.local
bdf18a85f9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-02-03 09:43:38 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
cd75806b61 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
 2007-02-03 00:58:09 +02:00
istruewing@chilla.local
ed09987083 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-02-01 19:41:04 +01:00
cmiller@zippy.cornsilk.net
b81f4a8314 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my51-bug25341 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-01-31 16:14:42 -05:00
cmiller@zippy.cornsilk.net
5a0ac8afe7 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my50-bug25341 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-01-31 16:14:12 -05:00
cmiller@zippy.cornsilk.net
a3a9d8bd84 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my50-bug25341 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my51-bug25341
 2007-01-31 16:09:36 -05:00
cmiller@zippy.cornsilk.net
24e3508b0e Bug#25341: "init.d/mysql stop" may timeout too quickly 
Thirty five seconds is entirely too short of a period to wait for a server 
to exit.  Instead, make a valliant effort to make sure it exits, and only
give up after a very long period (arbitrarily chosen as 15 minutes).

In addition, if we're being asked to restart the server, then don't try
to start again if trying to stop the server failed.
---
Return zero by default, when the script exits.
---
Set return-/exit-value based on whether we successfully dealt with the 
PID-file.
---
Don't wait that long if the program we're waiting on exits.  It 
should only exit if the server is not going to be started.
 2007-01-31 15:39:41 -05:00
df@kahlann.erinye.com
3f12c914b7 use MTR_BUILD_THREAD=auto for rpm builds 2007-01-31 19:01:46 +01:00
df@kahlann.erinye.com
9fe01abcca Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2007-01-31 18:54:15 +01:00
joerg@trift2.
852321c7f8 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-01-31 18:20:23 +01:00
df@kahlann.erinye.com
beb265b2fe MTR_BUILD_THREAD=auto for test runs during RPM build 2007-01-31 18:18:44 +01:00
joerg@trift2.
cd16ad87a2 Merge trift2.:/MySQL/M50/bug12676-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-01-31 18:16:51 +01:00
kent@kent-amd64.(none)
f8c66fe926 Merge mysql.com:/home/kent/bk/tmp2/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp2/mysql-5.1-build
 2007-01-31 00:30:53 +01:00
kent@mysql.com/kent-amd64.(none)
e580bd6c6f gen_lex_hash.cc: 
If inserting a GPL header, include a complete one
Makefile.am, mysql.dsw, mysql.sln:
  Removed C version of mysql-test-run
mysql.spec.sh:
  Specify GPL license only in GPL sources
.del-my_manage.h:
  Delete: mysql-test/my_manage.h
mysql.spec.sh:
  Added GPL header
.del-mysql_test_run_new.c:
  Delete: mysql-test/mysql_test_run_new.c
.del-mysql_test_run_new.dsp:
  Delete: VC++Files/mysql-test/mysql_test_run_new.dsp
.del-my_create_tables.c:
  Delete: mysql-test/my_create_tables.c
.del-mysql_test_run_new_ia64.dsp:
  Delete: VC++Files/mysql-test/mysql_test_run_new_ia64.dsp
msql2mysql.sh:
  Use up-to-date GPL header
.del-mysql_test_run_new.vcproj:
  Delete: VC++Files/mysql-test/mysql_test_run_new.vcproj
.del-my_manage.c:
  Delete: mysql-test/my_manage.c
 2007-01-31 00:06:42 +01:00
kent@mysql.com/kent-amd64.(none)
de8654e534 mysql.spec.sh: 
Added man page mysql_install_db.1
 2007-01-30 22:40:30 +01:00
monty@mysql.com/narttu.mysql.fi
1f6d91c5a6 after merge fixes 
Removed
 2007-01-29 16:13:18 +02:00
monty@mysql.com/narttu.mysql.fi
410fc81a72 After merge fixes 
Removed a lot of compiler warnings
Removed not used variables, functions and labels
Initialize some variables that could be used unitialized (fatal bugs)
%ll -> %l
 2007-01-29 01:47:35 +02:00
df@kahlann.erinye.com
199f7b46b6 fix order in spec file changelog 2007-01-27 12:46:20 +01:00
monty@narttu.mysql.fi
8a80e36ac3 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
 2007-01-27 03:46:45 +02:00
joerg@trift2.
32e83a6c3d For Linux systems running RHEL 4 (which includes SE-Linux), we need to provide 
additional files that specify some actions which are allowed to the MySQL binaries.
    
Create a new subdirectory "supportfiles/RHEL4-SElinux" for them, and process it.

This fixes bug#12676.
 2007-01-25 17:51:21 +01:00
monty@mysql.com/narttu.mysql.fi
807526ff79 Fixed compiler warnings 
Fixed wrong merge that disabled 'make test'
Renamed all suppress files to end in '.supp'
Don't give "skipped %d bytes from file" warnings in 5.0
 2007-01-22 15:52:15 +02:00
joerg@trift2.
759b66479c Merge trift2.:/MySQL/M50/tmp1-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-01-11 20:20:43 +01:00
jani/jamppa@bk-internal.mysql.com
e2fbd70fb1 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel
 2007-01-11 16:42:48 +01:00
jani@ua141d10.elisa.omakaista.fi
30502c0e01 New file for autopush. To disable (known) compiler warnings. 2007-01-10 19:05:13 +02:00
joerg@trift2.
b63c167f66 support-files/MySQL-shared-compat.spec.sh : Dummy, irrelevant change - just trigger a new build. 2007-01-10 00:36:41 +01:00
joerg@trift2.
68d6f7ae52 Changes necessary to build version 4.0.28: 
- "make_binary_distribution" accepts a dummy "--platform=" argument.

- "MySQL-shared-compat.spec" uses a "version40" define symbol internally.
 2007-01-08 18:33:55 +01:00
kent@kent-amd64.(none)
1a0e36ea6d Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-01-05 17:30:40 +01:00
kent@mysql.com/kent-amd64.(none)
fa5a359f07 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-01-05 16:57:23 +01:00
kent@mysql.com/kent-amd64.(none)
528b457644 mysql.spec.sh, make_binary_distribution.sh: 
Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
  correct "libgcc.a" path is returned for the 32/64 bit architecture
 2007-01-05 16:53:03 +01:00
kent@kent-amd64.(none)
58763e383e Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-31 01:32:21 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729 my_strtoll10-x86.s: 
Corrected spelling in copyright text
Makefile.am:
  Don't update the files from BitKeeper
Many files:
  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
Many files:
  Added GPL copyright text
Removed files:
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/xwf
 2006-12-31 01:02:27 +01:00
kent@kent-amd64.(none)
be15e3bc15 Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-23 20:20:40 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f Many files: 
Changed header to GPL version 2 only
 2006-12-23 20:17:15 +01:00
joerg@trift2.
c011b2e70f Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2006-12-18 11:59:14 +01:00
joerg@trift2.
534b2ca0a8 support-files/mysql.spec.sh 
Fix the move of "mysqlmanager" to section 8: Directory name was wrong.
 2006-12-18 11:51:45 +01:00
joerg@trift2.
436aa807fb Merge trift2.:/MySQL/M50/spec-5.0 
into  trift2.:/MySQL/M51/spec-5.1
 2006-12-14 22:45:06 +01:00
joerg@trift2.
a62051b77c support-files/mysql.spec.sh 
The "mysqlmanager" man page got moved from section 1 to 8.
 2006-12-14 22:41:26 +01:00
joerg@trift2.
8bdcf736bb Merge trift2.:/MySQL/M41/spec-4.1 
into  trift2.:/MySQL/M50/spec-5.0
 2006-12-14 22:37:13 +01:00
joerg@trift2.
5582d60177 support-files/mysql.spec.sh 
The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".
 2006-12-14 22:30:32 +01:00