mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
49066 commits 2784 branches 343 tags 1.6 GiB
Commit graph

49066 commits

This branch
This branch
All branches
Author SHA1 Message Date
gshchepa/uchum@gleb.loc
538905f12c Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-29 14:41:39 +05:00
evgen@moonbone.local
e53a484ec9 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/29856-bug-5.0-opt-mysql
 2007-07-28 22:47:03 +04:00
gshchepa/uchum@gleb.loc
d90a826271 Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-07-28 23:47:02 +05:00
gshchepa/uchum@gleb.loc
8fa8f0064d Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-28 23:38:59 +05:00
gshchepa/uchum@gleb.loc
a077dd8f61 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-29834 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-07-28 23:36:27 +05:00
gshchepa/uchum@gleb.loc
ff5d72021e Fixed bug #29834. 
Using view columns by their names during an execution of
a prepared SELECT statement or a SELECT statement inside
a SP caused a memory leak.
 2007-07-28 23:10:38 +05:00
evgen@moonbone.local
72311008e5 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/30020-bug-5.0-opt-mysql
 2007-07-28 21:39:03 +04:00
gshchepa/uchum@gleb.loc
ed90bd2fd9 Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-28 22:26:29 +05:00
gshchepa/uchum@gleb.loc
557c52ea47 Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-28 21:26:01 +05:00
gshchepa/uchum@gleb.loc
d9f7c44351 Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-07-28 21:24:19 +05:00
gshchepa/uchum@gleb.loc
589c585de2 Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-28 21:18:19 +05:00
evgen@moonbone.local
f18b23861a Bug#30020: Insufficient check led to a wrong info provided by the 
information schema table.

The get_schema_views_record() function fills records in the view table of
the informations schema with data about given views. Among other info
the is_updatable flag is set. But the check whether the view is updatable or
not wasn't covering all cases thus sometimes providing wrong info.
This might led to a user confusion.

Now the get_schema_views_record function additionally calls to the 
view->can_be_merge() function to find out whether the view can be updated or
not.
 2007-07-28 16:02:29 +04:00
istruewing@chilla.local
92d10ed41b Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-07-28 13:36:20 +02:00
evgen@moonbone.local
123666299e Bug#29856: Insufficient buffer space led to a server crash. 
The subst_spvars function is used to create query string with SP variables 
substituted with their values. This string is used later for the binary log
and for the query cache. The problem is that the
query_cache_send_result_to_client function requires some additional space
after the query to store database name and query cache flags. This 
space wasn't reserved by the subst_spvars function which led to a memory
corruption and crash.

Now the subst_spvars function reserves additional space for the query cache.
 2007-07-28 15:01:29 +04:00
istruewing@chilla.local
edc859ffe1 Merge chilla.local:/home/mydev/mysql-5.0-ateam 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-07-28 11:45:31 +02:00
holyfoot/hf@hfmain.(none)
351f30d861 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/hf/work/29878/my51-29878
 2007-07-28 14:11:34 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
ce2410dd1e rpl_session_var.test fixed to not depend on mysql_test_run parameters 2007-07-28 14:10:56 +05:00
istruewing@chilla.local
a5981b9556 Backported mi_test_all.sh from 5.1. 2007-07-28 10:25:50 +02:00
baker@bk-internal.mysql.com
78da884eec Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-07-28 09:16:35 +02:00
gkodinov/kgeorge@magare.gmz
51f8aa9615 show_check.result: 
Addendum to thr fix for bug 30000:
  show procedure/function code defined only in debug builds
show_check.test:
  Addendum to thr fix for bug 30000: 
  show procedure/function code defined only in debug builds
 2007-07-28 08:42:43 +03:00
ramil/ram@ramil.myoffice.izhnet.ru
8e6761034d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b29980/b29980.5.1
 2007-07-28 10:40:11 +05:00
tsmith@ramayana.hindu.god
60b6716bcd Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/51-b29992 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-07-27 17:27:08 -06:00
tsmith@ramayana.hindu.god
091f6a4677 Bug #29992: syslog error logging does not flush 
Don't use syslog by default; user will have to request it explicitly with the --syslog option.

Use "sed -u" to get unbuffered output from sed, if it's supported.

Otherwise, don't use sed at all - don't strip the timestamp from mysqld messages.

Also, add new --syslog-tag=FOO option, which adds "-FOO" to the tag used when logging messages to syslog (i.e., mysqld-FOO or mysqld_safe-FOO)

Also, explicitly mention where log messages are going, so user can more easily find them.

Also, check if 'logger' is in the PATH, and log to the error log file if it can't be found.
 2007-07-27 17:20:43 -06:00
iggy@alf.(none)
3e7caa131c Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  alf.(none):/src/bug30103/my50-bug30103
 2007-07-27 17:44:43 -04:00
