mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
48541 commits 2784 branches 343 tags 1.6 GiB
Commit graph

48541 commits

This branch
This branch
All branches
Author SHA1 Message Date
gshchepa/uchum@gleb.loc
95d43074cc Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-20 04:21:46 +05:00
gshchepa/uchum@gleb.loc
c404cd7c9c Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-20 04:04:57 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
c4b12955b3 mysql_client_test fixed 2007-07-20 00:04:30 +05:00
evgen@moonbone.local
7a2491871d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/29850-bug-5.0-opt-mysql
 2007-07-19 21:40:12 +04:00
evgen@moonbone.local
934089a82b Bug#29850: Wrong charset of GROUP_CONCAT result when the select employs 
a temporary table.

The result string of the Item_func_group_concat wasn't initialized in the 
copying constructor of the Item_func_group_concat class. This led to a
wrong charset of GROUP_CONCAT result when the select employs a temporary
table.

The copying constructor of the Item_func_group_concat class now correctly
initializes the charset of the result string.
 2007-07-19 20:21:23 +04:00
holyfoot/hf@hfmain.(none)
db2b40b426 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/hf/work/29687/my51-29687
 2007-07-19 21:03:26 +05:00
holyfoot/hf@hfmain.(none)
1657b9e356 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/29687/my51-29687
 2007-07-19 21:02:11 +05:00
holyfoot/hf@hfmain.(none)
cd70db6656 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/hf/work/29687/my50-29687
 2007-07-19 21:01:58 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
d0272fe1d5 test case for memory leak added 2007-07-19 20:59:11 +05:00
holyfoot/hf@hfmain.(none)
02c81671ce Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/29687/my50-29687
 2007-07-19 20:59:08 +05:00
holyfoot/hf@hfmain.(none)
a49bc17fe8 Merge mysql.com:/home/hf/work/29687/my50-29687 
into  mysql.com:/home/hf/work/29687/my51-29687
 2007-07-19 20:58:04 +05:00
tsmith@bk-internal.mysql.com
4223b12523 Merge bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.0-maint 
into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.1-maint
 2007-07-19 17:44:35 +02:00
tsmith@bk-internal.mysql.com
b066c1208e Merge bk-internal.mysql.com:/data0/bk/mysql-4.1-maint 
into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.0-maint
 2007-07-19 17:43:34 +02:00
gshchepa/uchum@gleb.loc
dfd82a6b74 Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-19 20:06:55 +05:00
gshchepa/uchum@gleb.loc
35a2a20160 Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-19 20:01:13 +05:00
gshchepa/uchum@gleb.loc
d5f2133bc3 Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-07-19 19:57:53 +05:00
gshchepa/uchum@gleb.loc
d5c8c8cc66 mysqldump.result: 
Post-merge fix.
 2007-07-19 14:56:04 +05:00
gshchepa/uchum@gleb.loc
7481113f1b Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-19 14:23:53 +05:00
gshchepa/uchum@gleb.loc
77ec161c42 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-28524 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-07-19 10:54:39 +05:00
tsmith@ramayana.hindu.god
27ef95237d Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-07-18 15:32:22 -06:00
tsmith@ramayana.hindu.god
f4309e1777 ddl_i18n_utf8.test, ddl_i18n_koi8r.test: 
Don't run test with embedded server; requires external client connections
 2007-07-18 15:31:24 -06:00
cmiller@zippy.cornsilk.net
4463163c11 Re-set the plugin name so that we can be sure the plugin init() 
function doesn't set it to something else.
 2007-07-18 13:37:56 -04:00
cmiller@zippy.cornsilk.net
5d0b7dea04 Move the filling of the table_name column above the initialization, 
so that the init function has access to the name.
 2007-07-18 12:27:54 -04:00
gkodinov/kgeorge@magare.gmz
d5a0cf134b 5.0-opt -> 5.1-opt merge 2007-07-18 18:08:05 +03:00
gshchepa/uchum@gleb.loc
3f91aedadb Fixed bug #28524. 
For each view the mysqldump utility creates a temporary table
with the same name and the same columns as the view 
in order to satisfy views that depend on this view.
After the creation of all tables, mysqldump drops all
temporary tables and creates actual views.
However, --skip-add-drop-table and --compact flags disable
DROP TABLE statements for those temporary tables. Thus, it was
impossible to create the views because of existence of the
temporary tables with the same names.
 2007-07-18 19:14:48 +05:00
