mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-07 19:53:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
50672 commits 2857 branches 349 tags 1.6 GiB
Commit graph

50672 commits

Author SHA1 Message Date
cmiller@zippy.cornsilk.net
f12087af58 Rewrite profiler code to be easier to maintain and less buggy. 
Between 5.0 and 5.1, the step of incrementing the global query id
changed, which broke how the profiler noticed when a new query had
started.  That reset the state list and caused all but the last 
five (or so) states to be thrown away.

Now, don't watch for query_id changes in the lower level.

Add a bogus state change at the end of profiling so that the last 
real state change is timed.

Emit source reference for the start of the span of time instead of
the end of it.
 2007-11-09 14:45:44 -05:00
cmiller@zippy.cornsilk.net
149581ecbb Merge bk-internal.mysql.com:/home/bk/mysql-5.1-community 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1
 2007-11-02 12:02:22 -04:00
cmiller@zippy.cornsilk.net
0455e69b2b Fix several merge problems. There are many changes in 5.1 from 5.0 
that affect profiling.
 2007-11-02 11:41:58 -04:00
cmiller@zippy.cornsilk.net
e82bbb81d0 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1
 2007-10-31 17:24:32 -04:00
cmiller@zippy.cornsilk.net
872d65a547 Sundry changes to fix merge problems. Most of these are duplicated 
in 5.0-community, but pulling to merge was very hard.
 2007-10-31 16:39:59 -04:00
cmiller@zippy.cornsilk.net
8d836dd38a Push history-limiting code until after the code that adds new 
history entries.  Lazy deletion isn't smart or useful here.
 2007-10-31 12:29:32 -04:00
kent@kent-amd64.(none)
b5e97b4b04 Merge mysql.com:/home/kent/bk/bug24809/mysql-5.0-build 
into  mysql.com:/home/kent/bk/bug24809/mysql-5.1-build
 2007-10-31 10:52:18 +01:00
kent@mysql.com/kent-amd64.(none)
2f88dce6ff Makefile.am: 
Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
  work around for problem with automake 1.10 (bug#24809)
 2007-10-30 20:54:31 +01:00
joerg@trift2.
37e47a080a Minor Makefile fixes: 
1) Add a new top level "Makefile.am" target "make embedded-test".

2) Fix a syntax error (bad merge) in "netware/Makefile.am".
 2007-10-30 20:06:49 +01:00
df@pippilotta.erinye.com
d76498a6a2 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-10-30 15:48:25 +01:00
df@pippilotta.erinye.com
3c3c7d0203 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-10-30 15:39:02 +01:00
df@pippilotta.erinye.com
220add0366 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-10-30 15:37:48 +01:00
df@pippilotta.erinye.com
c72c86713e Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-10-30 15:33:41 +01:00
df@pippilotta.erinye.com
c4ab8a9395 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-10-30 15:24:17 +01:00
df@pippilotta.erinye.com
e5b809333c bug#30630 2007-10-30 15:22:52 +01:00
joerg@trift2.
c836873a8f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2007-10-29 23:13:28 +01:00
kent@mysql.com/kent-amd64.(none)
a77f626cc9 autorun.sh: 
After review changes
 2007-10-29 22:48:58 +01:00
