Commit graph

12865 commits

Author SHA1 Message Date
guilhem@mysql.com
6b45c24d39 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-06-18 23:51:15 +02:00
guilhem@mysql.com
19dbf58eec API change: mysql_shutdown() now requires a 2nd argument, the shutdown level.
mysqld >=4.1.3 will however understand shutdown requests sent by clients <4.1.3.
And mysqld <4.1.3 will understand shutdown requests sent by clients >=4.1.3
(it will ignore the level). Those shutdown level are just PLACEHOLDERS now.
So this change is just to make the 4.1 API suitable before it is frozen. Later
we will actually implement the shutdown levels.
2004-06-18 23:50:04 +02:00
paul@ice.snake.net
7997372aa2 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-18 11:21:50 -05:00
paul@ice.snake.net
29dff96d96 perror.c:
MySql -> MySQL (Bug #4182)
2004-06-18 11:19:29 -05:00
bar@mysql.com
4680a23867 2004-06-18 13:12:47 +05:00
dlenev@brandersnatch.localdomain
b8d665a9a3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-push
2004-06-18 11:09:22 +04:00
bar@deer.(none)
24751bf332 configure.in:
New collations were added.
2004-06-18 12:09:21 +05:00
dlenev@brandersnatch.localdomain
e8891ee926 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-push
2004-06-18 10:12:21 +04:00
dlenev@brandersnatch.localdomain
09ba29e539 WL#1264 "Per-thread time zone support infrastructure".
Added basic per-thread time zone functionality (based on public
domain elsie-code). Now user can select current time zone
(from the list of time zones described in system tables).
All NOW-like functions honor this time zone, values of TIMESTAMP
type are interpreted as values in this time zone, so now
our TIMESTAMP type behaves similar to Oracle's TIMESTAMP WITH
LOCAL TIME ZONE (or proper PostgresSQL type).
  
WL#1266 "CONVERT_TZ() - basic time with time zone conversion 
function".
  
Fixed problems described in Bug #2336 (Different number of warnings 
when inserting bad datetime as string or as number). This required
reworking of datetime realted warning hadling (they now generated 
at Field object level not in conversion functions).
  
