Commit graph

190 commits

Author SHA1 Message Date
monty@mashka.mysql.fi
68a159b1fa New 4.1 protocol; SQLSTATE, CLIENT_MULTI_RESULTS, client character set 2003-05-26 19:01:20 +03:00
venu@myvenu.com
08e10a976a Added mysql_fetch_column function
Added MYSQL_TYPE_NULL as a dummy bind case for fetch buffers
Fix for offset based re-fetch using mysql_fetch_column
Misc cleanups for ODBC compatibility
2003-05-20 23:41:15 -07:00
hf@deer.mysql.r18.ru
d69b5c4d69 SCRUM
Protocol_cursor task
net_field_length definitions trimmed with Monty's suggestions
2003-04-28 14:25:29 +05:00
hf@deer.mysql.r18.ru
ca02714715 SCRUM
Protocol_cursor class and sql-common/ directory
2003-04-23 19:37:33 +05:00
venu@myvenu.com
077d7e81c8 Fix broken windows distribution workspace file (libmysql.dsp), which is causing VC IDE to crash while loading
Remove ctype_latin1_de.c from respective dsp files
Fix to make_win_src_distribution.sh to delete all newly added IS Bitkeeper files
2003-04-16 11:49:52 -07:00
venu@myvenu.com
5cdcbb5782 Added the support of statement result navigation APIs 2003-04-16 00:07:10 -07:00
monty@mashka.mysql.fi
90bf074438 Merge with 4.0.11 tree to get latest bug fixes 2003-02-17 05:43:37 +02:00
monty@mashka.mysql.fi
6051b2f998 Fixed multi-table-delete for InnoDB tables
Novell patches
2003-02-17 02:14:37 +02:00
monty@mashka.mysql.fi
e327393e9d Fixed a lot of wrong memory references as reported by valgrind
Portability fixes
Added new client function: mysql_get_server_version()
New server help code (From Victor Vagin)
Fixed wrong usage of binary()
Disabled RTREE usage for now.
2003-02-12 21:55:37 +02:00
monty@mashka.mysql.fi
25de9c19b2 After merge fixes & remove compiler warnings
Added lengths for all MYSQL_FIELD string parameters
Changed field length to 2 byte in .frm files
2003-02-07 15:47:24 +02:00
monty@mashka.mysql.fi
023d6dd39b Merge with 4.0.11 2003-02-04 21:52:14 +02:00
monty@mashka.mysql.fi
303c3e30ab Added charset number to result header 2003-02-04 03:19:19 +02:00
monty@mashka.mysql.fi
689578a099 Fixes for Netware
Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL
2003-01-28 08:38:28 +02:00
venu@myvenu.com
6af9b46e5f Remove un-used variables
Pure coverage tests (debug only)
2003-01-25 22:52:45 -08:00
venu@myvenu.com
67579f4c48 MYSQL_TIME handling - client
Remove get_binary_length 
Enable the clients to work wih date,time and ts directly with binary protocol
2003-01-23 22:36:27 -08:00
venu@myvenu.com
93d4055e21 Remove bind_length + Fix the client-test 2003-01-22 01:30:13 -08:00
monty@mashka.mysql.fi
7436e9ec97 Merge 2003-01-21 21:28:51 +02:00
monty@mashka.mysql.fi
25c393a12e Portability fixes (for windows)
Some changes to the prepared statement protocol to make it easier to use and faster.
2003-01-21 21:07:59 +02:00
hf@deer.mysql.r18.ru
389680e04e Conflicts resolving 2003-01-20 18:59:45 +04:00
venu@myvenu.com
a39da98d0d Initial multi query execution support 2003-01-18 11:53:38 -08:00
monty@mashka.mysql.fi
8acc22296c Change client_flag to unsigned long (16 -> 32 bits) to handle more options.
Don't use new password format if mysql.user has old format
tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
Portability fixes for Windows
2003-01-18 16:39:21 +02:00
venu@myvenu.com
370b88f94c Implement store_result (read_binary_rows & mysql_stmt_store_result) 2003-01-16 15:00:22 -08:00
hf@deer.mysql.r18.ru
96089e2b3a resolving conflicts 2003-01-15 13:15:35 +04:00
venu@myvenu.com
045b2f2336 Remove/change unwanted variables in client protocol
Add missed mysql_stmt_affected_rows()
sql_yacc.yy : Fix the compilation error .. bison 1.75
2003-01-09 17:56:34 -08:00
venu@myvenu.com
c22219563a Code cleaup to fix the conversion routines - binary protocol 2003-01-07 18:57:39 -08:00
monty@mashka.mysql.fi
803dff1002 Merge with 4.0.8 2003-01-06 02:04:52 +02:00
monty@mashka.mysql.fi
f9772317ee merge 2003-01-04 15:40:55 +02:00
monty@mashka.mysql.fi
6d6f051178 Added support for DROP TEMPORARY TABLE
Removed mysql_warnings() API function.
Post merge fixes.
2003-01-04 15:37:20 +02:00
monty@mashka.mysql.fi
6d5ad61a11 Added support for max_allowed_packet in option files read by mysql_option()
Extended max_allowed_packet for clients to 1G
Fixed bug in sending compressed rows >= 16M
Fix bug in skiping too long packets from clients.
Added checking of wrong command number sent by client.
2003-01-04 15:17:16 +02:00
venu@myvenu.com
5f4a7c1971 Missed commit 2003-01-03 04:12:34 -08:00
hf@deer.mysql.r18.ru
bb67600df4 Merging 2002-12-17 19:57:23 +04:00
vva@eagle.mysql.r18.ru
f3871cf9b4 Many init commands on connect 2002-12-17 19:13:07 +04:00
hf@deer.mysql.r18.ru
e3b3b68307 Big purge about embedded library (scrum) 2002-12-16 17:33:29 +04:00
hf@deer.mysql.r18.ru
3517febe97 Resolving merge conflicts 2002-12-12 12:49:56 +04:00
peter@mysql.com
08f51eaedd Merging.... 2002-11-29 22:03:14 +03:00
hf@genie.(none)
5e8b27c0d3 Pull conflicts resolutions 2002-11-29 12:35:48 +04:00
bar@bar.mysql.r18.ru
24cf562ec5 mysql.h:
renamed arg name to avoid a warning that it shadows global variable
2002-11-29 10:17:43 +04:00
venu@myvenu.com
e01a6c832d select_test.c, insert_test.c:
Added my_global.h to compile after my_list.h is added to mysql.h
sql_prepare.cc:
  Handle close stmt from client
  Minor fixups to make SET variable=? to work
