mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
16102 commits 2794 branches 343 tags 1.5 GiB
Commit graph

16102 commits

This branch
This branch
All branches
Author SHA1 Message Date
marko@hundin.mysql.fi
766adf172b row0ins.c: 
row_ins_scan_sec_index_for_duplicate(),
  row_ins_duplicate_error_in_clust():
  remove unused variables "ptr"
 2004-11-18 17:01:33 +02:00
mskold@mysql.com
7bbee8c95d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-11-18 15:55:18 +01:00
timour@mysql.com
5d1f920ba7 correct name of function in synopsis 2004-11-18 16:52:45 +02:00
pekka@mysql.com
22973f11c7 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41
 2004-11-18 13:39:47 +01:00
bar@mysql.com
fe3b359b74 Check that the third UNION part with COLLATE 
clause resolves collation conflict for the
first and the second parts pair.
 2004-11-18 16:15:48 +04:00
mskold@mysql.com
a4d061a5d9 Fix for bug#4312 ndb table, wrong behaviour on insert .. on duplicate key .. 2004-11-18 12:11:56 +01:00
pekka@mysql.com
bc31325180 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41
 2004-11-18 11:55:53 +01:00
pekka@mysql.com
b2b7bf0eaa ndb: charset fix from Bar (strxfrm_multiply can be 0) 2004-11-18 11:48:21 +01:00
tomas@poseidon.ndb.mysql.com
15621600b3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
 2004-11-18 08:43:00 +00:00
tomas@poseidon.ndb.mysql.com
f2110823d5 ifdef'd unused table reorg code 2004-11-18 08:42:26 +00:00
serg@serg.mylan
19067008b8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-11-17 17:54:15 +01:00
guilhem@mysql.com
f04832b52d time independent test 2004-11-17 17:06:24 +01:00
guilhem@mysql.com
d34421c127 Fixes for compilation errors in Windows (casts from uint32* to uint*) in repl and charset code. 
Moving the part of user_var.test using UCS2 to ctype_ucs.test
 2004-11-17 16:41:30 +01:00
serg@serg.mylan
37e872de8c merged 2004-11-17 15:28:37 +01:00
serg@serg.mylan
2d8c21f700 test for bug#5528 2004-11-17 13:38:35 +01:00
tomas@poseidon.ndb.mysql.com
2c677ed687 Merge 2004-11-17 10:59:16 +00:00
tomas@poseidon.ndb.mysql.com
1700bf3844 Enabled usage of new system variables for ndb 
- ndb_use_exact_count
  - ndb_autoincrement_prefetch_sz
  - ndb_use_transactions
  - ndb_force_send
moved "inlined" functions to .cc file since they are virtual anyways
enabled printout od ndb errors in warnings even if mapping existst to mysql error code
 2004-11-17 08:15:53 +00:00
tomas@poseidon.ndb.mysql.com
0acc6f83b2 enabled having system tables in ndb 2004-11-17 08:10:26 +00:00
igor@rurik.mysql.com
078597564d Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2004-11-16 15:07:49 -08:00
sergefp@mysql.com
bfd6c218b2 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
 2004-11-17 01:26:23 +03:00
igor@rurik.mysql.com
e17073c4a2 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2004-11-16 14:01:40 -08:00
igor@rurik.mysql.com
9edff6c591 key_cache.result, key_cache.test: 
Added a test case for bug #6447.
mf_keycache.c:
  Fixed bug #6447. Erronious code in the key_cache_read function
  caused problems when reading key blocks with offset>0 into
  key cache. The code of key_cache_insert and key_cache_write
  was modified similarly.
 2004-11-16 13:58:49 -08:00
heikki@hundin.mysql.fi
2b1117702e Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/heikki/mysql-4.1
 2004-11-16 22:50:29 +02:00
heikki@hundin.mysql.fi
b560503386 ha_innodb.cc: 
Anthony's http://lists.mysql.com/internals/18505 patch for DROP DATABASE broke caused it to return errno if .ibd files were present (bas_ext() was obsolete in ha_innodb.cc); fix this
 2004-11-16 22:49:28 +02:00
konstantin@mysql.com
a38ac4b26d Fix comment. 2004-11-16 23:27:31 +03:00
heikki@hundin.mysql.fi
ea59300d62 ha_innodb.cc: 
Manually ported this bug fix from 4.0: 
 Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
 2004-11-16 20:45:52 +02:00
heikki@hundin.mysql.fi
dd64377dc2 ha_innodb.cc: 
Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
 2004-11-16 20:37:42 +02:00