Optimization: Now Field class descendants use table->in_use member
instead of current_thd macro.
2004-06-18 10:11:31 +04:00
bar@deer.(none)
92833475e7 ctype-uca.c:
Code optimization to make it look better and work faster.
2004-06-18 11:00:51 +05:00
bar@deer.(none)
efc2936e5e ctype-uca.c:
Fix for compilation failure when HAVE_CHARSET_ucs2 is not defined.
2004-06-18 10:24:31 +05:00
konstantin@mysql.com
7bbdb8408b Fix for bug#4105 "Server crash on attempt to prepare a statement with
character set introducer": add new item type to be returned before from 
Item_param until it's value is set.
This way items like Item_bool_func2 and udf_handler won't treat this item
as constant literal when statement is prepared.
2004-06-18 04:16:08 +04:00
tomas@poseidon.bredbandsbolaget.se
25b8f29f11 cannot include my_config.h directly, breaks some makes 2004-06-18 00:16:07 +00:00
tomas@poseidon.bredbandsbolaget.se
f81f277ed4 mgmapi.cpp:
hpux make fix
2004-06-17 22:32:49 +00:00
tomas@poseidon.bredbandsbolaget.se
c87a67b972 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1
2004-06-17 22:19:26 +00:00
tomas@poseidon.bredbandsbolaget.se
9c9ac18550 removed need for specifying TCP connections in MySQL Cluster configuration 2004-06-17 22:18:05 +00:00
tomas@poseidon.bredbandsbolaget.se
51602e0fb9 hpux compile fixes 2004-06-17 21:06:21 +00:00
tomas@poseidon.bredbandsbolaget.se
48a47a0ea6 Tru64 fixes 2004-06-17 17:38:05 +00:00
tomas@poseidon.bredbandsbolaget.se
5f0e117a08 removed warnings on Tru64 2004-06-17 17:32:03 +00:00
tomas@poseidon.bredbandsbolaget.se
1ffa7e6f31 FsReadWriteReq.cpp:
compile error on hpux
2004-06-17 17:12:45 +00:00
tomas@poseidon.ndb.mysql.com
2c27c13f91 2004-06-17 13:25:38 +00:00
bell@sanja.is.com.ua
96b470ae59 after review fix (BUG#4067) 2004-06-17 13:48:31 +03:00
bell@sanja.is.com.ua
523dbb3ef9 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-06-17 12:03:00 +03:00
tomas@poseidon.bredbandsbolaget.se
671a4344c0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1
2004-06-17 00:34:50 +00:00
tomas@poseidon.bredbandsbolaget.se
23209c023c build fixes for ndb 2004-06-17 00:34:05 +00:00
konstantin@mysql.com
96dc1e8f2e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-4030
2004-06-17 02:04:02 +04:00
konstantin@mysql.com
5b5af92fa3 - mysql_stmt_send_long_data commented. A few other comments. 2004-06-17 02:03:15 +04:00
heikki@hundin.mysql.fi
79fd0c68d3 fil0fil.c:
Remove the use of mem_realloc in fil0fil.c; mem_realloc() was broken and the patch to remove its definition will propagate from the 4.0 tree; crash recovery with innodb_file_per_table has to be tested after this patch, not tested yet
2004-06-17 00:21:41 +03:00
konstantin@mysql.com
834e9f870e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-4030
2004-06-16 23:11:36 +04:00
konstantin@mysql.com
e9f2c7d478 Comments and cleanups in client library. 2004-06-16 23:11:02 +04:00
paul@kite-hub.kitebird.com
233ad19e01 Error message edits. 2004-06-16 11:59:35 -05:00
paul@kite-hub.kitebird.com
7fcdbd5cdb Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-06-16 11:59:34 -05:00
tomas@poseidon.bredbandsbolaget.se
360fcee019 .del-mysqlclusterd~7ebaf8faea0a1100:
Delete: ndb/bin/mysqlclusterd
.del-mysqlcluster_install_db~f363f803506081a6:
  Delete: ndb/bin/mysqlcluster_install_db
.del-mysqlcluster~26c9c37938503734:
  Delete: ndb/bin/mysqlcluster
2004-06-16 16:59:33 +00:00
tomas@poseidon.bredbandsbolaget.se
b3f5a716cb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1
2004-06-16 16:51:03 +00:00
tomas@poseidon.bredbandsbolaget.se
52816b100f bug fix in ndb make 2004-06-16 16:50:05 +00:00
lenz@mysql.com
3ac650c86f Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-06-16 16:06:46 +02:00
bar@mysql.com
f814d224f7 Critical fixes after review:
- mutex was unlocked before the end of the critical sesion,
- Portability issue: It's better to use (*alloc)(x) instead of alloc(x),
  if alloc is a function passed as an argument.
- Use {} around if() block, to avoid possible problems with some Windows compilers.
2004-06-16 19:06:45 +05:00
tomas@poseidon.ndb.mysql.com
10d2bdcbcd cxx compile fix for ndb 2004-06-16 14:06:44 +00:00
tomas@poseidon.ndb.mysql.com
040f596064 Makefile.am:
missing file
2004-06-16 13:31:35 +00:00
tomas@poseidon.ndb.mysql.com
baa2d51abd Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-06-16 13:18:35 +00:00
bell@sanja.is.com.ua
002364c20f new length detection for non-string in UNION (BUG#4067) 2004-06-16 16:06:30 +03:00
lenz@mysql.com
a823bc2208 - Modified Do-compile to build, package and test NDB cluster, when
enabled
2004-06-16 13:57:45 +02:00
konstantin@mysql.com
5f8ef7a38d Another place where Bug#4079 "error checking in prepared statements"
pops up fixed.
2004-06-16 14:06:39 +04:00
konstantin@mysql.com
e7de488713 Compilation error on AIX (IBM C Compiler Version 6) fixed. 2004-06-16 11:29:22 +04:00
paul@kite-hub.kitebird.com
125b4da804 packet.result, alter_table.result:
fix up test result.
2004-06-15 23:50:03 -05:00
paul@ice.snake.net
2df44dff2f Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-15 22:20:02 -05:00
paul@ice.snake.net
fd1d01e098 Language/consistency edits to error messages
and affected test results.
2004-06-15 22:18:20 -05:00
heikki@hundin.mysql.fi
6d197336ed row0ins.c:
Return the code of row_ins_foreign_check_on_constraint() as close to 4.0 as possible, except that we use mem_strdup() to allocate the memory for the modified table name
2004-06-16 04:08:07 +03:00
marko@hundin.mysql.fi
dfc36c886c InnoDB: fix bug in call to innobase_invalidate_query_cache(),
introduced in ChangeSet@1.1843.1.25
InnoDB: fix bug in the error exit of
  fil_create_new_single_table_tablespace(), introduced in
  ChangeSet@1.1843.1.11
2004-06-16 01:55:24 +03:00
paul@ice.snake.net
dc8ffaee91 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-15 15:41:22 -05:00