mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 10:31:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
51130 commits 2786 branches 343 tags 1.7 GiB
Commit graph

1366 commits

Author SHA1 Message Date
tsmith@siva.hindu.god
5e75e31268 Merge siva.hindu.god:/home/tsmith/m/bk/50 
into  siva.hindu.god:/home/tsmith/m/bk/maint/50
 2007-04-17 15:40:13 -06:00
kent/mysqldev@mysql.com/production.mysql.com
c43a7b9bf7 Raise version number after cloning 5.0.40 2007-04-17 15:22:48 +02:00
joerg@trift2.
7139131674 Merge trift2.:/MySQL/M50/limit-man-5.0 
into  trift2.:/MySQL/M51/limit-man-5.1
 2007-04-17 14:45:21 +02:00
joerg@trift2.
e7788a9f1b Cleanup: The temporary file could be left around if nothing was excluded. 2007-04-17 14:41:07 +02:00
joerg@trift2.
6feaf3c726 Merge trift2.:/MySQL/M50/limit-man-5.0 
into  trift2.:/MySQL/M51/limit-man-5.1

Fixes during manual merge, due to the "plugin" naming of configure variables in 5.1
 2007-04-17 12:43:02 +02:00
joerg@trift2.
8437fd62b2 Let the "configure" options that control table handlers (NDB, InnoDB) or features ("embedded") 
also control the list of man pages installed, so that they correspond better to the binaries.

This is the second version of this fix, including review comments.
 2007-04-17 12:18:17 +02:00
tomas@whalegate.ndb.mysql.com
5ee4948dec Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-04-16 14:51:55 +02:00
tomas@whalegate.ndb.mysql.com
a30755427a Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
 2007-04-16 14:51:08 +02:00
mtaylor@qualinost.(none)
48739d15f1 Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint-debian 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint-debian
 2007-04-11 16:38:37 -07:00
mtaylor@qualinost.(none)
6547960e28 Adding files to support building for debian. 
---
Removed reference to debian svn location of debian dir. 
Changed verbage of comment to appease Timothy. 
---
Removed added manpages that aren't appropriate for our build. 
---
Added debian dir to list of dist targets. 
Added list of files needed to be distributed in debian dir.
---
Added semi-colons to fix syntax error.
---
BUG#27769 MySQL should include debian packaing dir
Added debian/Makefile to configure.in to support make dist.
 2007-04-11 16:13:09 -07:00
df@pippilotta.erinye.com
d09d2517cf Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-36sp1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-04-11 13:37:05 +02:00
df@pippilotta.erinye.com
b51c346781 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-36sp1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-04-11 13:31:28 +02:00
df@pippilotta.erinye.com
d5f6363ba1 make configure handle service pack version strings 2007-04-11 13:01:11 +02:00
hakank/hakan@lu0011.wdf.sap.corp
48b2d85708 Added comment about changing major version number. 2007-04-11 12:30:30 +02:00
msvensson@pilot.blaudden
2218fafa1f Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-11 09:34:02 +02:00
kent@mysql.com/kent-amd64.(none)
463b34e77b zlib.m4: 
Only require the more recent zlibCompileFlags() when
  building the server, client zlib don't need it.
Makefile.am:
  Always build the bundled zlib static only
configure.in:
  Look for dlopen() even if --with-mysqld-ldflags constains "-static",
  as this is not the same as the flag to "ld", it just informs
  "libtool" to link static with libraries created part of the build,
  even if there exists shared versions.
make_binary_distribution.sh:
  Real "mysqlmanager" executable might be in ".libs"
 2007-04-05 08:36:56 +02:00
kent@kent-amd64.(none)
0544355385 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-28 23:08:00 +02:00
kent@mysql.com/kent-amd64.(none)
7a2e0ee7d7 configure.in: 
Don't install ndb man pages if no ndb configured
config-win.h, CMakeLists.txt, README, configure.js:
  Removed Cybozu patches
 2007-03-28 23:00:50 +02:00
msvensson@pilot.blaudden
b554258a8e Bug#22508 BUILD/compile-dist fails due to problem with readline/libedit 
- Move the link_sources command from top level Makefile into each subdir
   that need to link files
 2007-03-27 23:56:48 +02:00