sergefp@mysql.com
1cc999fbd4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
 2004-11-16 21:36:31 +03:00
tomas@poseidon.ndb.mysql.com
a69ddb033d ha_ndbcluster.cc: 
reverting previous patch
 2004-11-16 13:56:25 +00:00
bar@mysql.com
ba5e76a83d Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-4.1
 2004-11-16 16:50:17 +04:00
bar@mysql.com
4e674084f6 ctype-tis620.c: 
Space allocated didn't take in account trailing '\0' bytes.
 2004-11-16 16:45:47 +04:00
ram@gw.mysql.r18.ru
f0355a6737 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6449
 2004-11-16 16:10:45 +04:00
tomas@poseidon.ndb.mysql.com
8ee2a1836e Also print warning if there is an ndb->mysql errorcode mapping, this since the warning provides valuable info to the user 2004-11-16 12:10:44 +00:00
ram@gw.mysql.r18.ru
dde88ea82b A fix (bug #6449: DO server-crashing bug). 2004-11-16 14:36:25 +04:00
tomas@poseidon.ndb.mysql.com
5b905808d9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-11-16 09:28:17 +00:00
tomas@poseidon.ndb.mysql.com
4d89516226 Makefile.am: 
changed link order to fix linking problems
 2004-11-16 09:10:29 +00:00
bar@mysql.com
aab6e8b7a2 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-4.1
 2004-11-16 12:09:49 +04:00
bar@mysql.com
629f1bb616 Bug #6552 CHAR column w/o length is legal, BINARY w/o length is not 2004-11-16 12:05:13 +04:00
tomas@poseidon.ndb.mysql.com
fc90cdb414 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-11-16 07:24:50 +00:00
tomas@poseidon.ndb.mysql.com
b8713e5e9c provided better error printout for mismatch of node types in configuratoin fetch 
fixed to that mgmt server actually uses the connectsring
 2004-11-16 07:24:11 +00:00
guilhem@mysql.com
fb8b9ca6a4 compilation failures fixes. mysqldump now compiles on AIX 4.3. 2004-11-16 00:10:32 +01:00
guilhem@mysql.com
99417e07eb Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2004-11-15 23:52:04 +01:00
tomas@poseidon.ndb.mysql.com
95621f4a3e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
 2004-11-15 21:42:52 +00:00
bar@mysql.com
8a2ef0a2ca Bug#6608: MySQL server crash in some query with tis620 character set. 
The bug was that the function allocates 'a', then changes the value
of 'a' with the operator ++, and then tries to free 'a'!
 2004-11-15 21:26:16 +04:00
lars@mysql.com
b7cfe5ecad BUG#6353 V2: 
Replication using replicate-rewrite-db did not work for LOAD DATA INFILE.
Now is does.  There was one place in the code that used current database 
instead of the rewrite database.
 2004-11-15 17:03:54 +01:00
dlenev@mysql.com
5ddc564d89 Proposed fix for bug #6439 "from_unixtime() function returns wrong datetime 
values for too big argument".

Added range checking for from_unixtime() argument, cleaned up code 
a bit.
 2004-11-15 16:11:13 +03:00
dlenev@brandersnatch.localdomain
b02f5aa692 Fix for bug #6266 "Invalid DATETIME value is not handled properly". 
In server we assume that datetime values stored in MYSQL_TIME struct
are normalized (and year is not greater than 9999), so we should 
perform range checks in all places then we convert something to
MYSQL_TIME.
 2004-11-15 15:44:29 +03:00
tomas@poseidon.ndb.mysql.com
16e34bd27d changed compile order, mysqladmin with ndbcluster extensions needs ndb to be compiled first 
added libs variable for ndbmgmclient used by mysqladmin
    add linkage with @ndb_mgmclient_libs@
    additional options for ndbcluster
    added support for managing the cluster to mysqladmin
    added DEFINE_CXA_PURE_VIRTUAL flag to CFLAGS to enable linkage with c++ libs
    use macros for C_MODE_START/END so that define of FIX_GCC_LINKING_PROBLEM works in c-programs
 2004-11-15 12:40:32 +00:00
tomas@poseidon.ndb.mysql.com
a2177a2f35 always let traffic through to api cluster manager in transporter 
print some info event on api connects with wrong versions
 2004-11-15 12:20:05 +00:00
tomas@poseidon.ndb.mysql.com
7e096e74ab Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-11-15 10:23:31 +00:00