mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
49706 commits 2785 branches 343 tags 1.6 GiB
Commit graph

49706 commits

This branch
This branch
All branches
Author SHA1 Message Date
gshchepa@devsrv-b.mysql.com
ca15f7b190 Many files: 
Merge with 5.0-opt.
 2007-09-14 17:21:50 +02:00
gshchepa@devsrv-b.mysql.com
a9987ffde4 Merge devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt 
into  devsrv-b.mysql.com:/data0/gshchepa/mysql-5.1-opt
 2007-09-14 10:37:42 +02:00
gshchepa@devsrv-b.mysql.com
e6e56ccc01 Merge devsrv-b.mysql.com:/users/gshchepa/mysql-5.0-opt 
into  devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt
 2007-09-14 10:11:51 +02:00
gshchepa/uchum@gleb.loc
72e36e0aa3 Merge gshchepa@bk-internal.mysql.com:/users/gshchepa/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.0-opt-27695
 2007-09-14 13:11:50 +05:00
gshchepa/uchum@gleb.loc
0b7e4b4dde Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-09-14 12:35:06 +05:00
gshchepa/uchum@gleb.loc
aac756e4ff Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-09-14 12:18:48 +05:00
gshchepa/uchum@gleb.loc
7284a865df Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-09-14 12:16:19 +05:00
joerg@trift2.
b0fb8aa374 Merge trift2.:/MySQL/M50/tmp-5.0 
into  trift2.:/MySQL/M51/tmp-5.1
 2007-09-13 23:56:48 +02:00
joerg@trift2.
6a67761bcc Merge trift2.:/MySQL/M51/push-5.1 
into  trift2.:/MySQL/M51/tmp-5.1
 2007-09-13 23:54:22 +02:00
joerg@trift2.
1dc3246fe3 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M50/tmp-5.0
 2007-09-13 23:42:17 +02:00
gshchepa/uchum@gleb.loc
e4eadcfbdd Fixed bug #27695. 
Declaring an all space column name in the SELECT FROM DUAL or in a view
leads to misleading warning message:
"Leading spaces are removed from name ' '".

The Item::set_name method has been modified to raise warnings like
"Name ' ' has become ''" in case of the truncation of an all
space identifier to an empty string identifier instead of the
"Leading spaces are removed from name ' '" warning message.
 2007-09-13 18:41:50 +05:00
gshchepa/uchum@gleb.loc
a9dd53abd6 Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-09-13 15:05:54 +05:00
gshchepa/uchum@gleb.loc
2e7306d503 Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-09-13 11:48:58 +05:00
gshchepa/uchum@gleb.loc
2a3facc3de Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-09-13 11:31:45 +05:00
gshchepa/uchum@gleb.loc
321c172e95 sql_view.cc: 
Post-merge fix.
 2007-09-13 02:09:29 +05:00
gshchepa/uchum@gleb.loc
bd4fd0473c Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-09-13 00:44:50 +05:00
gshchepa/uchum@gleb.loc
ff042427cf Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-09-12 23:41:35 +05:00
sergefp@mysql.com
1ff0caf49d Better wording in comments 2007-09-12 18:13:19 +04:00
gshchepa@bk-internal.mysql.com
ae46c7e54a Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-09-12 11:52:42 +02:00
sergefp@mysql.com
06f12f66e8 Post-merge fixes 2007-09-12 01:52:27 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
474bcd3b00 merging 2007-09-11 20:47:17 +05:00
sergefp@mysql.com
6f702a4b42 Post-merge fixes 2007-09-11 02:41:42 +04:00
sergefp@pylon.mylan
d276ce3402 Merge mysql.com:/home/psergey/mysql-4.1-bug30385 
into  mysql.com:/home/psergey/mysql-5.0-bug30385
 2007-09-11 02:24:08 +04:00
sergefp@mysql.com
da04109de2 BUG#30385: Server crash when deleting with ORDER BY and LIMIT 
in get_index_for_order(), don't walk over the end of the index key parts
when matching index description and needed ordering.
 2007-09-10 16:26:51 +04:00
holyfoot/hf@hfmain.(none)
f57f1d0942 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/28430/my51-28430
 2007-09-10 10:21:55 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
