mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
25924 commits 2790 branches 343 tags 1.7 GiB
Commit graph

25924 commits

This branch
This branch
All branches
Author SHA1 Message Date
osku@127.(none)
e912dabd68 Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  127.(none):/home/osku/mysql-5.0
 2005-08-30 12:39:49 +03:00
osku@127.(none)
0848d8c366 Bug #11946: Review fixes. 2005-08-30 12:39:20 +03:00
ramil@mysql.com
d9658e9e3c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b9613
 2005-08-30 14:23:06 +05:00
ingo@mysql.com
941f458e56 Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-08-30 11:09:51 +02:00
timour@mysql.com
32907c421e Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-12672
 2005-08-30 11:52:27 +03:00
ingo@mysql.com
2e5d241b62 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-08-30 10:52:11 +02:00
msvensson@neptunus.(none)
8c125455b2 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug12527/my50-bug12527
 2005-08-30 10:46:07 +02:00
msvensson@neptunus.(none)
002eb51748 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/bug12527/my41-bug12527
 2005-08-30 10:42:41 +02:00
msvensson@neptunus.(none)
bb54b30524 Merge neptunus.(none):/home/msvensson/mysql/bug12527/my41-bug12527 
into  neptunus.(none):/home/msvensson/mysql/bug12527/my50-bug12527
 2005-08-30 10:40:50 +02:00
osku@127.(none)
312b161409 Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  127.(none):/home/osku/mysql-5.0
 2005-08-30 10:42:51 +03:00
ramil@mysql.com
00e066e201 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b9613
 2005-08-30 12:33:58 +05:00
jonas@eel.(none)
f1ac96544f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.0-push
 2005-08-30 09:02:04 +02:00
jonas@eel.(none)
280f1849ca Merge eel.(none):/home/jonas/src/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.0-push
 2005-08-30 09:00:23 +02:00
jonas@eel.(none)
d61780999b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-08-30 08:59:17 +02:00
jonas@eel.(none)
6461071c12 Merge eel.(none):/home/jonas/src/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-5.0
 2005-08-30 08:58:41 +02:00
jonas@eel.(none)
91086d663c Merge eel.(none):/home/jonas/src/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-08-30 08:57:30 +02:00
jonas@eel.(none)
4cc90aaab8 bug#12862 - ndb compile error 
fix typo
 2005-08-30 08:56:46 +02:00
ingo@mysql.com
9b11c9a822 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-08-30 08:18:27 +02:00
ingo@mysql.com
3683432917 Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-08-30 08:17:44 +02:00
brian@zim.(none)
333a5662fd Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2005-08-29 18:03:56 -07:00
pgalbraith@mysql.com
162353250e ha_blackhole.cc: 
Found one more missing DBUG_ENTER. compile-pentium-debug-max does not enable blackhole on 4.1!
 2005-08-30 02:46:03 +02:00
brian@zim.(none)
ab126a8130 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zim.(none):/home/brian/mysql/mysql-4.1
 2005-08-29 17:41:09 -07:00
sergefp@mysql.com
5d336fbbe1 Fix for BUG#12720: In QUICK_RANGE_SELECT::reset(), reset in_range so next get_next() call 
doesn't continue reading the last range.
 2005-08-30 03:14:39 +04:00
brian@zim.(none)
b4208c569a Update for delete_all_rows() which will be used for TRUNCATE and DELETE support. 2005-08-29 15:26:05 -07:00
brian@zim.(none)
4e9931752e Added support for delete_all_rows() for archive. This fixes bug #12836. 2005-08-29 15:05:16 -07:00
jimw@mysql.com
4c5faed094 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-29 14:41:00 -07:00
andrey@lmy004.
f479c3a48f Merge lmy004.:/work/mysql-5.0-clean into lmy004.:/work/mysql-5.0-ready5 2005-08-29 22:28:01 +02:00
andrey@lmy004.
251271f11b Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-clean
 2005-08-29 21:34:42 +02:00
konstantin@mysql.com
2c9db925fa Remove a no longer used header. 2005-08-29 23:32:47 +04:00
konstantin@mysql.com
344144ad14 Cleanup the instance manager code. 2005-08-29 23:29:35 +04:00
pgalbraith@mysql.com
9f45c8f2fe ha_blackhole.cc: 
Added missing DBUG enter, compiled and tested on production with debug-max
  build (my regular build missed the previous errors friday)

Changeset:
 Added missing DBUG_ENTER, compiled and tested on production with debug-max
 build!
 2005-08-29 21:22:06 +02:00
jimw@mysql.com
f8b4fddcca Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-29 12:18:55 -07:00
ingo@mysql.com
4b0ac126cd Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-08-29 21:11:05 +02:00
ingo@mysql.com
ae7e8b1de6 Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-08-29 21:10:25 +02:00
ingo@mysql.com
b2b93f0abc After merge fix. 2005-08-29 21:06:45 +02:00
andrey@lmy004.
1668c45d30 fix for bug 12207 (alter table discard tablespace on MyISAM table 
causes ERROR 2013).
(all-in-one approved patch)
 2005-08-29 21:00:43 +02:00
jimw@mysql.com
ef79a04439 Merge mysql.com:/home/jimw/my/mysql-5.0-12705 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-29 11:54:23 -07:00
anozdrin@mysql.com
d30534c953 Implement WL#2789 "Instance Manager: test using mysql-test-run testing framework" 2005-08-29 22:28:42 +04:00
bar@mysql.com
2f8a3bf747 Merge mysql.com:/usr/home/bar/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-08-29 22:17:13 +05:00
jimw@mysql.com
25adba36b1 Merge mysql.com:/home/jimw/my/mysql-5.0-11523 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-29 10:02:23 -07:00
ingo@mysql.com
4368e9957d After merge fix. 2005-08-29 18:41:39 +02:00
joerg@mysql.com
bd17f3e6f1 Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0 2005-08-29 18:32:42 +02:00
paul@frost.snake.net
6b265793c3 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
 2005-08-29 11:25:12 -05:00
tomas@poseidon.ndb.mysql.com
dba2e0074b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-08-29 18:25:11 +02:00
tomas@poseidon.ndb.mysql.com
60df5fffb3 updated ndb redo file reader with schemaversion in commit rcord instead of prepare record 2005-08-29 18:23:53 +02:00
ingo@mysql.com
5d41d5e0f4 Merge mysql.com:/home/mydev/mysql-4.1-4100 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-08-29 18:18:30 +02:00
ingo@mysql.com
5845a6e553 Bug#10056 - PACK_KEYS option take values greater than 1 while creating table 
Added a switch to reject illegal values for PACK_KEYS.
 2005-08-29 17:24:07 +02:00
ingo@mysql.com
330eb04536 Bug#12296 - CHECKSUM TABLE reports 0 for the table 
Skipping deleted records instead of breaking the loop
during checksum calculation.
 2005-08-29 17:08:41 +02:00
ingo@mysql.com
32e3238da7 Bug#11816 - Truncate table doesn't work with temporary innodb tables 
Handle temporary tables like permanent tables: If the storage engine
cannot truncate, delete instead.
 2005-08-29 17:01:46 +02:00
ingo@mysql.com
674f8dfa7c Bug#11493 - Alter table rename to default database does not work without db name qualifying 
Supplied the default database name for ALTER TABLE ... RENAME 
for the new table instead of the old tables db like we do for 
other ALTERs.
 2005-08-29 16:54:33 +02:00