mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
48617 commits 2784 branches 343 tags 1.6 GiB
Commit graph

48617 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
joerg@trift-lap.none
7b703eaa12 Merge trift-lap.none:/MySQL/M50/bug14151-5.0 
into  trift-lap.none:/MySQL/M51/bug14151-5.1
 2007-07-19 15:11:01 +02:00
joerg@trift-lap.none
af3c675bc1 Avoid the name conflict between the system-provided "md5.h" and the MySQL one 
by renaming "include/md5.h" to "include/my_md5.h".

Fixes bug#14151.
 2007-07-19 14:14:03 +02:00
dfischer/mysqldev@mysql.com/production.mysql.com
4bab858fba field.cc, field.h: 
i5 compatibility
 2007-07-19 14:12:05 +02: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
kent@mysql.com/kent-amd64.(none)
4ca632bfc3 CMakeLists.txt, configure.js: 
Allow to set mysqld exe suffix
 2007-07-18 15:53:10 +02:00
kent@kent-amd64.(none)
96dfe76d93 Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
 2007-07-18 15:43:20 +02:00
kent@mysql.com/kent-amd64.(none)
7c1d25d9f9 CMakeLists.txt, configure.js: 
Allow to set mysqld exe suffix
 2007-07-18 15:42:36 +02:00
kostja@bodhi.(none)
198b97a625 Add a test case for Bug#22427 create table if not exists + stored 
function results in inconsistent behavior.

The bug itself was fixed by the patch for bug 20662.
 2007-07-18 17:09:03 +04: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
kostja@bodhi.(none)
9bac763cc1 A fix and a test case for Bug#26104 Bug on foreign key class constructor. 
Fix the typo in the constructor. Cover a semantic check that previously
never worked with a test.
 2007-07-18 16:22:05 +04:00
kostja@bodhi.(none)
98a45e1a0f Add a test case for Bug#27248 Triggers: error if insert affects temporary 
table.
The bug itself is yet another manifestation of Bug 26141.
 2007-07-18 14:42:06 +04: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
joerg@trift2.
f587750606 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-07-17 22:03:06 +02:00
joerg@trift2.
fae201b783 Merge trift2.:/MySQL/M51/bug21023-25486-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-07-17 21:46:47 +02:00
joerg@trift2.
aa03d369bf Merge trift2.:/MySQL/M50/bug21023-25486-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-07-17 21:44:36 +02:00
joerg@trift2.
1c19f191a4 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-07-17 21:40:36 +02:00
joerg@trift2.
2285f9d7e1 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-07-17 21:36:51 +02:00
joerg@trift2.
59588dff9a Merge trift2.:/MySQL/M50/bug21023-25486-5.0 
into  trift2.:/MySQL/M51/bug21023-25486-5.1
 2007-07-17 21:11:22 +02: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
joerg@trift2.
9d55f51b15 Handle "support-files/mysqld_multi.server.sh" like other shell scripts. 
Fixing bug#25486:  mysqld_multi.server.sh missing from builds
 2007-07-17 19:27:31 +02: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
joerg@trift2.
cb28594deb Ensure "mysql-stress-test.pl" is included in both "tar.gz" and RPM packages. 
Fixing bug#21023:  "mysql-stress-test.pl" missing in builds
 2007-07-17 16:25:32 +02: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
dfischer/mysqldev@mysql.com/production.mysql.com
0e98bed903 make_binary_distribution.sh: 
BUG#29382
 2007-07-17 10:25:48 +02: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