iggy@alf.(none)
b853f4d1fe Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  alf.(none):/src/bug30103/my51-bug30103
 2007-07-27 17:43:38 -04:00
iggy@alf.(none)
95b545dba0 Bug#30103 CMake build solution does not remove auto-generated resources 
- Add CMake rule to remove files.
- Manual merge.
 2007-07-27 17:41:34 -04:00
iggy@alf.(none)
4aad516c64 Merge alf.(none):/src/bug30103/my50-bug30103 
into  alf.(none):/src/bug30103/my51-bug30103
 2007-07-27 17:36:30 -04:00
holyfoot/hf@hfmain.(none)
e4f4a46f76 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/29878/my50-29878
 2007-07-28 01:33:03 +05:00
holyfoot/hf@hfmain.(none)
642b0c00ed Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/29878/my51-29878
 2007-07-28 00:50:17 +05:00
jperkin@production.mysql.com
88ef9a4214 Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0
 2007-07-27 20:49:23 +02:00
jperkin@production.mysql.com
7731aad613 Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0
 2007-07-27 20:47:30 +02:00
jperkin@production.mysql.com
61a1e17260 Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.1
 2007-07-27 20:43:34 +02:00
malff/marcsql@weblab.(none)
db7af023c0 manual merge 2007-07-27 12:30:02 -06:00
jperkin@production.mysql.com
87a297061c Merge production.mysql.com:/usersnfs/jperkin/bk/bug-28585-5.0 
into  production.mysql.com:/usersnfs/jperkin/bk/bug-28585-5.1
 2007-07-27 20:28:34 +02:00
malff/marcsql@weblab.(none)
32668a2e08 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-25422-d
 2007-07-27 12:22:00 -06:00
malff/marcsql@weblab.(none)
ac7b17eac4 Code review changes 2007-07-27 12:19:36 -06:00
anozdrin/alik@ibm.
47345bd04f Fix merge. 2007-07-27 21:50:37 +04:00
holyfoot/hf@hfmain.(none)
37dece087e Merge mysql.com:/home/hf/work/29878/my50-29878 
into  mysql.com:/home/hf/work/29878/my51-29878
 2007-07-27 22:43:33 +05:00
dkatz@damien-katzs-computer.local
32fce0e17e Merge damien-katzs-computer.local:/Users/dkatz/50_hpux 
into  damien-katzs-computer.local:/Users/dkatz/mysql51
 2007-07-27 13:41:11 -04:00
anozdrin/alik@ibm.
af9e57562d Merge ibm.:/home/alik/Documents/MySQL/devel/5.0-rt 
into  ibm.:/home/alik/Documents/MySQL/devel/5.1-rt-merge
 2007-07-27 21:30:43 +04:00
df@pippilotta.erinye.com
50e7239d7b BUG#20815 for the 5.1 branch 2007-07-27 19:14:08 +02:00
anozdrin/alik@ibm.
04047d9666 Fix test so that it will be environment-independent. 2007-07-27 21:06:50 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
bc15820d32 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b29980/b29980.5.1
 2007-07-27 21:17:05 +05:00
serg@janus.mylan
0967e88790 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-07-27 18:08:09 +02:00
iggy@alf.(none)
667f2a35de Bug#30103 CMake build solution does not remove auto-generated resources 
- Add CMake rule to remove files.
 2007-07-27 11:54:54 -04:00
kent@mysql.com/kent-amd64.(none)
519ebab04e SSL/Makefile.am mysql-test/Makefile.am: 
Moved CERT files to where they are used, avoids conflict
  between two make files trying to install the same CERTs
SSL/*.pem, 
  Move: SSL/*.pem -> mysql-test/std_data/
 2007-07-27 17:39:07 +02:00
thek@adventure.(none)
8f5fad2c34 Merge adventure.(none):/home/thek/Development/cpp/bug29929/my50-bug29929 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
 2007-07-27 17:32:45 +02:00
thek@adventure.(none)
5ab7da9167 Merge adventure.(none):/home/thek/Development/cpp/bug29929/my50-bug29929 
into  adventure.(none):/home/thek/Development/cpp/bug29929/my51-bug29929
 2007-07-27 16:59:09 +02:00
gkodinov/kgeorge@magare.gmz
092f9d2e55 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B30000-5.1-opt
 2007-07-27 17:57:29 +03:00
thek@adventure.(none)
889b4ebcee Bug #29929 LOCK TABLES does not pre-lock tables used in triggers of the locked tables 
When a table was explicitly locked with LOCK TABLES no associated
tables from any related trigger on the subject table were locked.
As a result of this the user could experience unexpected locking
behavior and statement failures similar to "failed: 1100: Table'xx'
was not locked with LOCK TABLES".

This patch fixes this problem by making sure triggers are
pre-loaded on any statement if the subject table was explicitly
locked with LOCK TABLES.
 2007-07-27 16:56:29 +02:00