ramil@mysql.com
ac2efb1300
Fix for bit type:
...
we have to handle bit fields as well.
2005-04-04 16:33:23 +05:00
gbichot@quadita2.mysql.com
32f1e3b029
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-03-24 15:44:50 +01:00
gbichot@quadita2.mysql.com
5acca04c7c
merge from 4.1
2005-03-24 14:32:40 +01:00
konstantin@mysql.com
a8c1316c6b
Manual merge
2005-03-24 15:17:39 +03:00
konstantin@mysql.com
fd54ee4539
Fixes and test cases for Bug#8880 "Commands out of sync error with cursors"
...
and Bug#9159 "Server crash during mysql_stmt_close".
The patch adds support for single-row result sets in cursors.
2005-03-24 15:12:53 +03:00
serg@serg.mylan
5c0b772838
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-23 21:37:56 +01:00
gbichot@quadita2.mysql.com
19499229ed
"After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication":
...
s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late);
no message on error log (deadlock is too common sometimes), a global counter
instead (SHOW STATUS LIKE 'slave_retried_transactions').
Plus a fix for libmysql/Makefile.shared
2005-03-23 19:19:36 +01:00
georg@lmy002.wdf.sap.corp
626fcc4390
added symbols mysql_server_init and mysql_server_end to allow windows
...
applications with embedded server to connect to external servers too.
(required for Connector/OO.org)
2005-03-23 10:18:43 +01:00
serg@serg.mylan
f4d4df2ca4
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-21 13:43:25 +01:00
jimw@mysql.com
ee2b4ec959
Eliminate warnings noticed by VC7. This includes fixing my_mmap() on
...
Windows to call CreateFileMapping() with correct arguments, and
propogating the introduction of query_id_t to everywhere query ids are
passed around. (Bug #8826 )
2005-03-18 16:12:25 -08:00
serg@serg.mylan
da27256e12
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-18 20:12:31 +01:00
jimw@mysql.com
22e5d9cc0a
Fix HP/UX debug compile error. (Bug #8679 )
2005-03-17 10:27:23 -08:00
serg@serg.mylan
376a4ee03b
Field::quote_data():
...
don't call escape_string_for_mysql() unnecesary
don't overwrite local buffer
escape_string_for_mysql():
take a length of the destination buffer as an argument
2005-03-17 12:27:45 +01:00
patg@krsna.patg.net
4b7bc748ea
WL #2094 Federated Storage Handler
...
This is the first changeset of suggested changes recommended in Kostja's
review of my patch, 1.1846, which includes only functionality changes.
Style changes/Documentation patch to follow.
2005-02-23 00:29:57 -08:00
monty@mysql.com
5e6ba9dec8
Fix errors in my last changeset
2005-02-22 15:08:12 +02:00
jani@ua141d10.elisa.omakaista.fi
a6106a0a67
Fixed Bug#7838, "pipe_sig_handler should be static".
2005-02-17 23:00:48 +02:00
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