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

28252 commits

This branch
This branch
All branches
Author SHA1 Message Date
jonas@perch.ndb.mysql.com
78a0dbfd84 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
 2005-11-09 08:57:59 +01:00
sergefp@mysql.com
dded290d1f Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-nov08-push
 2005-11-09 10:14:49 +03:00
sergefp@mysql.com
c6a902f20c Merge mysql.com:/home/psergey/mysql-4.1-nov08-push 
into mysql.com:/home/psergey/mysql-5.0-oct08-push
 2005-11-09 10:12:58 +03:00
sergefp@mysql.com
f12212f74e BUG#14480: post-fix: use the default field value from CREATE list too. 2005-11-09 09:34:46 +03:00
pekka@mysql.com
1926b4e167 ndb - super pool update (future use) 2005-11-08 23:48:26 +01:00
ingo@production.mysql.com
cae673d0a9 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
 2005-11-08 20:18:08 +01:00
joerg@mysql.com
2153871abf Compile fixes for NDB on Solaris and HP-UX, provided by Tomas and Jonas, re-applied in new tree. 2005-11-08 17:30:41 +01:00
sergefp@mysql.com
84101eb85d Trivial post-merge fixes 2005-11-08 11:26:02 +03:00
sergefp@mysql.com
c5276ebcb0 Merge, will need post-merge fixes. 2005-11-08 11:22:51 +03:00
kent@mysql.com
41b554daa9 configure.in: 
Temporary work around to pass --build=... to configure
  in storage engine sub directory
print_file.cpp:
  HP-UX compiler don't like variable shadowing
AsyncFile.cpp:
  Cast result from strstr() to char* for HP-UX compile
trigger_definitions.h:
  "MIN" and "MAX" are not used for trigger stuff, move to a more global include
ndb_global.h.in:
  Define "MIN" and "MAX" globally for all NDB, in case the platform does not have it (like Solaris).
  Moved here from "include/kernel/trigger_definitions.h".
Makefile.am:
  Add missing ha_* files to EXTRA_mysqld_SOURCES
 2005-11-08 07:41:46 +01:00
sasha@asksasha.com
637c800191 changed select release_lock() to do release_lock() to avoid having to compare the 
non-deterministic result in the test case for BUG#7947
the bug fix for BUG#7947 now fixed the result of mix_innodb_myisam_binlog test, which
in the past was missing DO RELEASE_LOCK() in the output of SHOW BINLOG EVENTS
 2005-11-07 20:51:30 -07:00
sergefp@mysql.com
41bc233699 Merge mysql.com:/home/psergey/mysql-4.1-bug13814 
into mysql.com:/home/psergey/mysql-4.1-nov08-push
 2005-11-08 05:36:25 +03:00
sergefp@mysql.com
5656740542 Merge mysql.com:/home/psergey/mysql-4.1-bug14480 
into mysql.com:/home/psergey/mysql-4.1-nov08-push
 2005-11-08 05:34:56 +03:00
petr@mysql.com
63554e10d8 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
 2005-11-08 04:04:36 +03:00
jimw@mysql.com
2e13e29a29 Add generated files to ignore list 2005-11-07 16:39:20 -08:00
petr@mysql.com
0f373f9501 Merge mysql.com:/home/cps/mysql/trees/mysql-4.1 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
 2005-11-08 01:27:15 +03:00
kent@mysql.com
e21fa3ba99 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-11-07 23:18:00 +01:00
sasha@asksasha.com
aaaee3f23b Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947
 2005-11-07 15:10:48 -07:00
sasha@asksasha.com
41752fa9a0 fix for BUG#7947 - failure to log DO RELEASE_LOCK() if we disconnect in the middle of 
transaction while holding the lock. Also test to make sure other binlogging issues
reported in the bug have been addressed.
 2005-11-07 15:09:35 -07:00
joerg@mysql.com
1bf2462119 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-11-07 23:02:33 +01:00
petr@mysql.com
03674968b3 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/cps/mysql/trees/mysql-4.1
 2005-11-08 01:00:15 +03:00
joerg@mysql.com
2cb601c840 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/M51/mysql-5.1
 2005-11-07 22:54:00 +01:00
joerg@mysql.com
a6eef9b92e Merge mysql.com:/M50/bug14720 into mysql.com:/M51/merge-5.1 2005-11-07 22:42:58 +01:00
joerg@mysql.com
024d2b3595 mysql-test/r/connect.result + mysql-test/t/connect.test 
Replace the full socket path name, not just a directory component. bug#14720
 2005-11-07 22:30:44 +01:00