sql_parse.cc:
  Added missed COM_CLOSE_STMT
mysql_priv.h:
  Change mysql_stmt_close to mysql_stmt_free to not to conflict with client type
libmysql.c:
  Clean all open stmts during mysql_close() implicitly
2002-11-26 18:51:38 -08:00
peter@mysql.com
d2aa1fb8e7 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-11-24 17:35:24 +03:00
peter@mysql.com
925155cf5a Merge.... 2002-11-24 17:26:26 +03:00
peter@mysql.com
35ccfd0b42 SCRUM: Main change for Secure connection handling. Still needs some more coding. Commit
done for merge with newer version of code.
2002-11-24 17:07:53 +03:00
venu@myvenu.com
ec17cac968 Missed include/ files 2002-11-22 11:58:20 -08:00
wax@mysql.com
e91d1b2cbe Add shared memory protocol and option --protocol 2002-11-15 00:16:30 +05:00
hf@genie.(none)
8a88791fb1 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/hf/work/mysql-4.1
2002-10-18 15:55:21 +05:00
monty@narttu.mysql.fi
da2abaf887 Portability fixes to be able to compile MySQL with VC++ 2002-10-08 22:28:24 +03:00
hf@genie.(none)
55866b0615 Huge pull 2002-10-07 15:38:07 +05:00
bar@bar.mysql.r18.ru
2dae97b139 Failed to compile on FreeBSD:
no ulong type, one should use unsigned long instead
2002-10-03 13:12:31 +05:00
monty@mashka.mysql.fi
d69250a969 Fixes and code cleanups after merge with 4.0.3
Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()

Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22
2002-10-02 13:33:08 +03:00
monty@narttu.mysql.fi
7134ffec21 Merge with 4.0.3
Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)
2002-08-30 12:40:40 +03:00
monty@hundin.mysql.fi
7dac7062fa Changed relay_log_space to ulonglong
Removed compiler warnings.
2002-08-23 15:14:01 +03:00
monty@hundin.mysql.fi
8a2daeac77 Removed mysql_ssl_clear()
Added statistics information for alarms (for bug tracking)
Don't store "incomplete" in the xxx.cfg file if we are not using --restart. (Crash-me)
Enlarged STACK_BUF_ALLOC becasue of failed crash-me test
Aded new script mysql_tableinfo to make a system directory.
2002-06-27 11:27:04 +03:00
hf@bison.(none)
94e4fb9db4 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into bison.(none):/home/hf/work/mysql-4.1
2002-06-18 20:36:28 +05:00
bar@gw.udmsearch.izhnet.ru
eeb8161072 All instances of "ulong" were replaced with "unsigned long" for portability reasons.
Failed to compile at least on freebsd.
2002-06-17 19:20:35 +05:00
hf@bison.(none)
cc6407f1a5 Resolving of conflicts from pull 2002-06-17 17:14:20 +05:00
hf@bison.(none)
ede6ba5621 Removing net emulation out of embedded library 2002-06-17 16:24:51 +05:00
venu@myvenu.com
75959e6e26 Client-Server Protocol 4.1 changes - Client side:
- Support of prepared execution
  - Support of Original Table and Column names
  - Support of direct transactional API
  - And lot of misc handling

  (Note that, the pull will not work, unless you have the Server side changes also which will be followed by this commit)
