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

53750 commits

This branch
This branch
All branches
Author SHA1 Message Date
aelkin/andrei@mysql1000.(none)
ba7b1a7e55 Bug #35675 reset master finds assert if a binlog file can not be deleted 
If a binlog file is manually replaced with a namesake directory the internal purging did
not handle the error of deleting the file so that eventually
a post-execution guards fires an assert.

Fixed with reusing a snippet of code for bug@18199 to tolerate lack of the file but no other error 
at an attempt to delete it.
The same applied to the index file deletion.

The cset carries pieces of manual merging.
 2008-03-30 00:54:08 +02:00
aelkin/andrei@mysql1000.(none)
d3d0a00635 Merge mysql1000.(none):/home/andrei/MySQL/MERGE/5.0-main2rpl 
into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl
 2008-03-29 15:00:12 +02:00
aelkin/andrei@mysql1000.(none)
22536fc53e Merge mysql1000.(none):/home/andrei/MySQL/BARE/mysql-5.1 
into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl
 2008-03-29 14:19:53 +02:00
aelkin/andrei@mysql1000.(none)
c4813ae343 Fixing rpl suite disabled.def: rpl_stm_extraColmaster_ndb does not exist in the suite. 2008-03-29 14:01:56 +02:00
aelkin/andrei@mysql1000.(none)
5ef66b37ae wl#4091 
improving a test that shows a failure.

the wait condition was for data in tables but the 
log positions are updates after the data are unlocked.
So there was a time window
[after_table_unlock_for_select, log_pos_updated] where the
orig cond was true but log position might be changed.
the correct one is to expect the last pos of the
slave's insert in the output of show_slave_status on the
master.
 2008-03-28 18:25:49 +02:00
aelkin/andrei@mysql1000.(none)
103f9d688c BUG#33029 
refining a test for embedded env.
 2008-03-28 16:07:50 +02:00
tnurnberg@white.intern.koehntopp.de
963f86f879 Merge mysql.com:/misc/mysql/mysql-5.0-opt 
into  mysql.com:/misc/mysql/mysql-5.1-opt
 2008-03-28 00:46:43 +01:00
tnurnberg@white.intern.koehntopp.de
282825af33 Merge mysql.com:/misc/mysql/mysql-5.0 
into  mysql.com:/misc/mysql/mysql-5.0-opt
 2008-03-27 23:35:56 +01:00
tnurnberg@white.intern.koehntopp.de
a3df2a4cf4 Merge mysql.com:/misc/mysql/mysql-5.1 
into  mysql.com:/misc/mysql/mysql-5.1-opt
 2008-03-27 23:34:12 +01:00
gshchepa/uchum@host.loc
02235ace7b Merge host.loc:/home/uchum/work/5.0-opt 
into  host.loc:/home/uchum/work/5.1-opt
 2008-03-27 20:07:05 +04:00
gshchepa/uchum@host.loc
931582bb58 Merge host.loc:/home/uchum/work/mysql-5.0 
into  host.loc:/home/uchum/work/5.0-opt
 2008-03-27 20:05:51 +04:00
joerg@trift2.
fe0bff70e0 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2008-03-27 13:32:55 +01:00
joerg@trift2.
6d8e1832e0 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2008-03-27 13:28:00 +01:00
joerg@trift2.
dc00a52464 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  trift2.:/MySQL/M50/push-5.0
 2008-03-27 13:21:34 +01:00
joerg@trift2.
2db55bf938 Merge trift2.:/MySQL/M51/ndb-decl-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-03-27 13:20:24 +01:00
gshchepa/uchum@host.loc
5713f9d150 Merge host.loc:/home/uchum/work/5.0-opt 
into  host.loc:/home/uchum/work/5.1-opt
 2008-03-27 16:07:01 +04:00
df@pippilotta.erinye.com
334e647e3a Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2008-03-27 13:04:16 +01:00
df@pippilotta.erinye.com
7297fe1950 BUG#25340 2008-03-27 13:02:59 +01:00
gshchepa/uchum@host.loc
faf4737bce Merge host.loc:/home/uchum/work/4.1-opt 
into  host.loc:/home/uchum/work/5.0-opt
 2008-03-27 16:00:26 +04:00
gshchepa/uchum@host.loc
810059404e Merge host.loc:/home/uchum/work/mysql-5.1 
into  host.loc:/home/uchum/work/5.1-opt
 2008-03-27 15:54:45 +04:00
joerg@trift2.
e2b2520450 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2008-03-27 12:53:58 +01:00
gshchepa/uchum@host.loc
7edeebc9ab Merge host.loc:/home/uchum/work/mysql-5.0 
into  host.loc:/home/uchum/work/5.0-opt
 2008-03-27 15:52:55 +04:00