reggie@poseidon.ndb.mysql.com
b272c5b1e5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2005-11-07 20:29:58 +01:00
ingo@mysql.com
7533d92b23 Bug#13707 - Server crash with INSERT DELAYED on MyISAM table 
Initialized 'ptr' for a newly instantiated varstring field.
This is required by INSERT DELAYED.

No test case. This is a migration issue. There are two shell
scripts attached to the bug report. They can be used for testing.
 2005-11-07 18:31:48 +01:00
reggie@poseidon.ndb.mysql.com
473dac3541 some small changes to help get 5.1 compiling cleanly on Windows and with Visual C++ 2005 2005-11-07 17:15:23 +01:00
tulin@ndbmaster.mysql.com
01b83def79 corrected compile error in ndb 2005-11-07 16:48:05 +01:00
acurtis@poseidon.ndb.mysql.com
98e20c9b46 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/m51new
 2005-11-07 16:30:03 +01:00
acurtis@poseidon.ndb.mysql.com
c01a3b5e5f Make storage engines "pluggable", handlerton work 2005-11-07 16:25:06 +01:00
guilhem@mysql.com
ef415ceb14 Fix for BUG#14703 "Valgrind error when inserting 0 into a BIT column (like in type_bit.test)": 
test "length" first (otherwise when "length" is 0, the *from invalid access still triggers a Valgrind warning).
I wrote to the Valgrind authors in case this is something fixable in Valgrind (normally the
decision to issue a warning is based on the simulated CPU condition code, which should not be undefined here).
 2005-11-07 16:18:46 +01:00
kent@mysql.com
8ddfac81b6 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-11-07 14:04:43 +01:00
jonas@perch.ndb.mysql.com
b42a1462ea ndb - Fix problematic handling of TUP_ALLOC/DEALLOC REQ wrt varsize 
same row -
      prepare delete, prepare insert (with different size), commit delete, commit insert would lead to assertion
        as prepare insert didnt call handle_size_change_after_update
 2005-11-07 13:28:19 +01:00
guilhem@mysql.com
517e51f1ed Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.0
 2005-11-07 13:04:27 +01:00
jonas@perch.ndb.mysql.com
88fbfc489d Import ndb varsize 2005-11-07 12:19:28 +01:00
ingo@mysql.com
1f3df2e669 Bug#14616 - Freshly imported table returns error 124 when using LIMIT 
Initialized usable_keys from table->keys_in_use instead of ~0
in test_if_skip_sort_order(). It was possible that a disabled
index was used for sorting.
 2005-11-07 12:16:49 +01:00
sergefp@mysql.com
edd094b194 BUG#14480, attempt2: In CREATE ... SELECT ..., don't count the same field twice 
when calculating table->null_fields.
 2005-11-07 09:23:43 +03:00
kent@mysql.com
0a160a8416 init_db.sql: 
Added system table 'mysql.plugin'
 2005-11-06 20:51:37 +01:00
kent@mysql.com
3eafcbc234 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2005-11-06 18:42:27 +01:00
svoj@poseidon.ndb.mysql.com
eed744d30b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2005-11-06 16:16:18 +01:00
kent@mysql.com
31bb67f3c3 configure.in: 
Changed back version to 5.1.2-alpha
 2005-11-06 16:05:57 +01:00
svoj@poseidon.ndb.mysql.com
463811e900 monty review: fixes after reapplying plugin patch from "crashed" 5.1 tree 2005-11-06 14:26:37 +01:00
kent@mysql.com
99435aa746 NdbIndexStat.cpp, NdbIndexStat.hpp, Suma.hpp portability changes from pekka 2005-11-06 14:12:14 +01:00
svoj@poseidon.ndb.mysql.com
3791197f0d WL#2575 - Fulltext: Parser plugin for FTS 
WL#2763 - MySQL plugin interface: step 1
Manual merge from CNET tree.
 2005-11-06 13:13:06 +01:00
ramil@ndbmaster.mysql.com
bd18c9f24d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into ndbmaster.mysql.com:/home/ndbdev/tomas/mysql-5.1-new
 2005-11-06 08:30:26 +01:00
ramil@ndbmaster.mysql.com
7678149864 WL #528: Faster free_tmp_table 2005-11-06 08:29:03 +01:00
igor@rurik.mysql.com
60a4b4fb16 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-11-05 22:45:54 -08:00
igor@rurik.mysql.com
0960f5fedc Post review fixes. 2005-11-05 22:41:36 -08:00
kent@mysql.com
37788da790 Reapplied portability changes, from changesets by kent, joerg and msvensson 2005-11-06 02:19:51 +01:00
ramil@poseidon.ndb.mysql.com
9b532768f5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2005-11-06 01:38:51 +01:00