kent@mysql.com/kent-amd64.(none)
5218a5d033 autorun.sh: 
Removed innobase from compile-dist, and let it use autorun.sh to avoid
  code duplication. Also corrected a problem when searching for one of
  "libtoolize" and "glibtoolize", now it honors the PATH setting (Bug#31405)
 2007-10-29 20:12:44 +01:00
joerg@trift2.
b41a047d5c 5.1 has been promoted to "rc" status. 2007-10-29 20:00:36 +01:00
cmiller@zippy.cornsilk.net
44ba122726 Remove easily-changed and prominent variable that toggled 
community-server features.

Community server features should be fully integrated into 5.1, but
disabled by default.  We never toggle that they're disabled based
on the version number, in the 5.1 line and later.
 2007-10-29 12:48:48 -04:00
cmiller@zippy.cornsilk.net
61621a9791 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmerge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1
 2007-10-29 12:42:06 -04:00
joerg@trift2.
e11d481e5f Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-10-29 15:47:37 +01:00
joerg@trift2.
77c4bfe63a Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-10-29 12:56:48 +01:00
joerg@trift2.
9fee3fb694 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-10-29 12:15:17 +01:00
joerg@trift2.
007b410109 Merge trift2.:/MySQL/M50/clone-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-10-29 12:11:05 +01:00
joerg@trift2.
408727615c Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-10-29 11:55:48 +01:00
joerg@trift2.
33f1f130ea Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-10-29 11:54:09 +01:00
gluh@eagle.(none)
e3f7762226 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-10-29 12:38:32 +04:00
mleich@four.local.lan
f85bf63ce7 Fix for 
Bug#31857 funcs_1: a_processlist_priv_no_prot and b_processlist_priv_ps fail
  
Reason for the changes is:
  WL4007 Deprecate RENAME DATABASE: replace with ALTER DATABASE <name> UPGRADE
 2007-10-29 09:31:13 +01:00
mleich@four.local.lan
d3e18cc9bb Fix for 
Bug#31408 funcs_1: <engine>_trig_03e test fail
Modification:
   The TRIGGER PRIVILEGE is now needed for getting informations about TRIGGERs.
   Therefore after REVOKE TRIGGER privilege the 
   - SHOW TRIGGERS
   - SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
   result sets are now empty.
 2007-10-26 17:36:22 +02:00
df@pippilotta.erinye.com
25c12e7d72 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-10-25 13:31:31 +02:00
df@pippilotta.erinye.com
68a24d9f71 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-10-25 13:28:56 +02:00
df@pippilotta.erinye.com
91fd078149 add new trigger to prevent certain naming clashes 2007-10-25 13:28:12 +02:00
joerg@trift2.
00ca6476be Mimic a rename which Daniel already did in 6.0, 
to get rid of a name clash among *deleted* files on case-insignificant file systems.
 2007-10-25 13:17:44 +02:00
gluh@mysql.com/eagle.(none)
97e0180b2b result fix 2007-10-24 12:49:58 +05:00
gluh@mysql.com/eagle.(none)
b2aeda7699 result fix 2007-10-23 20:12:50 +05:00
gluh@eagle.(none)
d639739022 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-10-23 20:11:39 +05:00
gluh@eagle.(none)
53b1c3a299 Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-10-23 20:09:36 +05:00
gluh@mysql.com/eagle.(none)
1d42094d18 after merge fix 2007-10-23 19:28:47 +05:00
gluh@eagle.(none)
17acda6ca8 Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-10-23 19:08:21 +05:00
gluh@eagle.(none)
237383f0fe Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-10-23 18:51:43 +05:00
gluh@eagle.(none)
331ee71261 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-10-23 18:47:18 +05:00
holyfoot/hf@hfmain.(none)
d0f53297f6 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/hf/work/30638/my50-30638
 2007-10-23 17:24:57 +05:00
kaa@polly.(none)
173108956a Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt 
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
 2007-10-23 16:24:56 +04:00
holyfoot/hf@hfmain.(none)
f71a1441ee Merge mysql.com:/home/hf/work/30638/my50-30638 
into  mysql.com:/home/hf/work/30638/my51-30638
 2007-10-23 17:09:32 +05:00
kaa@polly.(none)
6f1aef60ed Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt 
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
 2007-10-23 16:09:31 +04:00
kaa@polly.(none)
6832d2cc1b Merge polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550 
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
 2007-10-23 16:07:03 +04:00
gkodinov/kgeorge@magare.gmz
9934eec243 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
 2007-10-23 15:04:40 +03:00
kaa@polly.(none)
23c65a3b01 Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
 2007-10-23 16:03:48 +04:00
kaa@polly.(none)
17a533e0d0 Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 
into  polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550
 2007-10-23 15:52:27 +04:00