mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-12 18:18:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
15577 commits 2858 branches 349 tags 1.6 GiB
Commit graph

15577 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
eda3eb378d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-20 17:31:59 +00:00
tomas@poseidon.ndb.mysql.com
8ae6219c26 fix so that ndb handler can cope with char(0), mapped to char(1) for now 2004-10-20 17:22:58 +00:00
monty@mysql.com
b686f98f50 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-10-20 18:58:01 +03:00
tomas@poseidon.ndb.mysql.com
a1bd5432c4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-20 15:58:00 +00:00
tomas@poseidon.ndb.mysql.com
0e114cc7e6 fix for wrong use of shell test 2004-10-20 15:56:57 +00:00
tomas@poseidon.ndb.mysql.com
e769c9c19e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-20 15:36:51 +00:00
tomas@poseidon.ndb.mysql.com
fd3f9ac19c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-20 15:18:54 +00:00
monty@mysql.com
4e63fb9891 After merge fixes 2004-10-20 17:28:40 +03:00
tomas@poseidon.ndb.mysql.com
aa68dfdd88 removed some (Uint32)-1 casts 2004-10-20 13:54:24 +00:00
pekka@mysql.com
43fe7e61e3 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41
 2004-10-20 15:43:22 +02:00
pekka@mysql.com
251c54ea0b NDB dbtux scan batch max 16->992 caused perf loss 2004-10-20 15:43:21 +02:00
tomas@poseidon.ndb.mysql.com
7623137121 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-20 13:43:17 +00:00
tomas@poseidon.ndb.mysql.com
ec96f9a1a5 compile warning fixes 2004-10-20 13:42:41 +00:00
dlenev@mysql.com
b9bf4e8ccd Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-secfix
 2004-10-20 17:37:46 +04:00
konstantin@mysql.com
df58c0bce7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/media/sda1/mysql/mysql-4.1-6049
 2004-10-20 17:33:14 +04:00
monty@mysql.com
e1218474b8 Merge with 4.0 2004-10-20 16:24:28 +03:00
dlenev@mysql.com
c4281153e1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-secfix
 2004-10-20 17:20:32 +04:00
pekka@mysql.com
42541dad47 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41
 2004-10-20 15:14:51 +02:00
pekka@mysql.com
e1786b552e NdbOperationSearch.cpp: 
fix C coding error found by tomas on sol9x86
 2004-10-20 15:14:50 +02:00
bar@mysql.com
ed2a655a20 ctype-utf8.c: 
A faster UTF8 null-terminated string implementation.
  It is used for identifier comparison, so it's quite critical.
 2004-10-20 18:07:59 +05:00
monty@mysql.com
b32ffec8fd Fix test case for innodb-lock 2004-10-20 16:04:28 +03:00
dlenev@mysql.com
a10ce662b4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-secfix
 2004-10-20 17:02:15 +04:00
konstantin@mysql.com
e546d901ac Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/work/mysql-4.1-6049
 2004-10-20 16:45:09 +04:00
konstantin@mysql.com
0aa9195a2c A fix and test case for bug#6058 "Prepared statements return '0000-00-00' 
(date) as empty  string": preserve time type (date, time, or datetime) for
zero dates, times, and datetimes.
 2004-10-20 16:43:36 +04:00
monty@mysql.com
f9cd4a60e4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-10-20 15:14:06 +03:00
dlenev@brandersnatch.localdomain
75d816627c Fix for bug "One can circumvent missing UPDATE privilege if 
he has SELECT and INSERT privileges for table with primary key"

Now we set lex->duplicates= DUP_UPDATE right in parser if INSERT has
ON DUPLICATE KEY UPDATE clause, this simplifies insert_precheck()
function (this also fixes a bug) and some other code.
 2004-10-20 16:04:43 +04:00
ingo@mysql.com
0130f4669a Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug6151
 2004-10-20 13:54:55 +02:00
ingo@mysql.com
f32fb586c6 Fixed a typo, which prevented non-valgrind build. 2004-10-20 13:52:56 +02:00
pekka@mysql.com
c0eba6c97f NDB dbtux compile fix for sol9x86 2004-10-20 12:25:48 +02:00
monty@mysql.com
9f8d47d81a Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-10-20 11:25:46 +03:00
monty@mysql.com
1f8b3d0f22 Code cleanups (done during review of new code) 
Rename innodb_table_locks_old_behavior -> innodb_table_locks
Set innodb_table_locks to off by default to get same behaviour as in MySQL 4.0.20
(This means that Innodb ignore table locks by default, which makes it easier to combine MyISAM and InnoDB to simulate a transaction)
 2004-10-20 11:24:08 +03:00
monty@mishka.local
7af65592c7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mishka.local:/home/my/mysql-4.1
 2004-10-20 02:55:03 +03:00
tomas@poseidon.ndb.mysql.com
1ef4979e48 fix for platforms that have lower_case_table_names == 2 2004-10-19 23:55:02 +00:00
monty@mishka.local
04c23808a8 Review of all code pushed since last review 
Simple optimzations and cleanups
Removed compiler warnings and fixed portability issues
Added client functions 'mysql_embedded()' to allow client to check if we are using embedded server
Fixes for purify
 2004-10-20 01:28:42 +03:00
tomas@poseidon.ndb.mysql.com
1ce4c4ece2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-19 20:38:06 +00:00
tomas@poseidon.ndb.mysql.com
e4c9c1cdcb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-19 20:33:38 +00:00
tomas@poseidon.ndb.mysql.com
d6a2fab3b9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-19 20:25:30 +00:00
heikki@hundin.mysql.fi
20ac420eb1 trx0rec.c: 
test
 2004-10-19 18:58:53 +03:00
tomas@poseidon.ndb.mysql.com
8476fe9757 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
 2004-10-19 15:00:02 +00:00
tomas@poseidon.ndb.mysql.com
38afbaa4f3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
 2004-10-19 14:57:11 +00:00
tomas@poseidon.ndb.mysql.com
6d86518b17 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-19 14:54:13 +00:00
paul@ice.snake.net
462aed6c99 libmysql.c: 
Add note to mysql_hex_string() comment.
 2004-10-19 07:44:20 -05:00
heikki@hundin.mysql.fi
2fd67321e9 os0file.c: 
InnoDB: print info about how many bytes we were able to read if a file read is not able to read as many bytes as we requested
 2004-10-19 14:44:14 +03:00
bell@sanja.is.com.ua
72fca68a1d fixed retsult code 2004-10-19 11:54:33 +03:00
marko@hundin.mysql.fi
665e22eeae Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/j/mysql-4.1
 2004-10-19 11:00:02 +03:00
bar@mysql.com
fc13ab979f CHARSET_INFO.txt: 
minor fixes
 2004-10-19 13:00:01 +05:00
jan@hundin.mysql.fi
98ecd7422a Fixed bug load data infile...replace error with InnoDB table. 2004-10-19 09:58:41 +03:00
bar@mysql.com
cdd9d656b4 sql_union.cc: 
Check DERIVATION_NONE only for UNIONS.
 2004-10-19 11:45:33 +05:00
bar@mysql.com
f8c7a60c34 Dumping BLOBs in HEX notation. The patch was orinigally 
contributed by Takeshi. I also added HEX support for 
"extended-inserts".
 2004-10-19 10:40:59 +05:00
bar@mysql.com
c01c8f99ea libmysql.c: 
New function mysql_hex_string()
 2004-10-19 09:50:47 +05:00