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
44093 commits 2784 branches 343 tags 1.6 GiB
Commit graph

44093 commits

This branch
This branch
All branches
Author SHA1 Message Date
holyfoot/hf@mysql.com/hfmain.(none)
60e0dceae8 Merge mysql.com:/home/hf/work/mrg/mysql-4.1-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
 2007-03-09 13:39:03 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
4ab2b8d782 aftermerge fix 2007-03-09 13:38:40 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
4752db40e8 aftermerge fix 2007-03-09 13:37:06 +04:00
xxx/istruewing@blade08.mysql.com
0ba036f783 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  blade08.mysql.com:/data0/istruewing/autopush/mysql-5.1-bug25673
 2007-03-09 10:08:39 +01:00
tomas@poseidon.mysql.com
97683c4a98 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean 
into  poseidon.mysql.com:/home/tomas/mysql-5.0
 2007-03-09 15:50:21 +07:00
holyfoot/hf@hfmain.(none)
cae7bc8c96 Merge mysql.com:/home/hf/work/mysql-5.1 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-09 12:47:59 +04:00
tomas@poseidon.mysql.com
56442970a0 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean
 2007-03-09 15:38:44 +07:00
tomas@poseidon.mysql.com
b8fda36478 Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes 
- correction of part 1
    add ndb_waiter option to wait for single user mode
 2007-03-09 15:37:10 +07:00
tomas@poseidon.mysql.com
451a8b7772 BUG#25743 If undo_buffer_size (for LG) greater than the inital shared memory (default 20M), ndbd nodes are crashed 2007-03-09 10:21:11 +07:00
istruewing@chilla.local
651b7b7fc1 Merge chilla.local:/home/mydev/mysql-5.0-bug25673 
into  chilla.local:/home/mydev/mysql-5.1-bug25673
 2007-03-08 21:29:19 +01:00
tsmith@quadxeon.mysql.com
965ca42544 rpl_ssl.result, rpl_ssl.test: 
Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format
 2007-03-08 19:57:35 +01:00
istruewing@chilla.local
c029dbecf7 Merge chilla.local:/home/mydev/mysql-4.1-bug25673 
into  chilla.local:/home/mydev/mysql-5.0-bug25673
 2007-03-08 19:23:36 +01:00
istruewing@chilla.local
90f23116e2 Bug#25673 - spatial index corruption, error 126 incorrect key file for table 
After backport fix.
Added forgotten DBUG_RETURNs, which was detected in 5.1 only.
 2007-03-08 19:22:43 +01:00
holyfoot/hf@hfmain.(none)
cdcf3ec097 Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-08 22:04:17 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
11dd0fa326 Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
 2007-03-08 21:42:41 +04:00
tsmith@bk-internal.mysql.com
8539d9a7bd The most recent push into mysql-5.1 from mysql-5.2 was a mistake. 
This just reverses those changes.  I'm really sorry about that.

configure.in, version.c:
  Reverse last push (from mysql-5.2 into mysql-5.1)
 2007-03-08 18:38:17 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
618ccf376f Merge bk@192.168.21.1:mysql-4.1 
into  mysql.com:/home/hf/work/mrg/mysql-4.1-opt
 2007-03-08 21:14:31 +04:00
df@pippilotta.erinye.com
1052f8702b 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
 2007-03-08 18:13:06 +01:00
df@pippilotta.erinye.com
7665f50e9c add comment to compiler_warnings.supp 2007-03-08 18:12:16 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
48d3e2c1bb merging 2007-03-08 20:57:12 +04:00
tsmith@bk-internal.mysql.com
bb273143fc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.2
 2007-03-08 17:55:20 +01:00
evgen@moonbone.local
35e5925673 sql_select.cc: 
Postfix for bug#22331.
 2007-03-08 19:38:21 +03:00