gkodinov/kgeorge@magare.gmz
aeddb42304 Merge magare.gmz:/home/kgeorge/mysql/work/B29325-my_errno-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-5.1-opt
 2007-07-18 15:57:17 +03:00
gkodinov/kgeorge@magare.gmz
f6225e2048 Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-5.1-opt
 2007-07-18 15:56:29 +03:00
gkodinov/kgeorge@magare.gmz
94535ca828 Bug #29325: create table overwrites .MYD file of other 
table (datadir)
Set errno when retunring an error in my_create_with_symlink.
 2007-07-18 15:33:41 +03:00
sergefp@mysql.com
4f579b8d0e Mark deadcode for gcov 2007-07-18 11:12:15 +04:00
sergefp@mysql.com
2e21c6e771 Mark deadcode for gcov 2007-07-18 00:29:25 +04:00
sergefp@mysql.com
b38206978d Small comments fix 2007-07-17 22:46:51 +04:00
tsmith@ramayana.hindu.god
23695e4e1e Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-07-17 11:33:26 -06:00
tsmith@ramayana.hindu.god
e84e86c156 Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-07-17 11:32:50 -06:00
tsmith@ramayana.hindu.god
91dc419715 Merge ramayana.hindu.god:/home/tsmith/m/bk/41 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
 2007-07-17 11:32:34 -06:00
sergefp@pylon64.mylan
82973c72ae Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/psergey/mysql-5.0-bug29740
 2007-07-17 19:53:33 +04:00
sergefp@mysql.com
651e6ffa66 [pb problem]: ha_heap->clone() fails on windows because of mess with 
'/' and '\' in path delimiters:
- Fix this by creating new handler with exactly the same path line as
  was passed to ha_create/ha_open.
 2007-07-17 19:51:50 +04:00
kostja@bodhi.(none)
0d027edd6a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-17 13:32:19 +04:00
kostja@bodhi.(none)
19a19f81e8 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-17 13:13:49 +04:00
kostja@bodhi.(none)
6b3784870c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-17 13:10:02 +04:00
kostja@bodhi.(none)
948ba7b7fb Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-07-17 13:08:23 +04:00
svoj@june.mysql.com
cb995365fb Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  mysql.com:/home/svoj/devel/mysql/test/mysql-5.1-engines
 2007-07-17 13:20:32 +05:00
istruewing@chilla.local
db2884a530 Disabled a test case that reports an error on OSX. 2007-07-17 09:52:55 +02:00
tnurnberg@sin.intern.azundris.com
c01fe97165 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  sin.intern.azundris.com:/home/tnurnberg/27198/51-27198
 2007-07-17 09:39:44 +02:00
tnurnberg@sin.intern.azundris.com
8d7365a4b0 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  sin.intern.azundris.com:/home/tnurnberg/27198/50-27198
 2007-07-17 09:37:46 +02:00
istruewing@chilla.local
ba177535f5 Post-merge fixes 
Disabled test cases that produce errors in a "server log".
 2007-07-17 09:25:01 +02:00
tnurnberg@sin.intern.azundris.com
bc3b442998 Merge sin.intern.azundris.com:/home/tnurnberg/27198/50-27198 
into  sin.intern.azundris.com:/home/tnurnberg/27198/51-27198
 2007-07-17 08:23:43 +02:00
tnurnberg@sin.intern.azundris.com
261acdbbea Merge sin.intern.azundris.com:/home/tnurnberg/27198/41-27198 
into  sin.intern.azundris.com:/home/tnurnberg/27198/50-27198
 2007-07-17 06:59:24 +02:00
dkatz@damien-katzs-computer.local
e5d23da4af Merge damien-katzs-computer.local:/Users/dkatz/mysql51 
into  damien-katzs-computer.local:/Users/dkatz/51
 2007-07-16 23:15:34 -04:00
kostja@bodhi.(none)
97bdd8030b Fix a build break on 64 bit (uint and size_t are distinct types). 2007-07-17 01:30:57 +04:00
istruewing@chilla.local
dd7e9b9a42 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-07-16 23:21:08 +02:00