mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 15:54:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
45846 commits 2774 branches 343 tags 1.6 GiB
Commit graph

13908 commits

Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
3261e57049 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-26 21:33:07 +02:00
tomas@whalegate.ndb.mysql.com
cfbb8672ab correction of result file 2007-04-26 21:32:02 +02:00
tomas@whalegate.ndb.mysql.com
0326179d10 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-26 13:50:04 +02:00
tomas@whalegate.ndb.mysql.com
8dd90e8817 WL#1190 preparatory work needed for compatability with future online add column 2007-04-26 13:36:51 +02:00
iggy@recycle.(none)
08ea692a7f - Resolved conflict between fixes for bugs 25141 and 26074. 
- Use the 25141 fix.
- 26074 is duplicate, as 25141 has more comprehensive test
 2007-04-24 16:07:52 -04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
244c192347 after-merge fix 2007-04-24 13:53:12 +05:00
jonas@perch.ndb.mysql.com
da8931cb98 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-04-24 09:53:32 +02:00
iggy@recycle.(none)
e251139c80 Merge recycle.(none):/src/mysql-5.1-maint 
into  recycle.(none):/src/mysql-5.1-maint_25141
 2007-04-23 17:04:24 -04:00
iggy@recycle.(none)
2a54abd582 Bug#25141 Crash Server on Partitioning command 
- The function build_table_filename() builds up a string unconditionally 
using the forward slash as a path separator. Later, when the string is 
searched for FN_LIBCHAR by the set_up_table_before_create() function, a 
null pointer is returned that is finally used by strlen in the 
append_file_to_dir() function which causes the crash.
 2007-04-23 13:50:34 -04:00
msvensson@pilot.blaudden
2ac94c30f4 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-23 17:01:02 +02:00
msvensson@pilot.blaudden
b941ef8633 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-23 13:28:09 +02:00
msvensson@pilot.blaudden
b11a1c8fd4 Update test to work also when --pager does not exist in "mysql" 2007-04-23 12:58:35 +02:00
msvensson@pilot.blaudden
d1de41c59a Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-23 12:05:00 +02:00
msvensson@pilot.blaudden
a23eeb620c Remove left over file fix_priv_tabs.result 2007-04-23 11:41:55 +02:00
mjorgensen@blade09.mysql.com
7855ae51f0 Merge bk-internal:/home/bk/mysql-5.1 
into  blade09.mysql.com:/tmp/mmj/mysql-5.1-runtime
 2007-04-21 18:35:01 +02:00
ibabaev@bk-internal.mysql.com
c22d6fbb2b Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-04-21 03:51:51 +02:00
igor@olga.mysql.com
8c85357ea3 Post-merge fix. 2007-04-20 17:47:14 -07:00
malff/marcsql@weblab.(none)
c574d95a5c manual merge 2007-04-20 17:49:07 -06:00
malff/marcsql@weblab.(none)
2d6d8e2abe Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
 2007-04-20 15:31:41 -06:00
evgen@moonbone.local
4434ff13a9 Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
 2007-04-21 00:33:56 +04:00
mats@romeo.(none)
ae9744f266 Adding missing result file for rpl_critical_errors. 2007-04-20 14:03:15 +02:00
gshchepa/uchum@gshchepa.loc
6c5d17ef56 Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt 
into  gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt-27704
 2007-04-20 16:44:50 +05:00
gshchepa/uchum@gshchepa.loc
4fcf1316bb Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-4.1-opt-27704 
into  gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt-27704
 2007-04-20 15:31:33 +05:00
gshchepa/uchum@gshchepa.loc
f5a229b3d1 Bug#27704: incorrect comparison of rows with NULL components 
Support for NULL components was incomplete for row comparison,
fixed.  Added support for abort_on_null at compare_row() like
in 5.x
 2007-04-20 15:14:09 +05:00
gkodinov/kgeorge@magare.gmz
bcde01f6ff Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B27786-5.0-opt
 2007-04-20 12:01:54 +03:00
mhansson@dl145s.mysql.com
f0fc4b88e0 Bug #24778: Innodb: No result when using ORDER BY 
This bug was intruduced by the fix for bug#17212 (in 4.1). It is not 
ok to call test_if_skip_sort_order since this function will 
alter the execution plan. By contract it is not ok to call 
test_if_skip_sort_order in this context.