2002-06-12 13:47:32 -07:00
bell@sanja.is.com.ua
cc08da4f4f my_alloc.h included in installation 2002-04-20 00:00:29 +03:00
bell@sanja.is.com.ua
486c9c3ccb allocated bigger blocks if it needed 2002-04-13 12:08:12 +03:00
monty@hundin.mysql.fi
d80ebc17d6 Cleanups
Don't use DBUG library for struct st_my_thread_var to make code less complicated.
2002-04-02 17:54:57 +03:00
monty@hundin.mysql.fi
e070e9a01f merge with 3.23.49 2002-02-14 18:58:24 +02:00
monty@tik.mysql.fi
1f9b1e1915 Made LOAD DATA LOCAL INFILE more secure 2002-02-13 21:53:26 +02:00
monty@hundin.mysql.fi
b658662ae4 Update copyright
Fixed memory leak on shutdown (Affects the embedded version & MyODBC)
2001-12-06 14:10:51 +02:00
monty@hundin.mysql.fi
ccce9d031f Added STDCALL to mysql_sever and mysql_thread variables
Merged error messages with 3.23.44
Fixed bug with DATA DIRECTORY on windows
2001-11-03 21:33:11 +02:00
sasha@mysql.sashanet.com
2d3f96b483 changed manager to use my_net_*
fixed bug in master - unregister slaves when they disconnect
2001-10-12 09:37:25 -06:00
monty@hundin.mysql.fi
938a8dc2ef merge 2001-10-08 05:36:35 +03:00
monty@hundin.mysql.fi
88aff4bf85 Updated manual about embedded version.
Speed up column-completion in 'mysql'
Don't use ISAM if HAVE_ISAM is not defined
A lot of fixes for the embedded version.  All libraries are now included in libmysqld.a
Changed arguments to convert_dirname() to make it more general.
Renamed files in the 'merge' directory to all use a common prefix.
Don't compile both assembler and C functions on x86
2001-10-08 04:58:07 +03:00
sasha@mysql.sashanet.com
a71f818aa2 Merge 2001-10-04 15:46:04 -06:00
monty@hundin.mysql.fi
e801235019 New script: explain_log.sh
Portability fixes.
Handle cleanup when we get an error before the message file is read.
Fix bug in multi-table delete
2001-10-04 21:52:41 +03:00
monty@hundin.mysql.fi
62c8014171 Fixed some build problems.
Fix that compressed packets and normal packets looks indentical before calling net_real_write()
(Needed for query cache)
Optimize IS NULL handling
2001-10-04 02:44:18 +03:00
sasha@mysql.sashanet.com
c0f87c836a merged 2001-10-03 14:21:16 -06:00
monty@hundin.mysql.fi
880026ccf6 Cleaned up SSL documentation
Fixes for embedded server
Made key_cache more configurable
Fixed that one can change key blocksize in MyISAM
A lot of optimizations to make MyISAM slightly faster
2001-10-02 05:53:00 +03:00
tonu@volk.internalnet
5658ff8237 SSL compiles and works as far as can see. Continue testing.. 2001-09-30 10:46:20 +08:00
sasha@mysql.sashanet.com
eccda8f86d merged 2001-09-22 21:51:17 -06:00
monty@hundin.mysql.fi
e390a99573 Added support of INSERT to MERGE tables
Fixes for embedded libary and openssl
2001-09-22 17:40:57 +03:00
sasha@mysql.sashanet.com
545a2af56a merged 2001-09-19 14:39:11 -06:00
sasha@mysql.sashanet.com
2038a46e92 fixes for MYSQL manager 2001-09-19 14:30:43 -06:00
monty@work.mysql.com
eb9cbe2cba merge 2001-09-17 23:26:00 +02:00
monty@hundin.mysql.fi
56cc14ab4c Added unique error for DEADLOCK
Include missing man pages into binary distribution
2001-09-17 23:43:53 +03:00
monty@hundin.mysql.fi
295107457f Fixed bug with SELECT * ... UNION 2001-09-17 15:40:03 +03:00
tonu@x153.internalnet
102cabfe4a Fixed compilation problems when HAVE_OPENSSL is not defined 2001-09-01 23:29:58 +08:00
tim@black.box
a1a834a650 Embedded mysql fixes.
There is now a mysql_server_init() function which needs to be
called at the beginning of the program (and _end() for the end
of the program).  This routine handles argument parsing for the
embedded server.

