1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-21 06:21:35 +03:00
Commit Graph

13837 Commits

Author SHA1 Message Date
gkodinov/kgeorge@rakia.(none)
8618353374 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rakia.(none):/home/kgeorge/mysql/autopush/B21540-5.0-opt
2006-09-20 12:03:56 +03:00
gkodinov/kgeorge@rakia.(none)
8577d7913e fixed merge 2006-09-20 12:02:58 +03:00
svoj@mysql.com/april.(none)
c0ebc0fb2a BUG#10974 - No error message if merge table based on union of innodb, memory
Fixed confusing error message from the storage engine when
it fails to open underlying table. The error message is issued
when a table is _opened_ (not when it is created).
2006-09-20 01:40:59 +05:00
igor@rurik.mysql.com
0279c91d99 Post-merge corrections. 2006-09-19 12:18:24 -07:00
msvensson@shellback.(none)
21892f4161 Merge bk-internal:/home/bk/mysql-5.0-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-19 20:06:18 +02:00
msvensson@shellback.(none)
9cb40c6e91 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-19 20:00:01 +02:00
msvensson@shellback.(none)
5a912955d5 Increase suite timeout even more - 6 times - when running with valgrind 2006-09-19 19:41:41 +02:00
msvensson@shellback.(none)
d3d7c74954 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-19 19:11:41 +02:00
igor@rurik.mysql.com
25368c359e Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-09-19 10:09:02 -07:00
msvensson@shellback.(none)
883a3809c9 Pass --debug arguments to mysqld also when bootstrapping if --debug is tunrned on 2006-09-19 18:39:04 +02:00
gkodinov/kgeorge@rakia.(none)
2da037c7d5 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rakia.(none):/home/kgeorge/mysql/autopush/B21540-5.0-opt
2006-09-19 19:18:52 +03:00
igor@rurik.mysql.com
294c0ccaa9 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into  rurik.mysql.com:/home/igor/mysql-4.1-opt
2006-09-19 08:42:58 -07:00
msvensson@shellback.(none)
1515818276 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-19 17:40:49 +02:00
msvensson@shellback.(none)
895d986266 Don't bother to remove the pid_file in mtr_kill_leftovers as it could potentially remove a the pidfile before the process is killed.
The pid file will be removed later when var/ directory is recreated.
2006-09-19 16:48:01 +02:00
msvensson@shellback.(none)
fa26e83fd2 Fix warnings in mysql-test-run.pl 2006-09-19 16:43:42 +02:00
thek@kpdesk.mysql.com
f8dbb2dd3b Merge kpdesk.mysql.com:/home/thek/dev2/bug21139/my50-bug21139
into  kpdesk.mysql.com:/home/thek/dev2/mysql-5.0-maint
2006-09-19 12:45:04 +02:00
thek@kpdesk.mysql.com
59671a1b16 Merge kpdesk.mysql.com:/home/thek/dev2/bug21139/my41-bug21139
into  kpdesk.mysql.com:/home/thek/dev2/mysql-4.1-maint
2006-09-19 12:44:09 +02:00
thek@kpdesk.mysql.com
b4908ed35d Merge kpdesk.mysql.com:/home/thek/dev2/bug21139/my41-bug21139
into  kpdesk.mysql.com:/home/thek/dev2/bug21139/my50-bug21139
2006-09-19 12:41:15 +02:00
thek@kpdesk.mysql.com
66fa757e1f Bug#21139 Handling of database differs in "embedded" , test lowercase_fs_off fails
- Access checks are omitted when compliled without --with-embedded-privilege-control
- Patch: skip this test
2006-09-19 12:40:31 +02:00
msvensson@shellback.(none)
781aaaba66 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-18 17:47:26 +02:00
msvensson@shellback.(none)
dafb50055f Add character-sets-dir argument to "mysql". That avoids a local
installed charset dir being used.
2006-09-18 17:46:36 +02:00
svoj@may.pils.ru
43097593e3 Merge may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1
into  may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1-engines
2006-09-18 20:35:33 +05:00
gkodinov@dl145s.mysql.com
cf9d1c9152 Merge bk-internal:/home/bk/mysql-5.0
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 19:01:07 +04:00
rburnett@bk-internal.mysql.com
98d4ea5b7a Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-09-18 15:38:34 +02:00
svoj@april.(none)
f21eadfc74 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-09-18 16:23:45 +05:00
gkodinov@dl145s.mysql.com
2ec485f06e Merge bk-internal:/home/bk/mysql-5.0-opt
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 12:20:20 +02:00
gkodinov@dl145s.mysql.com
fae596aafd merge fixes 2006-09-18 12:14:27 +02:00
gkodinov@dl145s.mysql.com
522823b5d3 Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 11:19:40 +02:00
aivanov/alexi@mysql.com/mysqld.localdomain
e2d15b16d2 BUG#19419: VIEW: View that the column name is different
by master and slave is made.
2006-09-18 03:21:00 +04:00
igor@rurik.mysql.com
dd3b8e4f9a Fixed bug #22085: Crash on the execution of a prepared
statement that uses an aggregating IN subquery with 
HAVING clause.
A wrong order of the call of split_sum_func2 for the HAVING
clause of the subquery and the transformation for the 
subquery resulted in the creation of a andor structure
that could not be restored at an execution of the prepared
statement.
2006-09-16 11:50:00 -07:00
igor@rurik.mysql.com
d3d3cef88c Fixed bug #21493: crash for the second execution of a function
containing a select statement that uses an aggregating IN subquery.
Added a parameter to the function fix_prepare_information 
to restore correctly the having clause for the second execution.
Saved andor structure of the having conditions at the proper moment
before any calls of split_sum_func2 that could modify the having structure
adding new Item_ref objects. (These additions, are produced not with 
the statement mem_root, but rather with the execution mem_root.)
2006-09-16 09:50:48 -07:00
gkodinov/kgeorge@macbook.gmz
c73d2318a3 Merge bk-internal:/home/bk/mysql-4.1-opt
into  macbook.gmz:/Users/kgeorge/mysql/work/B21180-4.1-opt
2006-09-15 18:56:05 +03:00
cmiller@zippy.cornsilk.net
47483245b9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-15 09:00:46 -04:00
msvensson@shellback.(none)
bdc7837388 Merge msvensson.mysql.internal:mysql/mysql-5.0-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 14:34:50 +02:00
gkodinov@dl145s.mysql.com
a9b3bd0eec Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-15 14:14:38 +02:00
gkodinov@dl145s.mysql.com
b1e087a717 Merge dl145s.mysql.com:/data/bk/team_tree_merge/CLEAN/mysql-5.0
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-15 11:52:49 +02:00
gkodinov@dl145s.mysql.com
148cb4e98a Merge dl145s.mysql.com:/data/bk/team_tree_merge/CLEAN/mysql-5.0
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-15 11:47:23 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
dd410b3f77 Merge fixes, added printout to result file 2006-09-15 03:02:01 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
2840596e10 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-15 01:26:28 +02:00
iggy@rolltop.ignatz42.dyndns.org
02833f49c3 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my50-bug21424
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-09-14 16:37:22 -04:00
iggy@rolltop.ignatz42.dyndns.org
4fa6c8c776 Bug#21424 mysqldump failing to export/import views.
Dumps are created for the tables in each specified database then for the views in each specified database. This bug occurs when any database's views depend on the mysql database's table data while being restored. 
Added command line option --flush-privileges to the mysqldump utility which causes a FLUSH PRIVILIGES statement to be written to the dump after the mysql database.
2006-09-14 14:56:14 -04:00
evgen@moonbone.local
5841147d4d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into  moonbone.local:/work/21677-bug-4.1-opt-mysql
2006-09-14 18:46:44 +04:00
evgen@moonbone.local
a33d1d8484 type_date.test, type_date.result:
Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN
2006-09-14 18:45:23 +04:00
cmiller@zippy.cornsilk.net
ebf4d199df Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my50-bug21618
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-14 09:21:09 -04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
c2fa031b99 Merge mysql.com:/usr/home/bar/mysql-4.1.b20471v2
into  mysql.com:/usr/home/bar/mysql-4.1-kt
2006-09-14 15:13:53 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
6daf8b4e18 Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1-kt
2006-09-14 15:12:06 +05:00
msvensson@neptunus.(none)
fd15a84c55 Merge neptunus.(none):/home/msvensson/mysql/my50-netware-mtr
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-14 11:01:23 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
474779937b Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b20471v2
2006-09-14 09:12:47 +05:00
rburnett@bk-internal.mysql.com
7a1798b128 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-09-14 00:05:46 +02:00
hartmut@mysql.com/linux.site
d214ec09d1 Fixed host name comparison (still Bug #17582) 2006-09-13 23:19:18 +02:00