pem@mysql.com
6e717133c5
Merge 4.1 to 5.0
2003-12-01 16:14:40 +01:00
monty@mysql.com
a7610584d6
Merge mysql.com:/my/mysql-4.0 into mysql.com:/my/mysql-4.1
2003-11-28 20:44:26 +02:00
monty@mysql.com
cad6b7c8be
rpl_parse and rpl_probe don't have to be reset as they are already 0
2003-11-28 20:41:33 +02:00
serg@serg.mylan
d2e065022f
"optimization cleanup" reverted - problems on rpl_redirect test.
...
It happens that mysql->client_next->client_next=mysql
and mysql_close() goes into infinite loop.
Results vary from simple sigsegv (FreeBSD), to hard system lockup (Linux)
:)
2003-11-28 18:15:58 +01:00
monty@mysql.com
5914033478
merge with 4.0 to get fix for range bug
2003-11-28 15:55:43 +02:00
konstantin@mysql.com
3b9eb09276
no need to zero-initialize mysql->master->{rpl_pivot, options.rpl_parse,
...
options.rpl_probe} as they are zero-initialized in spawn_init()
2003-11-28 01:57:05 +03:00
konstantin@mysql.com
48ef39ee65
cleanup:
...
no need to set rpl_parse, rpl_probe and rpl_pivot to zero as whole mysql
structure is bzeroed in mysql_init(0) few lines before
2003-11-28 01:54:34 +03:00
monty@mysql.com
d87494c5ac
Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file.
...
Updated project files for windows
Made rpl_change_master.test portable
Ensure that mutex are not freed if not initilized
2003-11-22 03:21:40 +02:00
monty@mysql.com
7c6113a39f
Merge key cache structures to one
...
Fixed compiler warnings (IRIX C compiler and VC++)
2003-11-20 22:06:25 +02:00
monty@mashka.mysql.fi
ac76198330
Portability fixes for AIX43
2003-11-20 02:48:09 +02:00
monty@mashka.mysql.fi
0bd17351ca
Changed mysql_next_result() to return int instead of bool
...
Changed ~Item_func_in() to call cleanup() (to fix memory leak)
Fixed test_multi_statements() test in client_test
2003-11-19 17:31:57 +02:00
pem@mysql.com
28a2c6a96b
Merging 4.1->5.0.
2003-11-19 15:19:46 +01:00
monty@mashka.mysql.fi
cab1dc628c
CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
...
New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables.
ALTER TABLE table_name ... CHARACTER SET ... now changes all char/varchar/text columns to the given character set
(One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set)
Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib)
New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones)
Removed compiler warnings
Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag.
2003-11-18 13:47:27 +02:00
guilhem@mysql.com
c1f7f33960
4 small items in this:
...
- when we don't have in_addr_t, use uint32.
- a forgotten initialization of slave_proxy_id in sql/log_event.cc (was not really "forgot", was
"we needn't init it there", but there was one case where we needed...).
- made slave_proxy_id always meaningful in THD and Log_event, so we can
rely more on it (no need to test if it's meaningful). THD::slave_proxy_id
is equal to THD::thread_id except for the slave SQL thread.
- clean up the slave's temporary table (i.e. free their memory) when slave
server shuts down.
2003-10-31 23:20:23 +01:00
pem@mysql.com
337238b78a
Merging 4.1->5.0
2003-10-22 16:10:22 +02:00
monty@mashka.mysql.fi
e87c9f5ff8
merge with 4.0
2003-10-16 03:08:40 +03:00
monty@mashka.mysql.fi
9ef2a83fbe
Portability fixes for windows
...
After merge fixes
2003-10-15 22:40:36 +03:00
monty@mashka.mysql.fi
84d9d98078
Better fix for CREATE TABLE IF NOT EXISTS ... SELECT
...
Fixed chsize() problem on windows
Extend default timeout on windows clients to 1 year (to avoid timeout problems)
2003-10-15 21:41:13 +03:00
monty@narttu.mysql.fi
6056cfadfc
Merge with 4.0.16
2003-10-07 15:42:26 +03:00
hf@deer.(none)
8bc13b1874
Fix for bugs #1437 , #1446
2003-10-04 19:28:08 +05:00
pem@mysql.com
8d884c02bb
Merging 4.1 -> 5.0
2003-09-24 11:29:38 +02:00
lenz@kallisto.local
5ce5a68b4e
- Code cleanup: replaced C++-style comments with the proper syntax for
...
.c files (the IBM Visual Age C compiler aborts with a syntax error
on these)
2003-09-24 08:35:02 +02:00
monty@narttu.mysql.fi
f05a1c8394
Block SIGPIPE also for not threaded client programs.
...
Added --include and --libs_r options to mysql_config.
Added mysql_get_client_version() to client library
Fixed some minor benchmark issues
2003-09-23 13:36:01 +03:00
hf@deer.(none)
cda32e123c
SCRUM
...
prepared statements in embedded library.
some fixes after testing
2003-09-19 14:05:28 +05:00
hf@deer.(none)
0e059dcb74
SCRUM:
...
embedded library
I decided to get rid of #define mysql_some_function in mysql.h
It puzzles users and makes problems with dynamic libraries
Finally, there are only two functions left, that are covered with
the #define-s and it won't hurt performance at all
2003-09-18 18:28:42 +05:00
hf@deer.(none)
ddbca4176d
SCRUM:
...
prepared statements in embedded library
2003-09-17 20:48:53 +05:00
hf@deer.(none)
7a763f3fe3
SCRUM
...
prepared statements in embedded library
2003-09-17 15:18:18 +05:00
hf@deer.(none)
bf017a2eb0
SCRUM
...
Prepared statements in embedded server
Several changes in library code with two goals:
to make mysql_prepare_stmt working in embedded server
to get rid of #define mysql_interface_func mysql->methods->interface_func
in user's interface
2003-09-16 16:06:25 +05:00
hf@deer.(none)
e63e2229b6
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-09-12 19:36:42 +05:00
hf@deer.(none)
9f3996cde9
SCRUM:
...
#977 Prepared statements in embedded library
2003-09-12 19:35:34 +05:00
monty@mashka.mysql.fi
7538242e4f
merge with 4.1 tree
2003-09-11 20:31:40 +03:00
monty@mashka.mysql.fi
45aa92c574
After merge fixes.
...
Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)
2003-09-11 19:06:23 +03:00
hf@deer.(none)
f434b329f5
SCRUM
...
embedded&client library
some fixes: zero at the end of the data added
mysql_list_fields became 'virtual'
2003-09-11 09:46:31 +05:00
monty@narttu.mysql.fi
4b3b4b9250
merge
2003-09-03 19:53:08 +03:00
serg@serg.mylan
2317fa3ba5
C cleanups
2003-09-03 16:31:01 +02:00
kostja@oak.local
36dd82c1d5
merge commit, hope that none of bar and dlenev changes were
...
lost.
2003-09-03 14:12:10 +04:00
monty@narttu.mysql.fi
77a70a0a24
merge with 4.0.15
2003-08-29 13:44:35 +03:00
pem@mysql.com
7f158dd12a
Merge 4.1 into 5.0
2003-08-26 11:51:09 +02:00
monty@narttu.mysql.fi
efa85aad49
Move test that uses many tables (in query_cache.test) to separate test so that we can get it 'skipped' instead of 'failed' on system where we can't open many files.
2003-08-22 04:07:40 +03:00
monty@mashka.mysql.fi
4f7512160b
After merge fixes
...
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
2003-08-19 00:08:08 +03:00
monty@mashka.mysql.fi
2263e3e51f
Merge with 4.0.14
2003-08-11 22:44:43 +03:00
kostja@oak.local
50d3291aee
manual merge
2003-07-31 17:11:52 +04:00
hf@deer.(none)
a4f899dfc0
SCRUM - adding client into embedded server
...
error handling fixed
fetch_lengths made to work differently in embedded and client cases
2003-07-23 15:23:20 +05:00
kostja@oak.local
09e53b0169
Style fixes, comments for 4.1.1 authorization
...
Now special 1-byte packet is used for request of old password
Fixed bug with --skip-grant-tables and acl_getroot
2003-07-18 18:25:54 +04:00
hf@deer.(none)
cbff55a59d
SCRUM
...
Including client code into embedded library
fixes
2003-07-18 16:26:35 +05:00
hf@deer.(none)
6b303f846b
Including client code into libmysqld
...
Merging
2003-07-14 16:41:58 +05:00
hf@deer.(none)
1b1a126aa1
Some mistakes fixed
2003-07-14 16:38:51 +05:00
kostja@oak.local
941a8623ca
resolved conflict with pulled changeset
2003-07-09 18:24:43 +04:00
pem@mysql.telia.com
9c3a7a6ba3
Merge 4.1 into 5.0 (first pass).
2003-07-08 17:50:23 +02:00
venu@myvenu.com
bb718b31d0
implementation of mysql_stmt_reset client end
2003-07-08 02:27:21 -07:00
