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

21267 commits

This branch
This branch
All branches
Author SHA1 Message Date
joerg@mysql.com
2d0ecfa7c9 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2005-03-10 20:31:05 +01:00
marko@hundin.mysql.fi
40cca47c85 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/marko/mysql-5.0
 2005-03-10 17:00:06 +02:00
timour@mysql.com
74dac23915 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into mysql.com:/home/timka/mysql/src/5.0-dbg
 2005-03-10 17:00:05 +02:00
marko@hundin.mysql.fi
946e24713c InnoDB: Keep the "compact format" flag in SYS_TABLES.N_COLS 
instead of SYS_TABLES.MIX_LEN, because the latter was not
initialized to zero in old MySQL 3.23 releases. This will break
existing MySQL/InnoDB 5.0.3-bk databases for which
SHOW TABLE STATUS displays Row_format=Compact.
 2005-03-10 16:42:43 +02:00
marko@hundin.mysql.fi
4d8233e561 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/marko/mysql-5.0
 2005-03-10 15:50:30 +02:00
marko@hundin.mysql.fi
8c28e4bc44 rem0rec.h: 
Restore sensible values to REC_OFFS_NORMAL_SIZE and REC_OFFS_SMALL_SIZE.
 2005-03-10 15:38:09 +02:00
dlenev@mysql.com
a66a54edee Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-sp
 2005-03-10 16:22:05 +03:00
marko@hundin.mysql.fi
c4ace2a471 InnoDB: Introduce the symbols REC_OFFS_NORMAL_SIZE and 
REC_OFFS_SMALL_SIZE for the initial allocation sizes of
arrays passed to rec_get_offsets().
 2005-03-10 15:16:16 +02:00