dfischer/mysqldev@mysql.com/production.mysql.com
b9a317de70 Raise version number after cloning 5.1.17-beta 2007-03-23 07:27:46 +01:00
jbruehe/mysqldev@mysql.com/production.mysql.com
6d99387502 Raise version number after cloning 5.0.38 2007-03-15 22:28:31 +01:00
kent@kent-amd64.(none)
ac91a4a89f Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-14 14:37:50 +01:00
kent@mysql.com/kent-amd64.(none)
201e58d14e Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-03-14 14:31:44 +01:00
kent@mysql.com/kent-amd64.(none)
6b72b54716 Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
 2007-03-14 14:29:23 +01:00
kent@mysql.com/kent-amd64.(none)
be226152ab configure.in: 
Added test for sched_yield() possibly in -lposix4 on Solaris
 2007-03-14 14:27:46 +01:00
kent@kent-amd64.(none)
abde3576d6 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-12 21:29:48 +01:00
kent@mysql.com/kent-amd64.(none)
d6476788fe Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-03-12 21:29:05 +01:00
kent@mysql.com/kent-amd64.(none)
512202a88f configure.in: 
Restored accidently removed line to check for zlib
 2007-03-12 21:27:07 +01:00
kent@kent-amd64.(none)
9d396c6996 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-12 13:29:11 +01:00
kent@mysql.com/kent-amd64.(none)
30537c7d75 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-03-12 13:22:02 +01:00
kent@mysql.com/kent-amd64.(none)
cad1c35618 Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
 2007-03-12 13:15:11 +01:00
kent@mysql.com/kent-amd64.(none)
4e4f184170 Makefile.am, configure.in, mysys.dsp: 
Removed unused files
.del-my_winsem.c:
  Delete: mysys/my_winsem.c
.del-my_semaphore.c:
  Delete: mysys/my_semaphore.c
.del-my_semaphore.h:
  Delete: include/my_semaphore.h
 2007-03-12 13:12:42 +01:00
tsmith@bk-internal.mysql.com
8539d9a7bd The most recent push into mysql-5.1 from mysql-5.2 was a mistake. 
This just reverses those changes.  I'm really sorry about that.

configure.in, version.c:
  Reverse last push (from mysql-5.2 into mysql-5.1)
 2007-03-08 18:38:17 +01:00
tsmith/mysqldev@bk-internal.mysql.com
b887bfe1a4 Update version to 5.2.0-alpha - new 5.2 tree 2007-02-28 19:37:31 +01:00
monty@mysql.com/narttu.mysql.fi
f0ae3ce9b9 Fixed compiler warnings 
Fixed compile-pentium64 scripts
Fixed wrong estimate of update_with_key_prefix in sql-bench
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1
Fixed unsafe define of uint4korr()
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc
Split handle_one_connection() into reusable sub functions.
Split create_new_thread() into reusable sub functions.
Added thread_scheduler; Preliminary interface code for future thread_handling code.

Use 'my_thread_id' for internal thread id's
Make thr_alarm_kill() to depend on thread_id instead of thread
Make thr_abort_locks_for_thread() depend on thread_id instead of thread
In store_globals(), set my_thread_var->id to be thd->thread_id.
Use my_thread_var->id as basis for my_thread_name()
The above changes makes the connection we have between THD and threads more soft.

Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions
Fixed compiler warnings
Fixed core dumps when running with --debug
Removed setting of signal masks (was never used)
Made event code call pthread_exit() (portability fix)
Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called.
Made handling of thread_id and thd->variables.pseudo_thread_id uniform.
Removed one common 'not freed memory' warning from mysqltest
Fixed a couple of usage of not initialized warnings (unlikely cases)
Suppress compiler warnings from bdb and (for the moment) warnings from ndb
 2007-02-23 13:13:55 +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
kent/mysqldev@mysql.com/production.mysql.com
9b3254af96 Raise version number after cloning 5.1.16-beta 2007-02-20 21:42:45 +01:00
bteam/mysqldev@mysql.com/production.mysql.com
724a3b33ee Raise version number after cloning 5.0.36 2007-02-20 16:50:54 +01:00
mysqldev@mysql.com/production.mysql.com
6d10340dfc Raise version number after cloning 4.0.30 2007-02-09 17:08:37 +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
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
cmiller@zippy.cornsilk.net
522d6fb0cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-01-31 16:24:28 -05:00
cmiller@zippy.cornsilk.net
ad66e7a0dd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-01-31 16:23:05 -05: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
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
df@kahlann.erinye.com
455b903f28 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-25530
 2007-01-30 13:53:48 +01:00
monty@narttu.mysql.fi
bb464613ce Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2007-01-29 01:57:07 +02: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
dfischer/mysqldev@mysql.com/production.mysql.com
70a74003fc Raise version number after cloning 5.1.15-beta 2007-01-25 18:19:49 +01:00