joerg@trift2.
e7e5311ce4 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-03-27 12:45:16 +01:00
joerg@trift2.
270aaa17b2 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2008-03-27 12:38:21 +01:00
tsmith@rhel5-ia64-a.mysql.com
c7cd786ef8 Merge rhel5-ia64-a.mysql.com:/data0/tsmith/build/50 
into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
 2008-03-27 08:59:47 +01:00
tsmith@rhel5-ia64-a.mysql.com
95c8fb8db2 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/50
 2008-03-27 08:50:54 +01:00
tsmith@rhel5-ia64-a.mysql.com
2ff69e74a4 Merge rhel5-ia64-a.mysql.com:/data0/tsmith/51 
into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
 2008-03-27 08:41:25 +01:00
tsmith@rhel5-ia64-a.mysql.com
3069db1da7 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
 2008-03-27 08:20:25 +01:00
hezx@mail.hezx.com
35c158ec85 post fix after push of bug#33029 2008-03-27 13:48:04 +08:00
hezx@mail.hezx.com
68fc98bdb3 post fix after push of BUG#33029 2008-03-27 13:42:34 +08:00
tsmith@rhel5-ia64-a.mysql.com
c82d7ecfee Apply innodb-5.1-ss2360 snapshot 
Fixes:
- Bug #34920: auto_increment resets to 1 on foreign key creation
  We need to use/inherit the passed in autoinc counter for ALTER TABLE
  statements too.
 2008-03-27 02:40:45 +01:00
gshchepa/uchum@host.loc
60f750b9ed view.result: 
Post-merge fix (bug #35193).
 2008-03-27 00:55:13 +04:00
gshchepa/uchum@host.loc
57afe19c8b Merge host.loc:/home/uchum/work/5.0-opt 
into  host.loc:/home/uchum/work/5.1-opt
 2008-03-27 00:51:29 +04:00
gshchepa/uchum@host.loc
792074bff0 Merge host.loc:/home/uchum/work/5.0-opt-35193 
into  host.loc:/home/uchum/work/5.0-opt
 2008-03-27 00:44:13 +04:00
istruewing@stella.local
ac130084c4 Post-merge fix. 
Query cache does now work with concurrent_insert=0. See
Bug 33756 - query cache with concurrent_insert=0 appears broken
 2008-03-26 20:27:23 +01:00
gshchepa/uchum@host.loc
2dcec449e0 Fixed bug #35193. 
View definition as SELECT ... FROM DUAL WHERE ... has
valid syntax, but use of such view in SELECT or
SHOW CREATE VIEW syntax causes unexpected syntax error.

Server omits FROM DUAL clause when storing view body
string in a .frm file for further evaluation.
However, syntax of SELECT-witout-FROM query is more
restrictive than SELECT FROM DUAL syntax, and doesn't
allow the WHERE clause.

NOTE: this syntax difference is not documented.


View registration procedure has been modified to
preserve original structure of view's body.
 2008-03-26 22:43:12 +04:00
cmiller@zippy.cornsilk.net
75da480f85 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
 2008-03-26 14:30:26 -04:00
cmiller@zippy.cornsilk.net
3af3e6963b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-03-26 14:24:10 -04:00
cmiller@zippy.cornsilk.net
cfb9c8458e Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-03-26 12:39:22 -04:00
istruewing@stella.local
dd8a821e1d Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-03-26 17:37:04 +01:00
istruewing@stella.local
1ce57e889d Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-03-26 17:36:12 +01:00
istruewing@stella.local
830096fe16 Merge stella.local:/home2/mydev/mysql-5.0-amain 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2008-03-26 16:48:46 +01:00
istruewing@stella.local
9f3784d23b Post-merge fix 2008-03-26 16:22:10 +01:00
hezx@mail.hezx.com
905659a2a0 Merge mail.hezx.com:/media/sda3/work/mysql/bkroot/mysql-5.1-new-rpl 
into  mail.hezx.com:/media/sda3/work/mysql/bkwork/b33029_5.0_to_5.1_fails_on_dup_key/5.1
 2008-03-26 21:40:44 +08:00
hezx@mail.hezx.com
d0ebb657ee Merge mail.hezx.com:/media/sda3/work/mysql/bkroot/mysql-5.0-rpl 
into  mail.hezx.com:/media/sda3/work/mysql/bkwork/b33029_5.0_to_5.1_fails_on_dup_key/5.0
 2008-03-26 21:37:34 +08:00
anozdrin/alik@quad.opbmk
abfb0e4a7d Dummy change to force PushBuild. 2008-03-26 13:15:03 +03:00
anozdrin/alik@quad.opbmk
d03c0a5659 Dummy change to force PushBuild. 2008-03-26 13:14:30 +03:00
istruewing@stella.local
c882b87110 Merge stella.local:/home2/mydev/mysql-5.1-ateam 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-03-26 10:56:03 +01:00
istruewing@stella.local
0eff6e7be5 Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-03-26 10:51:16 +01:00
istruewing@stella.local
44fbe74e1e Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-03-26 10:27:00 +01:00