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

47110 commits

This branch
This branch
All branches
Author SHA1 Message Date
svoj@june.mysql.com
09cd5b5ef8 Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
 2007-06-14 16:19:47 +05:00
svoj@mysql.com/june.mysql.com
01c9419cec BUG#26976 - Missing table in merge not noted in related error msg + 
SHOW CREATE TABLE fails
Addition to the fix: report db name + table name instead of table path.
This solves embedded merge test failure.
 2007-06-14 16:18:01 +05:00
svoj@mysql.com/june.mysql.com
a1529d92d1 BUG#26976 - Missing table in merge not noted in related error msg + 
SHOW CREATE TABLE fails

After merge fixes.
 2007-06-08 11:20:50 +05:00
svoj@june.mysql.com
d0a044a0bf Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
 2007-06-07 13:53:23 +05:00
svoj@june.mysql.com
c45b4cf893 Merge 81.176.158.240:devel/mysql/BUG26976/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines
 2007-06-07 12:07:41 +05:00
acurtis/antony@ltamd64.xiphis.org
1f0aca9626 Merge xiphis.org:/home/antony/work2/mysql-5.0-merge 
into  xiphis.org:/home/antony/work2/mysql-5.1-merge
 2007-06-06 12:25:36 -07:00
acurtis/antony@ltamd64.xiphis.org
aab3427131 Merge xiphis.org:/home/antony/work2/mysql-4.1-engines.merge 
into  xiphis.org:/home/antony/work2/mysql-5.0-merge
 2007-06-06 12:22:56 -07:00
acurtis/antony@ltamd64.xiphis.org
af72b54f3e Merge xiphis.org:/home/antony/work2/mysql-5.0-engines 
into  xiphis.org:/home/antony/work2/mysql-5.0-engines.merge
 2007-06-06 12:03:54 -07:00
acurtis/antony@ltamd64.xiphis.org
5a7f1f8a68 Merge xiphis.org:/home/antony/work2/mysql-5.1-engines 
into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
 2007-06-06 12:00:35 -07:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
e112a475bd Merge xiphis.org:/home/antony/work2/mysql-4.1-engines 
into  xiphis.org:/home/antony/work2/mysql-4.1-engines.merge
 2007-06-06 11:51:35 -07:00
tsmith@quadxeon.mysql.com
75ed2c7d16 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41
 2007-06-06 19:00:15 +02:00
joerg/mysqldev@mysql.com/production.mysql.com
0067a9cc02 Raise version number after cloning 4.1.23 2007-06-06 15:22:06 +02:00
tsmith@quadxeon.mysql.com
13adcedc90 mtr_report.pl: 
Add another exception to the acceptable mysqld errors, for test case for bug 28436
 2007-06-06 03:49:24 +02:00
svoj@mysql.com/april.(none)
bd8f81f470 BUG#26976 - Missing table in merge not noted in related error msg + 
SHOW CREATE TABLE fails

Underlying table names, that merge engine fails to open were not
reported.

With this fix CHECK TABLE issued against merge table reports all
underlying table names that it fails to open. Other statements
are unaffected, that is underlying table names are not included
into error message.

This fix doesn't solve SHOW CREATE TABLE issue.
 2007-06-06 04:42:41 +05:00
tsmith@quadxeon.mysql.com
60f6e71ef8 ctype-bin.c: 
Post-merge fix warning
 2007-06-06 00:22:35 +02:00
tsmith@quadxeon.mysql.com
6d86790711 sql_prepare.cc: 
Post-merge fix (byte -> uchar)
 2007-06-05 23:56:02 +02:00
tsmith@quadxeon.mysql.com
dad35dc1c1 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
 2007-06-05 23:24:05 +02:00
tsmith@quadxeon.mysql.com
0ca0984f59 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
 2007-06-05 23:06:43 +02:00
tsmith@quadxeon.mysql.com
d2fe24d1ef Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
 2007-06-05 23:04:40 +02:00
tsmith@quadxeon.mysql.com
016bff8adc Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
 2007-06-05 22:49:22 +02:00
tsmith@quadxeon.mysql.com
173d07de78 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
 2007-06-05 22:47:14 +02:00
istruewing@chilla.local
83acfa8e87 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-06-05 21:42:05 +02:00
istruewing@chilla.local
a28abc0554 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-06-05 21:40:46 +02:00
istruewing@chilla.local
594c39bc6f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-06-05 19:56:57 +02:00
tsmith@quadxeon.mysql.com
4b93804592 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
 2007-06-05 17:51:30 +02:00