ramil@mysql.com
ec06f3e762 a fix (bug #9029 Traditional: Wrong SQLSTATE returned for string truncation). 2005-03-10 17:08:45 +04:00
dlenev@brandersnatch.localdomain
3b6aeddc11 Fix for sp.test failure in --ps-protocol mode (2nd attempt). 
Now we should call open_and_lock_tables() even if table list is empty -
to cache stored routines used by query and open and lock tables required
for their execution.
 2005-03-10 16:05:48 +03:00
timour@mysql.com
b9c56257bb Merge 2005-03-10 13:59:48 +02:00
tomas@poseidon.ndb.mysql.com
59389925ba Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-03-10 11:33:36 +01:00
timour@mysql.com
abf659dee9 Merge mysql.com:/home/timka/mysql/src/4.1-bug-7425 
into mysql.com:/home/timka/mysql/src/4.1-dbg
 2005-03-10 11:50:55 +02:00
msvensson@neptunus.(none)
19cc402624 Fix uninitialised variable in Dbacc 2005-03-10 10:46:19 +01:00
msvensson@neptunus.(none)
c94952d1f0 Removed unused variable 2005-03-10 10:43:11 +01:00
tomas@poseidon.ndb.mysql.com
c7925bd3be Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-03-10 09:20:44 +01:00
ramil@mysql.com
2fcc3d8fdb Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0
 2005-03-10 12:16:30 +04:00
serg@serg.mylan
e272ab9772 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-10 08:45:28 +01:00
heikki@hundin.mysql.fi
bfb5d79eb3 Merge hundin.mysql.fi:/home/heikki/mysql-4.1 
into hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-03-10 09:07:42 +02:00
heikki@hundin.mysql.fi
0b0a9188bf Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/heikki/mysql-4.1
 2005-03-10 09:01:02 +02:00
joreland@mysql.com
87c93bc514 Merge mysql.com:/home/jonas/src/fix 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-03-10 07:48:44 +01:00
joreland@mysql.com
3aa4349df1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-03-10 07:47:27 +01:00
joreland@mysql.com
364b3b7b9b bug#9089 
ndb - Reenable MAX_OPEN_FILES to enable LCP in some situations
 2005-03-10 07:45:17 +01:00
ramil@mysql.com
f98d1a84cf Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0
 2005-03-10 10:22:35 +04:00
igor@rurik.mysql.com
db4ca33f52 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-03-09 16:53:20 -08:00
serg@serg.mylan
e40bf3c40b sql/ha_ndbcluster.cc 
after merge fix
sql/sql_parse.cc
    correct max_connections condition
 2005-03-10 00:10:10 +01:00
jimw@mysql.com
9fea6f6d1f Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-09 14:44:58 -08:00
marty@linux.site
d88b75874b Fixed broken 4.1->5.0 merge 2005-03-09 23:38:11 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
3b0e983bf0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4
 2005-03-09 22:10:38 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
dde2a985f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4
 2005-03-09 21:59:29 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
1a996a7140 Cleanup for VC++ 2005-03-09 21:53:04 +00:00
dlenev@brandersnatch.localdomain
d3f4a597da Portability fix. 2005-03-10 00:52:47 +03:00
jimw@mysql.com
67c9b3316a Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-09 13:26:11 -08:00
igor@rurik.mysql.com
6540c59808 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-03-09 13:24:05 -08:00
igor@rurik.mysql.com
4406118cf8 func_str.result: 
Correction after manual merge.
 2005-03-09 13:20:52 -08:00
lars@mysql.com
20318574d4 Merge 2005-03-09 21:41:09 +01:00
tomas@poseidon.ndb.mysql.com
3e95113461 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-03-09 21:19:57 +01:00
marko@hundin.mysql.fi
6920a6d546 InnoDB: Improve performance by about 10% by removing implicit 
memcpy() calls, by not initializing the offsets_[] arrays.
InnoDB: Remove a Microsoft compiler warning in page0page.c.
 2005-03-09 22:04:55 +02:00
lars@mysql.com
1422a2b1b1 Fix complilation failure 2005-03-09 20:49:44 +01:00
igor@rurik.mysql.com
af5d21357e Manual merge 2005-03-09 10:58:52 -08:00
jimw@mysql.com
71fd853121 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-09 10:40:27 -08:00
heikki@hundin.mysql.fi
2ec7c5f447 log0recv.c: 
Better ibbackup message
  Add a message explaining why we do a 'crash recovery' after an ibbackup restore; suggested by Tim Smith
 2005-03-09 20:32:01 +02:00
lars@mysql.com
44412afa2a Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/mysql-4.1 2005-03-09 19:32:00 +01:00
serg@serg.mylan
79573a5ee8 after merge fixes 2005-03-09 19:22:30 +01:00
lars@mysql.com
5f931f472f Fix to make mysql-test-run.pl work with new system tables definitions 2005-03-09 19:21:57 +01:00
jimw@mysql.com
635ba88a4c Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-09 09:39:05 -08:00
serg@serg.mylan
590e6ec727 .del-ndb_multi.test~651e6ccb21dab6d9: 
Delete: mysql-test/t/ndb_multi.test
.del-ndb_multi.result~4baa26e7403188ae:
  Delete: mysql-test/r/ndb_multi.result
.del-have_multi_ndb.inc~ef8da69d972ee707:
  Delete: mysql-test/include/have_multi_ndb.inc
 2005-03-09 18:30:29 +01:00
jimw@mysql.com
3c7c548b9a Fix change made to ER_READY by creating a new message, instead. 2005-03-09 08:56:50 -08:00
tomas@poseidon.ndb.mysql.com
a032510e19 corrected typo: deafault -> default 2005-03-09 16:39:23 +01:00
timour@mysql.com
f489e56291 Fix for BUG#7425. 
The reported problems were due to two completely unrelated omissions.
1) The file sort procedure didn't correctly create the sort key in
   make_sortkey when the sortkey was an unsigned integer.
2) The name resolution procedure for column references inside a HAVING
   clause did not propagate the unsigned_flag of the resolved references.
This patch corrects both problems.
 2005-03-09 16:51:03 +02:00