Commit graph

15337 commits

Author SHA1 Message Date
monty@mysql.com
e1218474b8 Merge with 4.0 2004-10-20 16:24:28 +03:00
monty@mysql.com
b32ffec8fd Fix test case for innodb-lock 2004-10-20 16:04:28 +03: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
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
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
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
tomas@poseidon.ndb.mysql.com
1b00a66e7f bumped up ndb version to 3.5.3 2004-10-18 14:14:21 +00:00
marko@hundin.mysql.fi
fe83d97800 ha_innodb.cc:
Replace a tolower() loop with innobase_casedn_str()
2004-10-18 16:59:15 +03:00
pekka@mysql.com
b05d1a3a93 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41-tux
2004-10-18 15:39:20 +02:00
tomas@poseidon.ndb.mysql.com
aed0390662 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-18 13:39:19 +00:00
marko@hundin.mysql.fi
57f1f4ea41 InnoDB: Treat UTF-8 strings properly in case insensitive operations 2004-10-18 16:00:57 +03:00
bar@mysql.com
47f638054e Bug #6139 UNION doesn't understand collate in the column of second select 2004-10-18 17:56:25 +05:00
tomas@poseidon.ndb.mysql.com
e88e0f4678 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-18 12:53:40 +00:00
tomas@poseidon.ndb.mysql.com
60cf2213fd Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-18 12:12:02 +00:00
heikki@hundin.mysql.fi
f687608e1c srv0srv.c:
If innodb_thread_concurrency would be exceeded, let a thread sleep 10 ms before entering the FIFO queue; previously, the value was 50 ms, which Peter Z considered too long
2004-10-18 15:00:39 +03:00
tomas@poseidon.ndb.mysql.com
d699b24f10 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-18 11:06:15 +00:00
bar@mysql.com
67c9fc985f CHARSET_INFO.txt:
new file
2004-10-18 15:25:28 +05:00
bar@mysql.com
1596d46528 Bug #6040 can't retrieve records with umlaut characters in case insensitive manner 2004-10-18 15:23:24 +05:00
tomas@poseidon.ndb.mysql.com
a709296ba4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-18 10:12:43 +00:00
tomas@poseidon.ndb.mysql.com
839c45f313 remove possibility of connectstring error like "hostname=..."
+ some fixed string length cleanup
+ fixed a better error printout
2004-10-18 09:37:48 +00:00
ram@gw.mysql.r18.ru
a95c117326 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6057
2004-10-18 14:05:11 +05:00
bar@mysql.com
96a731735c ctype-mb.c:
Remove unnesessary code: use_mb is always TRUE for the multibyte charsets.
2004-10-18 13:32:30 +05:00
tomas@poseidon.ndb.mysql.com
cede83180a 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-18 07:51:52 +00:00
ram@gw.mysql.r18.ru
90ec1b6663 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6057
2004-10-18 12:48:11 +05:00
ram@gw.mysql.r18.ru
1fee6aaa62 A fix (bug #6057: Data Type Problem in manager.c). 2004-10-18 12:43:52 +05:00
dlenev@brandersnatch.localdomain
391a086d52 Fix for broken --with-csv-storage-engine build.
Now we use TABLE::timestamp_field_type instead of
TABLE::timestamp_default_now/on_update_now for determining
if we should auto-set value of TIMESTAMP field during this operation.
We are also use Field_timestamp::set_time() instead of
handler::update_timestamp().
2004-10-18 10:32:52 +04:00
dellis@goetia.(none)
34e5df0d36 Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.0
2004-10-17 18:47:08 -05:00
dellis@goetia.(none)
b9509655a5 mysqld.cc:
BUG #5731 key_buffer_size not properly restricted to 4GB; use UINT_MAX32 for clarity.
2004-10-17 18:44:51 -05:00
pekka@mysql.com
11bfc5eca1 NDB wl-1533 tux optim: after wl-1942 can remove signal from many methods 2004-10-17 16:24:23 +02:00
pekka@mysql.com
abcd2994c2 NDB wl-1942 dbtux - move scans correctly at index tree re-org 2004-10-17 13:12:25 +02:00
joreland@mysql.com
c7fdd8af14 4006 is temporary 2004-10-17 09:06:15 +02:00
hartmut@mysql.com
64c293fdaa Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/hartmut/projects/mysql/dev/4.0
2004-10-16 21:04:57 +02:00
pekka@mysql.com
a04f98d385 NDB wl-1533 tux optim 17 - allow slack in interior nodes 2004-10-16 15:44:55 +02:00