This bug appears only in the case when the optimizer has chosen 
an index for accessing a particular table but finds a covering 
index that enables it to skip ORDER BY. This happens in 
test_if_skip_sort_order.
 2007-04-20 11:01:53 +02:00
mats@romeo.(none)
6d0fb7cbfb Merge romeo.(none):/home/bk/merge-mysql-5.0 
into  romeo.(none):/home/bk/merge-mysql-5.1
 2007-04-20 10:55:50 +02:00
mats@romeo.(none)
875de0e571 Merge romeo.(none):/home/bkroot/mysql-5.1-rpl 
into  romeo.(none):/home/bk/merge-mysql-5.1
 2007-04-20 10:46:58 +02:00
tomas@whalegate.ndb.mysql.com
742a4d50e9 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-04-20 10:46:34 +02:00
mats@romeo.(none)
f1caa9559c Merge romeo.(none):/home/bkroot/mysql-5.0-rpl 
into  romeo.(none):/home/bk/merge-mysql-5.0
 2007-04-20 10:35:27 +02:00
mats@romeo.(none)
bb73858835 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  romeo.(none):/home/bkroot/mysql-5.0-rpl
 2007-04-20 10:28:44 +02:00
gkodinov/kgeorge@magare.gmz
4c89a5960f Bug #27786: 
When merging views into the enclosing statement
the ORDER BY clause of the view is merged to the
parent's ORDER BY clause.
However when the VIEW is merged into an UNION
branch the ORDER BY should be ignored. 
Use of ORDER BY for individual SELECT statements
implies nothing about the order in which the rows
appear in the final result because UNION by default
produces unordered set of rows.
Fixed by ignoring the ORDER BY clause from the merge
view when expanded in an UNION branch.
 2007-04-20 10:49:45 +03:00
msvensson@pilot.blaudden
344758cc1e Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-20 07:21:54 +02:00
tsmith@quadxeon.mysql.com
8e74a1d736 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-04-20 00:21:57 +02:00
tsmith@quadxeon.mysql.com
2272cad3f4 innodb_mysql.test, innodb_mysql.result: 
Fix test case: add drop table
 2007-04-20 00:20:57 +02:00
tsmith@quadxeon.mysql.com
4702afda85 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-04-19 22:53:19 +02:00
tsmith@quadxeon.mysql.com
be9c660729 innodb_mysql.test, innodb_mysql.result: 
Add test case for Bug #27210: INNODB ON DUPLICATE KEY UPDATE
 2007-04-19 22:38:12 +02:00
msvensson@pilot.blaudden
b9d7122376 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-19 21:35:26 +02:00
msvensson@pilot.blaudden
498c152b11 Add replace for varying errno 2007-04-19 21:35:10 +02:00
msvensson@pilot.blaudden
9c775302de Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-19 21:31:17 +02:00
msvensson@pilot.blaudden
da93a36a0e mysql_upgrade portability fixes 2007-04-19 21:30:46 +02:00
tsmith@quadxeon.mysql.com
c1e156b1cd Post-merge fix of innodb.result 2007-04-19 21:18:49 +02:00
gkodinov/kgeorge@magare.gmz
83fff26261 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B27530-5.0-opt
 2007-04-19 15:07:03 +03:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
f2b227dc52 Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b26851/b26851.5.0
 2007-04-19 15:02:36 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
c4ee4e65df Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b26851/b26851.5.1
 2007-04-19 14:56:04 +05:00
marty@linux.site
607838a126 Bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb, Bug #25296 Truncate table converts NDB disk based tables to in-memory tables: Added more checks in tests 2007-04-19 10:48:24 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
bc1805891c Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b22824/my50-b22824
 2007-04-19 12:32:38 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
df75e6e50e Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b26851/b26851.5.0
 2007-04-19 11:45:26 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
3a0042c757 Merge mysql.com:/home/ram/work/b26851/b26851.5.0 
into  mysql.com:/home/ram/work/b26851/b26851.5.1
 2007-04-19 11:07:19 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
570aacac45 Merge mysql.com:/home/ram/work/b22824/my50-b22824 
into  mysql.com:/home/ram/work/b22824/my51-b22824
 2007-04-19 10:42:47 +05:00