msvensson@pilot.blaudden
4374a47090 Update result for 5.1 2007-03-08 16:47:18 +01:00
holyfoot/hf@hfmain.(none)
75be7cd1ae Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-08 19:08:28 +04:00
msvensson@pilot.blaudden
193c3178bc Merge bk-internal:/home/bk/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-03-08 15:10:24 +01:00
msvensson@pilot.blaudden
dd16b217c7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-08 14:56:08 +01:00
msvensson@pilot.blaudden
433d3e6cf7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-08 14:55:39 +01:00
msvensson@pilot.blaudden
73b5b2aed7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-08 14:48:11 +01:00
msvensson@pilot.blaudden
8a8c69f3fd Fix 6 warnings from win64, where one is a potential bug. 2007-03-08 14:29:29 +01:00
msvensson@pilot.blaudden
2739246719 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-08 13:31:37 +01:00
msvensson@pilot.blaudden
49d862230e Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-08 13:30:04 +01:00
istruewing@chilla.local
a44009fe75 Merge chilla.local:/home/mydev/mysql-5.0-bug25673 
into  chilla.local:/home/mydev/mysql-5.1-bug25673
 2007-03-08 12:13:54 +01:00
istruewing@chilla.local
f1bbbcce22 Bug#25673 - spatial index corruption, error 126 incorrect key file for table 
After merge fix
 2007-03-08 12:08:59 +01:00
istruewing@chilla.local
760714758e Merge chilla.local:/home/mydev/mysql-4.1-bug25673 
into  chilla.local:/home/mydev/mysql-5.0-bug25673
 2007-03-08 10:10:17 +01:00
istruewing@chilla.local
2d6ad76abd Bug#25673 - spatial index corruption, error 126 
incorrect key file for table

In certain cases it could happen that deleting a row could
corrupt an RTREE index.

According to Guttman's algorithm, page underflow is handled
by storing the page in a list for later re-insertion. The
keys from the stored pages have to be inserted into the
remaining pages of the same level of the tree. Hence the
level number is stored in the re-insertion list together
with the page.

In the MySQL RTree implementation the level counts from zero
at the root page, increasing numbers for levels down the tree.

If during re-insertion of the keys the tree height grows, all
level numbers become invalid. The remaining keys will be
inserted at the wrong level.

The fix is to increment the level numbers stored in the
reinsert list after a split of the root block during reinsertion.
 2007-03-08 09:54:37 +01:00
tsmith@quadxeon.mysql.com
0303429257 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-08 08:17:12 +01:00
tsmith@quadxeon.mysql.com
fee7ab58c6 comp_err.c: return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning 2007-03-08 08:15:30 +01:00
tsmith@quadxeon.mysql.com
ec87168115 Fix bad merge of mysql_upgrade.c; return to version 1.27 of the file, as after fix for bug 25074 2007-03-08 07:55:03 +01:00
tulin/mysqldev@production.mysql.com
8a065c02b4 Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-maint 
into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-new-maint
 2007-03-08 04:33:11 +01:00
tulin/mysqldev@mysql.com/production.mysql.com
ecd1dd17f2 Merge bk-internal:/home/bk/mysql-5.1-new-ndb 
into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-new-maint
 2007-03-08 04:27:41 +01:00
tulin/mysqldev@mysql.com/production.mysql.com
34c3cd810e Merge bk-internal:/home/bk/mysql-5.0-ndb 
into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-maint
 2007-03-08 04:23:19 +01:00
tsmith@quadxeon.mysql.com
55aea4015d Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/51
 2007-03-08 03:23:22 +01:00
tsmith@quadxeon.mysql.com
82c403e608 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/51
 2007-03-08 03:20:16 +01:00
tsmith@quadxeon.mysql.com
a4ca7e7c01 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/51
 2007-03-08 03:18:14 +01:00
tomas@poseidon.mysql.com
8370b2c5e0 Merge poseidon.mysql.com:/home/tomas/mysql-5.1 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-08 08:39:49 +07:00
tomas@poseidon.mysql.com
948ed82a2c Merge poseidon.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-08 08:33:38 +07:00
tsmith@quadxeon.mysql.com
faecfb44a4 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
 2007-03-08 02:22:50 +01:00
tsmith@quadxeon.mysql.com
ae94192129 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/misc/51-fedfix 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage1/51
 2007-03-08 02:10:25 +01:00
tsmith@quadxeon.mysql.com
809f9f006f Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage1/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage1/51
 2007-03-08 02:05:11 +01:00
tsmith@quadxeon.mysql.com
0cd9897eeb Bug #26940: CREATE SERVER does not initialize record[0] in insert_server_record() 
sql_servers.cc:insert_server_record():  initialize record[0] before inserting row
 2007-03-08 02:00:21 +01:00