Use the embedded version of mysql_load_file() (ignore the LOCAL
argument, since the client and server are the same program).

There are now mysql_thread_init/end() functions for the client
to use in a multi-threaded app.  They are just wrappers for
my_thread_init/end().
2001-08-10 12:37:36 -04:00
monty@tik.mysql.fi
fc81fdb4ba Redefinition of myisam_bulk_insert_tree_size
Removed new error message
Fixed test case for varbinary
Threads are again killable in "merge_buffers"
Cleanup of sql_repl.cc
SHOW OPEN TABLES now works when no tables are opened
2001-07-10 15:53:08 +03:00
sasha@mysql.sashanet.com
24f89c754a auto-magic replication redirection logic support in the client,
compiles, passes test suite, does magic, has bugs, but none that I know 
at this point. Have not tested everything yet, though. Changed
a lot of code in the client, but normal stuff appears to be working.
2001-06-08 19:24:41 -06:00
sasha@mysql.sashanet.com
1d05b89980 some code for replication awareness support - this is a temporary
commit - it compiles, and test suite still passes, but it is not finished . The
purpose of the commit is backup/code sharing/code review
2001-06-02 20:02:43 -06:00
monty@donna.mysql.fi
1e3df575b9 Fixed probelm with count(*) and normal functions when no matchin rows.
Changed 'lib' to 'master-data'
Fix for slow slaves
2001-04-21 17:12:59 +03:00
monty@donna.mysql.fi
bda3e09935 Merged some functions and removed some unused client functions.
Remember UNION for ALTER TABLE
Added test for if we are supporting transactions.
Don't allow REPLACE to replace a row when we have generated an auto_increment key
Fixed bug when using BLOB keys
Fixed bug in SET @variable=user.
2001-03-06 15:24:08 +02:00
sasha@mysql.sashanet.com
634ba86ad7 client/mysqltest.c
added send/reap/dirty_close
include/mysql.h
    mysql_send_query()/mysql_reap_query()
libmysql/libmysql.c
    mysql_send_query()/mysql_reap_query()
mysys/my_vsnprintf.c
    fixed critical bug that codedumped when connection aborted
sql/sql_parse.cc
    0
mysql-test/r/dirty-close.result
    New BitKeeper file ``mysql-test/r/dirty-close.result''
mysql-test/t/dirty-close.test
    New BitKeeper file ``mysql-test/t/dirty-close.test''
2001-01-19 22:40:16 -07:00
monty@donna.mysql.com
2776500c22 Update to new root alloc, OPTIMIZE TABLE and some other changes 2000-09-12 03:02:33 +03:00
monty@donna.mysql.com
4496d43faa Quoting of TIMESTAMP columns and small optimizations 2000-09-02 07:58:42 +03:00
bk@work.mysql.com
f4c589ff6c Import changeset 2000-07-31 21:29:14 +02:00