tsmith@quadxeon.mysql.com
502320ef05 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
 2007-06-05 17:28:49 +02:00
svoj@april.(none)
262ea6aafa Merge mysql.com:/home/svoj/devel/mysql/BUG27141/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG27141/mysql-5.1-engines
 2007-06-05 03:43:11 +05:00
svoj@mysql.com/april.(none)
bb437f8205 BUG#27141 - Calling tell(-1) under Windows causes assertion failure in Debug mode 
Original problem was fixed by Magnus (see BUG25807).

Currently only windows debug build causes assertion failure. This patch assures
that my_tell gets correct file descriptor on any platform by DBUG_ASSERT macro.
 2007-06-05 03:16:02 +05:00
iggy@amd64.(none)
9317cd4c2d Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  amd64.(none):/src/bug24400/my41-bug24400
 2007-06-04 13:02:41 -04:00
iggy@amd64.(none)
2e892d30f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  amd64.(none):/src/bug24400/my50-bug24400
 2007-06-04 12:56:15 -04:00
iggy@amd64.(none)
2cdb525f9f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  amd64.(none):/src/bug24400/my51-bug24400
 2007-06-04 12:53:18 -04:00
iggy@amd64.(none)
375dff28cb Merge amd64.(none):/src/bug24400/my50-bug24400 
into  amd64.(none):/src/bug24400/my51-bug24400
 2007-06-04 12:49:19 -04:00
iggy@amd64.(none)
9346e9246a Merge amd64.(none):/src/bug24400/my41-bug24400 
into  amd64.(none):/src/bug24400/my50-bug24400
 2007-06-04 12:47:48 -04:00
igor@olga.mysql.com
76b580b84e Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-06-04 05:57:57 -07:00
igor@olga.mysql.com
d0cb11e6ba Post-merge fix. 2007-06-04 05:55:27 -07:00
igor@olga.mysql.com
a5011de0a8 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt-merge
 2007-06-04 03:16:17 -07:00
igor@olga.mysql.com
31c57a1efc Post-merge fix. 2007-06-04 03:03:15 -07:00
mhansson@dl145s.mysql.com
d9fcc304d9 Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  dl145s.mysql.com:/dev/shm/mhansson/my50-bug27741
 2007-06-04 09:26:54 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
9c67f70f13 after-merge fix. 2007-06-04 11:52:14 +05:00
igor@olga.mysql.com
ca49b83d5a Merge olga.mysql.com:/home/igor/mysql-5.1 
into  olga.mysql.com:/home/igor/mysql-5.1-opt-merge
 2007-06-03 22:52:02 -07:00
ramil/ram@ramil.myoffice.izhnet.ru
9be267cbf2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b28652/b28652.5.0
 2007-06-04 10:37:43 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
a4e6061a4c Merge mysql.com:/home/ram/work/b28652/b28652.5.0 
into  mysql.com:/home/ram/work/b28652/b28652.5.1
 2007-06-04 10:14:28 +05:00
mhansson@dl145s.mysql.com
358567dfab Merge bk-internal:/home/bk/mysql-5.1-opt 
into  dl145s.mysql.com:/dev/shm/mhansson/my51-bug27741-mpush
 2007-06-03 23:31:57 +02:00
evgen@moonbone.local
b642eb121f item_func.h, item_func.cc: 
Post merge fix for the bug#28494.
 2007-06-03 21:52:00 +04:00
igor@olga.mysql.com
44b46b73f2 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
 2007-06-03 07:58:07 -07:00
evgen@moonbone.local
6acad85a95 Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql 
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
 2007-06-03 16:06:55 +04:00
evgen@moonbone.local
27d956b5e9 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
 2007-06-03 16:00:04 +04:00
evgen@moonbone.local
88147d5cfe user_var.result: 
Corrected test case result for the bug#28494.
item_func.h, item_func.cc:
  Corrected function names after fix for the bug#28494.
 2007-06-03 15:56:48 +04:00
evgen@moonbone.local
5d695b777a Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
 2007-06-03 14:46:37 +04:00
evgen@moonbone.local
7dbe9d3318 user_var.result, user_var.test: 
Extended test case for the bug#28494.
 2007-06-03 14:46:09 +04:00