a60f7988b9 Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format. 
In the ha_partition::position() we don't calculate the number
of the partition of the record, but use m_last_part value instead,
relying on that it's previously set by some other call like ::write_row().
Delete_rows_log_event::do_exec_row() calls find_and_fetch_row(),
where we used position() + rnd_pos() call for the InnoDB-based PARTITION-ed
table as there HA_PRIMARY_KEY_REQUIRED_FOR_POSITION enabled.

fixed by introducing new handler::rnd_pos_by_record() method to be
used for random record-based positioning
 2007-09-07 18:41:49 +05:00
malff@omega.weblab
1a13d76941 Test cleanup in rpl_binlog_grant: XID values are unpredictable 2007-09-06 12:06:22 -06:00
gshchepa/uchum@gleb.loc
d61cfb273f Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-09-06 22:42:44 +05:00
gshchepa/uchum@gleb.loc
1926819d5b Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-09-06 22:31:25 +05:00
gshchepa/uchum@gleb.loc
d330a49105 Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-09-06 22:27:13 +05:00
gshchepa/uchum@gleb.loc
28ca0e8943 sql_parse.cc: 
Post-merge fix.
 2007-09-06 21:56:46 +05:00
davi@moksha.local
0187e78f40 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  moksha.local:/Users/davi/mysql/push/mysql-5.1-runtime
 2007-09-06 13:28:00 -03:00
davi@moksha.local
4aaab47ea9 The test case for bug 28587 doesn't work with the embedded version, 
the first query is not running while we are doing wait queries on
a second connection.
 2007-09-06 13:22:34 -03:00
gshchepa/uchum@gleb.loc
adbe17c8a1 sp.result: 
Post-merge fix.
 2007-09-06 20:42:36 +05:00
gshchepa/uchum@gleb.loc
4732821e9d Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-09-06 19:15:31 +05:00
dlenev@mockturtle.local
175c1ab740 Make events.test more robust against timing issues. 2007-09-06 15:57:36 +04:00
malff@omega.weblab
d55b2bd13b Merge omega.weblab:/home/malff/TREE/mysql-5.1-base 
into  omega.weblab:/home/malff/TREE/mysql-5.1-rt-merge
 2007-09-05 14:52:40 -06:00
malff@omega.weblab
0a10782f75 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  omega.weblab:/home/malff/TREE/mysql-5.1-cleanup
 2007-09-05 12:15:24 -06:00
malff@omega.weblab
43e5ab75ca Test events_logs_tests cleanup 
Fixed test failure under heavy load, in case truncate table is slow.
 2007-09-05 12:14:43 -06:00
davi@moksha.local
2e3ded3ec9 The test case for Bug#29936 doesn't work with the embedded version, 
the first query is not running while we are doing wait queries on
a second connection.
 2007-09-05 15:03:02 -03:00
gshchepa/uchum@gleb.loc
582b69686c Merge gleb.loc:/home/uchum/work/bk/5.1-opt-29938 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-09-05 11:43:40 +05:00
gshchepa/uchum@gleb.loc
adfbea368d Fixed bug #29938. 
mysqldump --skip-events --all-databases dumped data of the mysqld.event table,
and during the restoration from this dump events were created in spite
of the --skip-events option.

The mysqldump client has been modified to ignore mysql.event table data
in case of --skip-events options.
 2007-09-05 11:35:29 +05:00
brian@zim.(none)
e235ccd13a Discovered a bug while working with backup. Since it is possible to execute a statement in a pre/post statment clause that can return a result, we need to test for that and free it. 2007-09-04 20:03:12 -07:00
malff/marcsql@weblab.(none)
5cd66ca65f Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
 2007-09-04 16:50:09 -06:00
malff/marcsql@weblab.(none)
f4b671d8bc Fixed whitespace 2007-09-04 16:40:27 -06:00
malff/marcsql@weblab.(none)
3a7bcd72f3 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
 2007-09-04 14:38:26 -06:00
malff/marcsql@weblab.(none)
0f58ed7e74 Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
 2007-09-04 12:25:54 -06:00
thek@adventure.(none)
11c97a2646 Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-09-04 17:46:01 +02:00
thek@adventure.(none)
e480b31794 Merge adventure.(none):/home/thek/Development/cpp/bug21074/my51-bug21074 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-09-04 17:43:29 +02:00
mhansson@dl145s.mysql.com
313453f192 Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  dl145s.mysql.com:/data0/mhansson/my51-bug30234-push
 2007-09-03 16:24:33 +02:00