konstantin@mysql.com
957beb9794
Merge mysql.com:/home/kostja/work/mysql-4.1-root
...
into mysql.com:/home/kostja/work/mysql-5.0-root
2005-02-10 18:31:02 +03:00
konstantin@mysql.com
36c992b264
Follow-up for bug#7990
2005-02-10 18:24:26 +03:00
konstantin@mysql.com
6054f8140c
Merge mysql.com:/home/kostja/work/mysql-4.1-root
...
into mysql.com:/home/kostja/work/mysql-5.0-root
2005-02-10 17:53:06 +03:00
konstantin@mysql.com
4b2b327dcc
A fix and test case for Bug#7990 "mysql_stmt_close doesn't
...
reset mysql->net.last_error": the solution is to clear
MYSQL->net error before performing COM_CLOSE: if the call
succeeds, the connection is usable for other statements.
More comprehensive fix is to clear MYSQL->net for all
recoverable errors at the time they happen, it will be
implemented in 5.0 as it introduces incompatibility in behavior.
2005-02-10 17:41:54 +03:00
konstantin@mysql.com
7d735c7207
manual merge
2005-02-10 16:58:02 +03:00
konstantin@mysql.com
016544df22
A fix and test case for Bug#8330 "mysql_stmt_execute crashes" (libmysql).
2005-02-10 14:56:20 +03:00
hf@deer.(none)
b94a482ee9
Precision Math implementation
2005-02-09 02:50:45 +04:00
serg@serg.mylan
19186b6238
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-01-28 17:15:51 +01:00
serg@serg.mylan
852f2e0aba
small Makefile.am cleanup
...
clean: targets removed
generated *.h files moved to include/
2005-01-28 17:14:03 +01:00
georg@beethoven.site
3b2bf2f512
Fixes for windows compilation bugs
...
(After review of cs georg:1.1800 by Monty)
2005-01-26 15:19:20 +01:00
jani@ua141d10.elisa.omakaista.fi
d5f76d50f6
Some bug fixes and a feature add to mysql-test-run
2005-01-25 18:32:09 +02:00
jimw@mysql.com
d11081bd6f
Merge
2005-01-24 13:48:48 -08:00
lenz@mysql.com
9675b0698f
- renamed client_test -> mysql_client_test
...
- renamed the tests that use the embedded server (client_test ->
mysql_client_test_embedded, mysqltest -> mysql_test_embedded
and changed some Makefiles and scripts so they are installed in $bindir
(required to be able to run the test suite against the embedded server)
2005-01-20 16:25:38 +01:00
monty@mysql.com
502ba93b38
Merge with global tree
2005-01-18 04:03:26 +02:00
kaa@polly.local
c46f527454
Fixed memory leak in handle_local_infile()
2005-01-17 19:21:01 +03:00
bar@mysql.com
d91cd61a4b
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-01-17 09:30:30 +04:00
bar@mysql.com
308aec1526
libmysql.c:
...
bug#7891: mysql_character_set_name() returns collation
2005-01-17 09:27:24 +04:00
mwagner@here.mwagner.org
f06824ca4b
Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1
...
into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
2005-01-12 21:09:07 -06:00
mwagner@here.mwagner.org
292ca0959c
libmysqld.def, libmysql.def:
...
Use the invisible tabs (!)
2005-01-12 21:04:31 -06:00
mwagner@here.mwagner.org
6bca7cb857
Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1
...
into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
2005-01-12 19:58:49 -06:00
mwagner@here.mwagner.org
ffdeb4f880
libmysqld.def, libmysql.def:
...
Add missing 'get_defaults_files' to fix linking error.
2005-01-12 19:56:49 -06:00
shuichi@mysql.com
852d74a68e
renamed charset name 'eucjp_ms' to 'eucjpms'
2005-01-12 02:58:15 -08:00
shuichi@mysql.com
3126e82291
added new character set - cp932, eucjp_ms
2005-01-11 17:45:36 -08:00
monty@mysql.com
ef74d8d898
Fixed a bug in prepared statements error handling
...
After merge fixes
2005-01-06 16:59:29 +02:00
jani@ua141d10.elisa.omakaista.fi
81d99da104
Added checking for my.cnf file from environment variable MYSQL_HOME
...
instead of DATADIR.
2005-01-04 20:13:47 +02:00
monty@mysql.com
7cf8285b3f
After merge fixes
...
Add support for warnings for prepare of prepared statements
Fixed test to work with --ps-protocol
Fixed some test results
2005-01-04 13:46:53 +02:00
monty@mysql.com
34d5331cee
Merge with global tree
2004-12-31 00:50:30 +02:00
georg@beethoven.site
448d453ac1
Merge from 4.1: fix for bug #7285 (embedded server)
2004-12-30 17:17:21 +01:00
ingo@mysql.com
c39be2d0e7
WL#1895 - Print message to error log in case of detected MyISAM corruption
...
Changed my_error() to print error messages, which come from
arbitrary registered ranges of error messages. Messages can
be unregistered (and should be at end of the program).
Added registration of handler error messages.
Added a new mi_print_error() macro and a new
mi_report_error() function, which supply error
messages with a table name.
Added calls to mi_print_error() or mi_report_error()
at all places in MyISAM, where table corruption is detected.
2004-12-23 20:11:38 +01:00
monty@mishka.local
4f4bbfc279
Merge with 4.1
2004-12-22 13:54:39 +02:00
konstantin@mysql.com
7c369a240b
More work on truncations in libmysql: after-review fixes.
2004-12-18 03:42:28 +03:00
konstantin@mysql.com
7055fc5122
Truncations patch: a post-review fix.
2004-12-18 00:17:25 +03:00
konstantin@mysql.com
ad604b1811
Fixing compile-time failures in recently pushed code (aCC, Sun Studio)
...
(Bug#7381)
2004-12-17 20:22:13 +03:00
konstantin@mysql.com
3afd1939f7
Portability fix in libmysql (FreeBSD)
2004-12-16 12:43:02 +03:00
konstantin@mysql.com
7216594f4f
Data truncation reporting implementation (libmysql) + post review
...
fixes. Still to do:
- deploy my_strtoll10 in limbysql.c
- add mysql_options option to switch MYSQL_DATA_TRUNCATED on and off.
2004-12-16 03:15:06 +03:00
georg@beethoven.local
8482a2fc50
fix for bug #7285 : Disable start of embedded server when need to
...
connect to an external server with mysqld.
2004-12-15 12:36:01 +01:00
konstantin@mysql.com
91457448c2
A fix of return value of mysql_stmt_bind_result() and cleanup.
2004-12-15 01:37:22 +03:00
anjuta@arthur.local
f9451974be
WL#1051, more maintanable error messages.
2004-12-13 22:51:54 +02:00
ram@gw.mysql.r18.ru
41a509ba86
A fix (bug #7129 : Test failure: 'type_ranges' when using '--ps-protocol'
...
bug #7126 : Test failure: 'func_str' when using '--ps-protocol'
bug #7130 : Test failure: 'type_uint' when using '--ps-protocol').
2004-12-10 20:07:00 +04:00
guilhem@mysql.com
eac128ef2d
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0-clean
2004-12-09 15:42:06 +01:00
guilhem@mysql.com
1cbc904c59
Changing the default of libmysqlclient : it's now NO reconnection.
...
All our programs which use mysql_real_connect() and mysql_connect() are updated accordingly, though I have deliberately
made mysqlimport not reconnect anymore (already true for mysqldump >= 4.1.8).
All Connector devs have been warned about the change I'm doing here - which was agreed with Monty,
and fixes BUG#2555.
2004-12-09 14:44:10 +01:00
Sinisa@sinisa.nasamreza.org
a90da35fe6
Fix for a bug #6996
2004-12-07 19:12:29 +02:00
monty@mysql.com
77207d19f2
Merge with new VARCHAR code
2004-12-06 19:18:35 +02:00
monty@mysql.com
67ce247965
Add support for up to VARCHAR (size up to 65535)
...
Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
Added support for VARCHAR KEYS to heap
Removed support for ISAM
Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
Internal temporary files can now use fixed length tables if the used VARCHAR columns are short
2004-12-06 02:00:37 +02:00
serg@serg.mylan
2d3dd65cc1
merged
2004-11-20 18:36:41 +01:00
dlenev@mysql.com
cb7e272e46
Manual merge of fix for bug #6266 "Invalid DATETIME value is not handled
...
properly" with main tree.
2004-11-19 18:35:36 +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
monty@mysql.com
addd1a0da8
Merge with 4.1
2004-11-12 19:58:24 +02:00
monty@mysql.com
9252656d49
merge with 4.0
2004-11-12 11:17:53 +02:00
monty@mysql.com
1087186657
Merge with 4.1 to get new thd->mem_root handling
2004-11-08 17:53:32 +02:00