Commit graph

664 commits

Author SHA1 Message Date
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
venu@myvenu.com
bb718b31d0 implementation of mysql_stmt_reset client end 2003-07-08 02:27:21 -07:00
kostja@oak.local
a232225b69 Preliminary support for options --secure-auth,
--old-passwords
Support for option --old-protocol was removed.
Some test performed.
Tests for SSL and replication are pending.
More strict following to specification for --old-passwords
is in the TODO.
2003-07-08 02:36:14 +04:00
kostja@oak.local
1d20b23247 Bug fixes for authentication
OLD_PASSWORD made a keyword to allow set password=old_password('abc') constructions.
2003-07-04 20:52:04 +04:00
hf@deer.(none)
9d4bae335c Resolving conflicts 2003-07-04 13:21:14 +05:00
hf@deer.(none)
c224b55835 SCRUM
Including client code into embedded library

Code trimming (fixes of comments etc)
2003-07-04 11:40:10 +05:00
monty@narttu.mysql.fi
be22700954 Fix for UNIXWARE 7
Remove unaligned warnings on Ia64 from client library when using --host
Fix for replication when using many file descriptors
2003-07-03 19:23:06 +03:00
kostja@oak.local
7df0475847 First version of new authentification procedure: now authentification is one-stage (instead of two-stage in 4.1)
For now following tasks have been done:
- PASSWORD() function was rewritten. PASSWORD() now returns SHA1
  hash_stage2; for new passwords user.password contains '*'hash_stage2; sql_yacc.yy also fixed; 

- password.c: new functions were implemented, old rolled back to 4.0 state

- server code was rewritten to use new authorization algorithm (check_user(), change
  user, and other stuff in sql/sql_parse.cc)

- client code was rewritten to use new authorization algorithm
  (mysql_real_connect, myslq_authenticate in sql-common/client.c)

- now server barks on 45-byte-length 4.1.0 passwords and refuses 4.1.0-style
  authentification. Users with 4.1.0 passwords are blocked (sql/sql_acl.cc)

- mysqladmin.c was fixed to work correctly with new passwords

Tests for 4.0-4.1.1, 4.1.1-4.1.1 (with or without db/password) logons was performed;
mysqladmin also was tested. Additional check are nevertheless necessary.
2003-07-01 23:40:59 +04:00
monty@narttu.mysql.fi
1bd306ccd4 Fixed some new memory leaks
Updated VC++ files
2003-06-24 12:10:35 +03:00
monty@narttu.mysql.fi
039554f38b Changed connect with timeout to use poll() instead if socket() to avoid problems with many open files 2003-06-23 23:32:07 +03:00
hf@deer.(none)
fed7a8d672 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-06-19 16:38:51 +05:00
lenz@kallisto.local
853c3dd77f - added libmysql/client_settings.h to distribution 2003-06-19 10:46:45 +02:00
hf@deer.(none)
7e1ce534c9 SCRUM
including client code into embedded server
code to guess what library to use added
net_field_length moved to pack.c
2003-06-18 15:58:57 +05:00
hf@deer.(none)
66ecacb3c3 Last part of resolving conflicts after pull
Some intersections with Monty encountered
2003-06-18 10:34:09 +05:00
hf@deer.(none)
b82e89d872 SCRUM
merged conflicts about my previous commit
it seems there are some errors left - gonna check...
2003-06-17 21:53:13 +05:00
hf@deer.(none)
c4e3a624b8 SCRUM
client capabilities included into libmysqld
some API methods became "virtual"
lots of duplicated code removed

IMHO all the above made library's code way more pleasant to look at, didn't it?
2003-06-17 21:32:31 +05:00
hf@deer.(none)
60a260d86d Fix for compilation error.
Compiler can signal error when init_sigpipe_variables expands as empty place.
Had to remove all semicolons after init_sigpipe_variables
2003-06-16 03:13:22 +05:00
monty@narttu.mysql.fi
a1034db4b9 Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1 master/slave will now use the 4.1 protocol
Fixed wrong value for SQLSTATE_LENGTH
Added CLIENT_REMEMBER_OPTIONS to mysql_real_connect()
Changed mysql_port and mysql_unix_port to mysqld_xxxx
2003-06-14 11:37:42 +03:00
venu@myvenu.com
d764294f12 Fix for mysql_list_fields & reset stmt buffers from stmt_free_result
Windows build fix
2003-06-08 09:11:14 -07:00
monty@narttu.mysql.fi
dad0664579 merge with public tree 2003-06-05 00:12:45 +03:00
monty@narttu.mysql.fi
40109c574a Merge with 4.0.13 2003-06-04 19:21:51 +03:00
monty@narttu.mysql.fi
23145cfed7 Added SQLSTATE to client/server protocol
bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86
2003-06-04 18:28:51 +03:00
monty@narttu.mysql.fi
6217b578b9 Fixed (not fatal) buffer overflow 2003-06-04 18:22:48 +03:00
venu@myvenu.com
c14de0f584 1. Portability fixups for Connector/ODBC 3.52 & DBD
(Addition of mysql_fetch_column & mysql_stmt_free_result)
 2. Windows build fixups for libmysqld, mysqlbinlog and mysqldemb
2003-06-04 00:17:48 -07:00
venu@myvenu.com
45fc8cc25b Fix windows build after applyiing the changes from new client.c(sql-common)
NOTE: Still the build fails to compile core server on Windows due to slave_net_timeout linker error from client.obj
      and make sure to have the next changeset, which fixes this.
2003-06-03 20:59:32 -07:00
hf@deer.(none)
9ad3c1cdca SCRUM:
splittiln common client's parts
2003-06-03 15:02:57 +05:00
hf@deer.(none)
02d3d7e8bd SCRUM:
Here is another pack of changes about gathering common client code in
sql-common/client.c.
Now i symlink the client.c from sql/ and libmysql/. These directories
have client_settings.h files to be included to client.c. It contains
defines and declarations to compile client.c in appropriate manner.
Also i've added include/sql_common.h, containing declarations of what
is exported from client.c

I removed as many #ifdef-s from client.c as i dared to. I think it's better
push it with some extra #ifdef-s now (of course, if everythihg besides it is
ok) so other people can check the code.
2003-05-31 15:15:46 +05:00
hf@deer.(none)
e5428b2fe9 Lots of conflicts resolved 2003-05-28 13:54:58 +05:00
monty@narttu.mysql.fi
bdb66d24dd ORDER BY optimization
Fixed new bug when reading field types
2003-05-27 18:40:37 +03:00
monty@mashka.mysql.fi
68a159b1fa New 4.1 protocol; SQLSTATE, CLIENT_MULTI_RESULTS, client character set 2003-05-26 19:01:20 +03:00
monty@mashka.mysql.fi
cb7061ebe4 merge 2003-05-22 02:57:27 +03:00
bar@bar.mysql.r18.ru
c03d807417 UCS2 and UTF8 are in separate files now 2003-05-21 15:29:44 +05:00
venu@myvenu.com
9ad75823e7 Fix for Windows build by adding pack.c to appropriate .dsp files 2003-05-20 23:44:28 -07: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
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
hf@deer.mysql.r18.ru
7a7e0e1575 SCRUM
common parts of libmysql.c and sql/mini_client.cc moved to sql-common/client.c
names of functions now are same in both cases
2003-05-02 21:07:41 +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
6120bc2bc7 Fix to have a reserved OK byte (prepare result) 2003-04-16 16:47:01 -07: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
miguel@hegel.local
63f911733b Exported functions required by MySQLCC 2003-04-16 11:43:04 -04:00
venu@myvenu.com
5cdcbb5782 Added the support of statement result navigation APIs 2003-04-16 00:07:10 -07:00
miguel@hegel.local
ca1f67c04e Exported functions claimed by MySQLCC 2003-04-11 14:48:03 -04:00
bar@bar.mysql.r18.ru
4e06f1f5bd German Phone book collation is always compiled
Some collation names have been renamed
2003-03-26 13:27:19 +04:00
monty@narttu.mysql.fi
b883a9c01c Merge with 4.0.12 2003-03-19 22:25:44 +02:00
lenz@mysql.com
04071da35a - renamed "rnd" to "my_rnd" as the name was too generic (and is an exported
symbol in libmysqlclient) (thanks to Dennis Haney for the initial patch)
 - cleanup: removed client/password.c (not used at all) and
   libmysql/password.c (should rather be a symlink to sql/password.c instead)
 - applied HPUX11 portability fix for char_val declaration to sql/password.c
   (taken from libmysql/password.c)
2003-03-18 22:14:02 +01:00
monty@narttu.mysql.fi
3ec97824b7 Change dbug.h -> my_dbug.h (Portability fix)
Ensure that \ is not allowed in filenames, even on Unix
2003-03-17 19:06:14 +02:00
monty@narttu.mysql.fi
a434bca704 Merge with 4.0 2003-03-16 19:17:54 +02:00
root@home.(none)
5c6c54c09a system_charset_info has been moved to /sql directory
and isn't used in libraries any longer
2003-03-16 12:30:10 +04:00
monty@narttu.mysql.fi
f1635f64f9 Merge with 3.23 to get fixes for --user and BACKUP TABLE 2003-03-10 12:48:43 +02:00
monty@narttu.mysql.fi
1101613414 Better fix for connect timeout problem. 2003-03-10 11:50:46 +02:00
Sinisa@sinisa.nasamreza.org
e3c64d30a5 Additional bug fix 2003-03-08 22:37:22 +02:00
Sinisa@sinisa.nasamreza.org
df1ebd2a25 A correct fix for the timeout problem 2003-03-08 19:35:44 +02:00
monty@narttu.mysql.fi
3b073a08e0 Portability fixes
Don't define crc32 if we are not linking with gzip
2003-02-27 03:44:44 +02:00
Sinisa@sinisa.nasamreza.org
8439a4949f merge fix 2003-02-22 17:14:50 +02:00
venu@myvenu.com
1bd3cb7350 Fix for mysql_stmt_close(), so that the PHP layer can map it easily to know whether the 'stmt' is really freed, so that they can free their internal stmts 2003-02-21 15:00:05 -08: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
venu@myvenu.com
0ceba0e5cf Fix to read the correct 'default value' 2003-02-15 17:08:18 -08:00
venu@myvenu.com
c52d1035a3 Updated tests for MYSQL_FIELD members for misc cases 2003-02-15 15:01:04 -08:00
Sinisa@sinisa.nasamreza.org
f2a8927db7 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-02-15 16:06:58 +02:00
monty@mashka.mysql.fi
acf8993439 Fixed problem when connecting to user without a password.
Fixed problem with LIKE and BINARY
2003-02-14 11:47:41 +02:00
Sinisa@sinisa.nasamreza.org
c75fa953e3 merge 2003-02-13 15:16:00 +02:00
monty@mashka.mysql.fi
3695c64111 Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2003-02-12 23:18:00 +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
Sinisa@sinisa.nasamreza.org
58f20edf9c connect timeout bug fix 2003-02-10 17:50:06 +02:00
monty@mashka.mysql.fi
60556efaca Update lengths for fields in MYSQL_FIELD 2003-02-08 01:00:35 +02:00
Sinisa@sinisa.nasamreza.org
08f2001e0c Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-02-07 14:57:15 +02:00
venu@myvenu.com
9aecb8d592 Fix compilation errors reported by Lenz on misc platforms 2003-02-06 14:47:56 -08:00
venu@myvenu.com
03fd42e601 Fix stupid signed and unsigned conversion - When field and buffer types are different (Client receiving end)
Added tests for singed and unsigned conversion (client_test.c)
2003-02-05 12:21:01 -08:00
Sinisa@sinisa.nasamreza.org
f825be63d0 a fix in libmysql.c 2003-02-05 22:13:06 +02:00
venu@myvenu.com
4e1d69d618 Conversion fix - bug report from PHP
Added a new conversion bug test
Changed options with default_options read from my.ini from [client] section
More cleanups for better usage
2003-02-04 18:54:14 -08: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
venu@myvenu.com
0aaab85f70 Force to read all unread packets on stmt_close 2003-01-31 15:20:03 -08:00
venu@myvenu.com
5c1d2a5626 Few misc cases check from PHP - client_test
Fix the buffer_length ovveride when length ptr is NULL - libmysql
2003-01-31 13:43:38 -08:00
venu@myvenu.com
2669ec02c4 Fix typo - un supported -> unsupported 2003-01-31 10:15:45 -08:00
venu@myvenu.com
87206f104a Fix alloc_stmt_fields for non-select statements
Add tests for show commands + MYSQL_TYPE_NULL coverage
2003-01-30 14:33:49 -08:00
venu@myvenu.com
81c580af37 Merge conflict 2003-01-30 01:02:57 -08:00
venu@myvenu.com
7e09f1db4b Fix 'n' concurrent prepared executions 2003-01-30 00:38:11 -08:00
bar@bar.mysql.r18.ru
735399a850 Move latin1 into a separarte file 2003-01-29 17:31:20 +04:00
bar@bar.mysql.r18.ru
08129eea2b Reorganization to restore generating charset C files from conf files 2003-01-29 15:08:09 +04:00
venu@myvenu.com
79e1fd8d0e Fix leak when the client disconnects with open prep statements 2003-01-28 09:24:27 -08:00
monty@mashka.mysql.fi
152f0603e7 Merge with 3.23.56 (Replace manual with 'empty' document)
Fix for bug when using auto_increment column and LAST_INSERT_ID()
2003-01-28 08:51:03 +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
monty@mashka.mysql.fi
9aa49681b8 Make PACKET_TOO_LARGE error handling safer in client 2003-01-28 02:10:56 +02:00
venu@myvenu.com
ca62e9f6a0 Fix stmt_close not to close the resources on error(libmysql)
Enable test_stmt_close() and test output to stdout(client_test)
2003-01-27 10:54:45 -08:00
monty@mashka.mysql.fi
1bdd1d0626 Merge with 3.23.55 2003-01-25 15:31:07 +02:00
venu@myvenu.com
bea75a4211 Misc cleanups + pure coverage test + Monty's comments 2003-01-24 03:17:26 -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
monty@mashka.mysql.fi
9af5e6b70a Avoid memory overruns when buffer_length is too small (when fetching binary data in prepared statements) 2003-01-23 21:49:28 +02:00
venu@myvenu.com
93d4055e21 Remove bind_length + Fix the client-test 2003-01-22 01:30:13 -08: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
Sinisa@sinisa.nasamreza.org
4f50b80274 a symlink that was missing ... 2003-01-21 17:30:42 +02:00
venu@myvenu.com
082f7c9bda Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/bk/src-4.1
2003-01-18 11:59:36 -08:00
monty@mashka.mysql.fi
46ec0c5d33 Removed compiler warnings 2003-01-18 21:55:01 +02: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
monty@mashka.mysql.fi
76f146a175 Merge with 4.0.9 2003-01-18 03:13:37 +02:00
venu@myvenu.com
51eb44c9e6 Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/bk/src-4.1
2003-01-16 15:47:46 -08:00
venu@myvenu.com
370b88f94c Implement store_result (read_binary_rows & mysql_stmt_store_result) 2003-01-16 15:00:22 -08:00
monty@mashka.mysql.fi
f4b950df96 Merge with 3.23 2003-01-16 20:47:46 +02:00
bar@bar.mysql.r18.ru
4f9d82700d strnto family functions now return error in a new argument 2003-01-16 17:17:07 +04:00
monty@mashka.mysql.fi
22b7e67b0b merge 2003-01-14 14:33:10 +02:00
monty@mashka.mysql.fi
7e9b27eaf5 Updates for multi-byte character sets
(Note: test 'union' fails, but Sanja promised to fix this)
2003-01-14 14:28:36 +02:00
miguel@light.
0928c8b4b4 Added functions required by MySQLCC 2003-01-11 01:56:00 -02:00
bar@bar.mysql.r18.ru
04ba0e85f0 xml.c has been moved to /strings from /mysys
This is to reuse code to generate charset related C files
from ther descriptions written in XML files
2003-01-10 17:01:55 +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
Sinisa@sinisa.nasamreza.org
e01bd0b26b Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-01-08 14:11:37 +02: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
Sinisa@sinisa.nasamreza.org
0ccaf94016 Fixing that 3.23 API / clients do not disconnect if a large
packet is issued.
2003-01-04 21:02:58 +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
bar@bar.mysql.r18.ru
259b79beac libmysql.c:
SLL -> SSL
2003-01-04 13:35:52 +04:00
venu@myvenu.com
fc7a1bfacf Fix date,time,timestamp,year - binary protocol 2003-01-03 23:37:16 -08:00
venu@myvenu.com
881c9808a4 Merge myvenu.com:/home/venu/bk/src-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-01-03 03:54:18 -08:00
venu@myvenu.com
5c4b7a2e96 Binary protocol changes (to monty) 2003-01-03 03:52:53 -08:00
bar@bar.mysql.r18.ru
c9000c247c Charset index is sotred in XML now 2003-01-03 14:35:32 +04:00
monty@mashka.mysql.fi
07daf3169e Merge with 4.0.8 2003-01-03 00:04:33 +02:00
lenz@mysql.com
fc8a78955b - fixes to properly make a "make distclean" (some files were not removed)
(There are probably some more to fix)
2002-12-27 17:37:55 +01:00
vva@eagle.mysql.r18.ru
6961e0069b fix some warnings 2002-12-21 02:53:07 +04:00
vva@eagle.mysql.r18.ru
9a0780cce0 fix warnings 2002-12-19 09:37:33 +04:00
vva@eagle.mysql.r18.ru
e5cc1ab97b Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1
into eagle.mysql.r18.ru:/home/vva/work/MANY_INIT_COMMANDS/4.1
2002-12-17 19:14:38 +04:00
vva@eagle.mysql.r18.ru
f3871cf9b4 Many init commands on connect 2002-12-17 19:13:07 +04:00
monty@mashka.mysql.fi
146814f2ea Merge with 3.23 2002-12-11 13:32:31 +02:00
monty@mashka.mysql.fi
53ac261312 Added back -max to server name if we are using InnoDB. 2002-12-11 12:59:55 +02:00
monty@mashka.mysql.fi
d3eb993a27 rename of net_pkg.cc to protocol.cc
Class for sending data from server to client (Protocol)
This handles both the old ( <= 4.0 ) protocol and then new binary protocol that is used for prepared statements.
2002-12-11 09:17:51 +02:00
venu@myvenu.com
9100688c17 item.cc:
Fix for save_in_field to take extra bool argumnet (4.0 merge compatibility)
2002-12-06 23:39:11 -08:00
monty@mashka.mysql.fi
f1d35b29bc merge fix 2002-12-06 21:15:05 +02:00
monty@mashka.mysql.fi
859b688476 Merge with 4.0.6 2002-12-05 19:38:42 +02:00
peter@mysql.com
dac10a8c81 Fix minor bug and add test of connection with new/old/without passwords 2002-12-05 14:01:15 +03:00
serg@serg.mysql.com
7b58a93a99 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2002-12-05 02:02:44 +01:00
peter@mysql.com
3ee8bee22f Basically minor code optimizations and cleanups 2002-12-05 03:55:29 +03:00
serg@serg.mysql.com
eb37c17d34 better fix for read_rows, same for read_one_row 2002-12-05 01:01:38 +01:00
serg@serg.mysql.com
44db958ba2 new client error added: CR_MALFORMED_PACKET 2002-12-04 17:37:51 +01:00
lenz@mysql.com
1935183975 - Portability fixes for HP compiler on HPUX11 (backport from 4.0 tree)
- sql_analyse.cc: Fixed bug in decimal handling
2002-12-04 16:16:06 +01:00
serg@serg.mysql.com
6dfd1d867e merged 2002-12-04 10:16:19 +01:00
serg@serg.mysql.com
615c94655d protect from [heap] buffer overrrun by malicious server 2002-12-04 01:26:32 +01:00
peter@mysql.com
a24258375a SCRUM: Montymise code
fix mysql_change_user() for old clients
2002-11-30 20:58:53 +03:00
peter@mysql.com
54ff0efe7c SCRUM: Secure auth
Implement mysql_change_user
Get rid of double user search at authentication
Some cleanups
2002-11-30 16:31:58 +03:00
peter@mysql.com
08f51eaedd Merging.... 2002-11-29 22:03:14 +03:00
monty@mashka.mysql.fi
78037ac6b5 Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2002-11-28 11:29:35 +02:00
monty@mashka.mysql.fi
a44dfdde2d Fix wrong increment in prepared statements handling 2002-11-28 11:28:49 +02:00
venu@myvenu.com
70abdf3a51 Merge myvenu.com:/home/venu/bk/src-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2002-11-26 18:54:17 -08: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
serg@serg.mysql.com
b385eb4a05 removed redundant -I include-dirs 2002-11-26 14:01:08 +01: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
93fdc6a584 libmysql.c:
fix merge conflict
2002-11-22 10:52:52 -08:00
venu@myvenu.com
47b51f613e merge 2002-11-22 10:21:29 -08:00
venu@myvenu.com
a9aebd433d protocol merge 2002-11-22 10:20:14 -08:00
venu@myvenu.com
b74c43f475 protocol fixups 2002-11-22 10:04:42 -08:00
monty@mashka.mysql.fi
dac6498f9b Merge with 4.0 2002-11-21 15:56:48 +02:00
monty@mashka.mysql.fi
f86d328927 Added some compatibility modes (for the future) 2002-11-20 21:44:32 +02:00
monty@mashka.mysql.fi
1a96948e81 Small improvement to alloc_root
Add support for LIMIT # OFFSET #
Changed lock handling:  Now all locks should be stored in TABLE_LIST instead of passed to functions.
Don't call query_cache_invalidate() twice in some cases
mysql_change_user() now clears states to be equal to close + connect.
Fixed a bug with multi-table-update and multi-table-delete when used with LOCK TABLES
Fixed a bug with replicate-do and UPDATE
2002-11-16 20:19:10 +02:00
wax@mysql.com
e91d1b2cbe Add shared memory protocol and option --protocol 2002-11-15 00:16:30 +05:00
monty@hundin.mysql.fi
b0fae584b9 Portability fixes for HP compiler and HPUX11 2002-11-09 13:26:46 +02:00
gluh@gluh.(none)
7bf903ea10 Error code for ssl connection
Fix bug when server hang(with SSL, with modified libmysql)
Add options master-ssl-capath and master-ssl-cipher
Add some error checking(SSL)
2002-11-05 12:05:58 +04:00
lenz@mysql.com
9b769dbd22 - replaced all occurences of HPUX with HPUX10 (to be prepared for eventual
differences in HPUX11)
2002-10-24 14:30:25 +02:00
peter@mysql.com
3d32b14de5 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-23 23:28:36 +04:00
bar@bar.mysql.r18.ru
6539c6a51f ctype.c, Makefile.am, Makefile.shared:
binary charset
ctype-bin.c:
  new file
2002-10-23 15:40:22 +05:00
peter@mysql.com
4825e3264d Merge to update to recent tree version 2002-10-20 00:09:11 +04:00
monty@narttu.mysql.fi
3c7f6a9835 merge 2002-10-14 12:07:16 +03:00
peter@mysql.com
5e873b2075 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-09 22:02:43 +04:00
bar@bar.mysql.r18.ru
50c391538a my_sortcmp -> my_strnncoll 2002-10-09 16:33:35 +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
peter@mysql.com
d21402052c One more commit to do the merge of new 4.1 tree 2002-10-06 13:42:16 +04:00
monty@mashka.mysql.fi
62a26cf891 Update after last merge. Fixes some wrong test results. 2002-10-03 16:54:26 +03:00
monty@mashka.mysql.fi
0f39457613 Merge with 4.0.4 2002-10-02 17:55:12 +03: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@mashka.mysql.fi
efaaf0b4b8 Updated VC++ project files for 4.0.4
Only write short usage if one starts mysqldump without any options
Added query cache on windows
Added error message if one can't read privilege tables
2002-09-24 17:11:59 +03:00
monty@mashka.mysql.fi
f3a186c905 Portability fixes.
Improve mysql-test to be more robust.
Fix that GRANT doesn't delete SSL options
Change innobase_flush_log_at_trx_commit to uint.
Don't rotate logs if we read a rotate log entry from the master.
2002-09-11 06:40:08 +03:00
monty@mashka.mysql.fi
a01a0840dc Some trivial optimzations
Check if AND/OR expression can be NULL; Fixed bug in GROUP BY and-or-expression where expression could be NULL
Bug fix for SHOW OPEN TABLES when user didn't have privilege to access all open tables.
Better fix for ALTER TABLE on BDB tables.
2002-09-03 15:44:25 +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@mashka.mysql.fi
7229f85340 Don't require call to mysql_ssl_set() to use ssl. 2002-08-25 22:40:49 +03:00
monty@mashka.mysql.fi
04723cf74d Give better error from reconnect()
Fixed hang in start_slave_threads() when thread dies quickly.
2002-08-24 05:44:16 +03:00
monty@hundin.mysql.fi
03b0179af9 Use our version of RWLOCKS on UNIXWARE 7
More DBUG info for replication
Better error messages from replication
Fixed bug in replication code when connecting to 'localhost' (time was not released properly)
Block ALARM signal on Linux for signal handler thread (Fixes problem with running mysqld with --debug)
Removed warning when setting an AUTO_INCREMENT field to NULL
2002-08-21 22:04:22 +03:00
monty@hundin.mysql.fi
a5edb20042 Fixed timing problem with rpl000001 replication test.
Fixed configure problems with HPUX and openbsd
SHOW SLAVE STATUS returns empty set if slave is not initialized
SHOW MASTER STATUS returns empty set if binary logging is not enabled.
Fixed shutdown problem on Solaris.
2002-08-18 16:04:26 +03:00
monty@hundin.mysql.fi
3ef9d44edc merge with 3.23.52 2002-08-12 04:04:43 +03:00
monty@hundin.mysql.fi
c99c1fd384 Changed IF(expr, column, NULL) to take type from column
Fixed some windows portability problems and removed some compiler warnings
 Cleaned up QUOTE() function and fixed bug in \0 and \Z handling.
2002-08-12 03:33:46 +03:00
monty@hundin.mysql.fi
b779b63862 Fixed problem with BIGINT and shutdown on AIX
Moved IF(test,column,NULL) code to 4.0
Changed mysys_priv.h to include my_pthread.h or my_no_pthread.h.
Removed some CR's in os2 files.
2002-08-12 03:28:02 +03:00
monty@hundin.mysql.fi
ac6e640c4d Fix for SSL and new my_getopt
Fix for syntax error bug in SET TRANSACTION ISOLATION
2002-08-09 16:47:16 +03:00
monty@hundin.mysql.fi
8832927d5c Added nety_retry_count as a changeable variable
Make safe_mysqld a symlink to mysqld_safe in binary distribution
Fixed problem with CTRL-C when using mysqld --bootstrap
2002-08-08 20:49:06 +03:00
monty@hundin.mysql.fi
77296b3f67 Fix after merge
Updated WEEK() and DATE information in the manual.
2002-08-08 16:41:04 +03:00
monty@hundin.mysql.fi
087261482a merge with 3.23.52 2002-08-08 15:24:47 +03:00
monty@mashka.mysql.fi
2c4fa340cc Lots of code fixes to the replication code (especially the binary logging and index log file handling)
Fixed bugs in my last changeset that made MySQL hard to compile.
Added mutex around some data that could cause table cache corruptions when using OPTIMIZE TABLE / REPAIR TABLE or automatic repair of MyISAM tables.
Added mutex around some data in the slave start/stop code that could cause THD linked list corruptions
Extended my_chsize() to allow one to specify a filler character.
Extend vio_blocking to return the old state (This made some usage of this function much simpler)
Added testing for some functions that they caller have got the required mutexes before calling the function.
Use setrlimit() to ensure that we can write core file if one specifies --core-file.
Added --slave-compressed-protocol
Made 2 the minimum length for ft_min_word_len
Added variables foreign_key_checks & unique_checks.
Less logging from replication code (if not started with --log-warnings)
Changed that SHOW INNODB STATUS requre the SUPER privilege
More DBUG statements and a lot of new code comments
2002-08-08 03:12:02 +03:00
monty@hundin.mysql.fi
5fadf19295 Fixed problem with make distcheck
Fixed bug in automatic repair of MyISAM tables where table cache was not locked properly
2002-08-06 22:20:11 +03:00
monty@mashka.mysql.fi
dddc20d9d1 New SET syntax & system variables.
Made a some new buffers thread specific and changeable.
Resize of key_buffer.
AUTO_COMMIT -> AUTOCOMMIT
Fixed mutex bug in DROP DATABASE
Fixed bug when using auto_increment as second part of a key where first part could include NULL.
Split handler->extra() to extra() and extra_opt() to be able to support thread specific buffers.
Don't write message to error log when slave reconnects becasue of timeout.
Fixed possible update problem when using DELETE/UPDATE on small tables
(In some cases we used index even if table scanning would be better)
A lot of minior code cleanups
2002-07-23 18:31:22 +03:00
monty@hundin.mysql.fi
ade20c5b19 Indentation cleanup & new comments 2002-06-28 09:18:23 +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
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
monty@mashka.mysql.fi
2aecdd1a91 Big code cleanup/review before 4.0.2 release.
(All commit emails since 4.0.1 checked)
This had to be done now, before the 4.1 tree changes to much, to make it easy to propagate bug fixes to the 4.1 tree.
2002-06-11 11:20:31 +03:00
monty@hundin.mysql.fi
f0b28da6f9 merge with 4.0 2002-06-03 12:59:31 +03:00
monty@hundin.mysql.fi
544f95c451 merge with 3.23 2002-06-02 20:46:03 +03:00
monty@hundin.mysql.fi
e2a116411e Portability fixes for SCO and HPUX
Change TRUNCATE(number) to truncate towards zero for negative numbers
Fix NULL handling for DESCRIBE table_name
2002-05-31 15:22:38 +03:00
jani@hynda.(none)
475bc6c3be Removed GNU getopt from MySQL distribution (replaced by my_getopt) 2002-05-22 18:16:54 +03:00
monty@hundin.mysql.fi
f5ed8784a2 merge with 3.23.51 2002-05-16 18:20:49 +03:00
monty@hundin.mysql.fi
353fb57b74 New my_gethostbyname_r() handling
Changed some status variable names
Fix bug in GRANT ... PASSWORD string
2002-05-16 16:32:51 +03:00
monty@hundin.mysql.fi
5080d64c6b Fix bug in SELECT SQL_CALC_FOUND_ROWS 2002-05-16 16:06:57 +03:00
monty@hundin.mysql.fi
48067f3cd6 Removed some long from mysqld comments (should be in manual). 2002-05-15 16:36:41 +03:00
monty@hundin.mysql.fi
9d0f8a1b5f Fixed that enable-reads-from-master and repl-parse-query works in option files.
Fixed slowdown problem on win98
Fixed syntax for ALTER TABLE .. RENAME
2002-04-29 12:24:14 +03:00
monty@tik.mysql.fi
e015f631fd Removed some old Makefiles to avoid name conflict on Mac OS X
Changed in client library character-set-dir -> character-sets-dir
2002-04-22 23:36:34 +03:00
monty@tik.mysql.fi
f94d84a9ec SHOW VARIABLES LIKE ... are now case insensitive
Fixed stack overflow checking with crash-me with gcc 3.0.4
Using @@unknown_variable doesn't hang client anymore
Added @@VERSION variable
2002-04-18 18:24:14 +03:00
bar@gw.udmsearch.izhnet.ru
00dee51604 New win1250ch charset 2002-04-17 14:16:26 +05:00
monty@hundin.mysql.fi
b5a145d872 merge 2002-04-13 15:34:39 +03:00
monty@tik.mysql.fi
9088383e0f merge 2002-04-12 21:53:41 +03:00
monty@tik.mysql.fi
056175a1ce Update for BTREE keys in HEAP tables
Split handler->option_flag() to handler->table_flags() and handler->index_flags()
2002-04-12 21:35:46 +03:00
sasha@mysql.sashanet.com
48af52bfc4 fixes to make it compile and pass the test suite again after the last
accidental push of broken code.
2002-04-04 21:36:24 -07: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
bar@gw.udmsearch.izhnet.ru
55e0a9cb01 New UTF8 charset 2002-03-28 17:31:46 +04:00
monty@hundin.mysql.fi
ce541b292a support for unsigned FLOAT/DOUBLE 2002-03-27 00:50:54 +02:00
bar@gw.udmsearch.izhnet.ru
1ebab2be72 Configure.in/Makefile.in charset related things are now earier to maintain
Fixes in charset related C++ code
2002-03-19 20:03:10 +04:00
bar@gw.udmsearch.izhnet.ru
b37ce8e769 New ctype functions/macros to support many charsets at a time 2002-03-12 21:37:58 +04:00
monty@hundin.mysql.fi
b5a4f89ea6 Portability fixes
Fix bug when using option groups
2002-03-06 22:12:08 +02:00
monty@hundin.mysql.fi
ed8fc0b0c6 Fix for --enable-local-infile 2002-03-06 22:06:18 +02:00
monty@hundin.mysql.fi
fa38c84be7 merge 2002-03-06 19:53:31 +02:00
bar@gw.udmsearch.izhnet.ru
a518b9f326 Charsets related things are prepared by configure in new way.
This is to simplify maintaining charsets, especially changing
CHARSET_INFO structure.
2002-03-06 17:44:43 +04:00
monty@tik.mysql.fi
539718ba25 Update scripts for new POSIX spec
Fix for --enable-local-infile
Portability fix for bison
2002-03-05 15:46:30 +02:00
Sinisa@sinisa.nasamreza.org
cdddb65460 Porting from mysql-4.0.
Read comments there if you are interested ..
2002-02-28 22:01:41 +02:00
Sinisa@sinisa.nasamreza.org
90629e2ccd many fixes 2002-02-28 21:58:32 +02:00
monty@hundin.mysql.fi
e070e9a01f merge with 3.23.49 2002-02-14 18:58:24 +02:00
monty@hundin.mysql.fi
fb44f7ce49 Fix for LOAD DATA LOCAL INFILE patch 2002-02-13 22:01:41 +02:00
monty@tik.mysql.fi
1f9b1e1915 Made LOAD DATA LOCAL INFILE more secure 2002-02-13 21:53:26 +02:00
miguel@light.local
558d88f977 Win32 Embedded Server Changes 2002-01-09 05:38:48 -02:00
monty@hundin.mysql.fi
4b877e0088 Added macros for nice TIMESPEC usage.
Fixes for building MySQL with gcc 3.0
Added SIGNED / UNSIGNED casts
Fixed core dump bug in net_clear() with libmysqld.
Back to using semaphores in query cache.
Added 'Null' and 'Index_type' to SHOW INDEX.
2002-01-02 21:29:41 +02:00
monty@hundin.mysql.fi
55a2ab6e7e Cleanup of alarm macros.
Fixed data corruption bug in query cache.
Made queries be dependent of the database in use.
2001-12-21 07:00:58 +02:00
monty@hundin.mysql.fi
1a4ac20bf9 Fixed bug in FLUSH QUERY CACHE
Changed 'send_file_to_server' to use less stack (Fixed replication problem on OSF1).
2001-12-19 15:45:04 +02:00
monty@hundin.mysql.fi
cb754eb5aa Fix after merge 2001-12-17 23:24:51 +02:00
monty@hundin.mysql.fi
12058c2996 Fixed bug in GROUP BY ... DESC 2001-12-10 17:51:07 +02:00
monty@hundin.mysql.fi
6b02f13cf3 Removed compiler warnings.
Added new operators to be used with gcc 3.0.x
Update of query cache code.
Added semaphores for Windows (not yet in use)
Added pthread_mutex_trylock for windows.
2001-12-10 00:08:24 +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
1de4fff5ba Update of query cache code.
Changed some sql_alloc() -> thd->alloc()
Removed a lot of compiler warnings on Linux Alpha (64 bit)
Fixed some core dumps on 64 bit systems (wrong type for packet_len)
2001-12-05 13:03:00 +02:00
sasha@mysql.sashanet.com
beaf95b09d work to enable reading 3.23 logs - not yet finished
moved fail-safe replication routines from sql_repl.cc to repl_failsafe.cc
write start event only in the first log
2001-11-10 22:24:12 -07:00
monty@hundin.mysql.fi
9285b745d6 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2001-11-07 00:14:43 +02:00
monty@hundin.mysql.fi
4c60b41954 Portability fix
Cleanup typos (like SKIPP -> SKIP)
2001-11-07 00:13:29 +02:00
tim@black.box
9d304d8c31 Merge 2001-11-06 07:50:58 -05:00
tim@black.box
34e2c4b2ab Do not print a warning message when the server's character set is
not found by the client.  This is especially important for PHP, which
only includes the latin1 character set in the bundled libmysql.
2001-11-05 19:15:45 -05:00
monty@hundin.mysql.fi
fd0780493d merge with 3.23.44 2001-11-04 16:14:09 +02:00
monty@hundin.mysql.fi
2ac4ad6984 merge 2001-11-03 22:28:16 +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
monty@hundin.mysql.fi
daa4229a3d Portability fixes. 2001-11-02 07:42:28 +02:00
monty@hundin.mysql.fi
0716bf4d0e Portability fixes 2001-10-31 20:28:43 +02:00
miguel@light.local
9678d16313 Remove console manager and deprecate functions from libmysql 2001-10-30 01:29:49 -02:00
serg@serg.mysql.com
a6274848a2 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2001-10-25 13:09:04 +02:00
serg@serg.mysql.com
165d252546 Merge 2001-10-25 13:05:26 +02:00
serg@serg.mysql.com
28f35b261f bug in libmysql.c:mysql_reconnect() fixed 2001-10-24 21:38:48 +02:00
sasha@mysql.sashanet.com
be4dfd21dd cleanup
removal of duplicate code in mf_iocache.cc 
work on failsafe replication
work on SEQ_READ_APPEND io cache
2001-10-23 13:28:03 -06:00
serg@serg.mysql.com
565fe1805b Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2001-10-23 10:54:12 +02:00
serg@serg.mysql.com
6f669e6bf8 HA_NO_FULLTEXT_KEY and an appropriate error message 2001-10-23 10:52:51 +02:00
monty@hundin.mysql.fi
6ee6fbf700 Don't use signal() on windows.
Added missing InnoDB variables to SHOW VARIABLES.
Fixed bug when doing WHERE 'column_name=NULL' on an indexed column that had NULL values.
Fixed bug when doing 'LEFT JOIN ...  ON (column_name = constant) WHERE column_name = constant'
2001-10-19 22:10:54 +03:00
miguel@light.local
f33b914bc2 Add the export functions definition file for libmysql.dll.
When should add a function with STDCALL defined should be
add to this file, in this way the functions is exported for
the client application on Win32.
2001-10-18 23:00:15 -02:00
miguel@light.local
da53b793c4 Avoid the redefinition warning message from winsock.h 2001-10-18 22:31:42 -02:00
monty@hundin.mysql.fi
0bfec316ce Don't do signal() on windows (Causes instability problems)
Safer, a bit faster filesort.
Code changes to avoid calls to current_thd() (faster code).
Removed all compiler warnings from readline.
2001-10-17 19:39:39 +03:00
sasha@mysql.sashanet.com
a74811e72b 64-bit portability fixes in network I/O
use $MAX_TABLES mysqltest variable to make join test portable
make test now works with the manager on IA64 Linux
2001-10-13 09:28:35 -06: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
6afbeb4cf4 Cleanups 2001-10-11 22:02:16 +03:00
monty@hundin.mysql.fi
06e719b7cc Remved Gemini code. 2001-10-10 02:50:28 +03:00
monty@hundin.mysql.fi
d5fe1db868 One should not only have to include my_net.h to work with sockets.
This wrapper noew will include all the necessary, system specific files,
which makes all normal source files much easier to write and maintain.
Portability fixes.
2001-10-09 03:35:29 +03:00
monty@hundin.mysql.fi
a88a9842aa merge sql/violite.c with libmysql/violite.c 2001-10-08 23:06:53 +03: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
monty@hundin.mysql.fi
88e5ee0184 Fix for 'mysqladmin -w1 unknown-command'
Manual Changelog update
2001-10-07 14:18:09 +03:00
sasha@mysql.sashanet.com
a71f818aa2 Merge 2001-10-04 15:46:04 -06: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
29ea2e564e forced addition of manager.c 2001-10-03 15:41:38 -06: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
monty@hundin.mysql.fi
d22bf7e33f Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2001-09-30 05:47:33 +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
monty@hundin.mysql.fi
12aa7e5e84 Fix for make dist 2001-09-29 15:37:53 +03: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@hundin.mysql.fi
295107457f Fixed bug with SELECT * ... UNION 2001-09-17 15:40:03 +03:00
monty@hundin.mysql.fi
0d72e5440f Portability fixes 2001-09-15 16:22:34 +03:00
monty@hundin.mysql.fi
7cadc6e711 Changed to use my_global.h
Fixed problem with LIKE with latin1_de
Added parsing support of UNSIGNED LONG LONG
2001-09-14 02:54:33 +03:00
monty@work.mysql.com
18474d8419 Merge with 3.23.42 2001-09-13 09:52:35 +02:00
monty@hundin.mysql.fi
7a19987805 OS2 patch 2001-09-12 23:53:31 +03:00
tim@white.box
45b1e99dd1 libmysql/Makefile.shared
Remove extra link_sources target, which was not being used
    (and was incorrect).

ctype-latin1_de.c
    BitKeeper file /home/tim/my/4/strings/ctype-latin1_de.c
2001-09-06 17:17:18 -04:00
monty@work.mysql.com
9ad2cd8c45 Portability fixes 2001-09-06 01:23:01 +02:00
monty@work.mysql.com
81006dd227 Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0
2001-09-04 01:04:32 +02:00
monty@hundin.mysql.fi
0b2af6bdfd Ensure that libmysqlclient doesn't use raid
Fix problem with MyISAM and rows of length 65517-65520
2001-09-04 01:25:34 +03:00
monty@work.mysql.com
447c18954e merge with 3.23.42 2001-09-02 18:38:33 +02:00
tonu@x153.internalnet
102cabfe4a Fixed compilation problems when HAVE_OPENSSL is not defined 2001-09-01 23:29:58 +08:00
monty@tik.mysql.fi
3edbb869f6 Fix to be able to configure without --with-tools 2001-08-29 09:13:29 +03:00
monty@hundin.mysql.fi
733f865f54 Fixes for OS2.
Fix bug in isamlog
Add argument types to function declarations.
2001-08-22 01:45:07 +03:00
sasha@mysql.sashanet.com
89ac8682dd Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-08-11 17:08:21 -06: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
sasha@mysql.sashanet.com
f6836bf81a merged 2001-08-09 19:16:15 -06:00
sasha@mysql.sashanet.com
681cdbbdf9 mysqlbinlog->client 2001-08-09 18:16:43 -06:00
tonu@x153.internalnet
e1fa72edef Merge work.mysql.com:/home/bk/mysql-4.0
into x153.internalnet:/home/tonu/mysql-x
2001-07-24 15:00:36 +08:00
tonu@x153.internalnet
85c287a439 OpenSSL fixes. Should not affect anything else. 2001-07-24 14:07:46 +08:00
sasha@mysql.sashanet.com
115c62f5ae fixed coredump in mysql_reconnect() 2001-07-13 16:05:19 -06:00
monty@tik.mysql.fi
0559758630 Added support for ANSI SQL X'hex-string' format.
Fixed mysqldump to use -- instead of # as comment characters.
Removed support for the 3.20 protocol format
2001-07-04 09:39:58 +03:00
sasha@mysql.sashanet.com
697f4d5a8c fixed new error messages and got vio to compile 2001-06-08 21:26:59 -06: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@work.mysql.com
ef8d161dea merge 2001-06-01 23:51:23 +02:00
monty@hundin.mysql.fi
e30ff2ece1 Fixed bug that caused client to hang because mysqld never did send an
error message if the table open or the index creation failed.
Updated portuguese error messages.
Fix for OS/2 that affected CHECK TABLE.
2001-06-02 00:03:16 +03:00
tonu@hundin.mysql.fi
04aeee5d62 Makefile.am removed automake complaints about "sqlobjects"
Makefile.shared	removed automake complaints about "sqlobjects"
.del-violite.c~53d4251a69d3c	Delete: sql/violite.c
2001-06-01 14:15:57 +03:00
monty@work.mysql.com
e595fe3b34 Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0
2001-06-01 03:13:02 +02:00
monty@hundin.mysql.fi
0a51e72aa3 Added symlink support to mysys library. 2001-06-01 03:53:14 +03:00
tonu@hundin.mysql.fi
f515a3ae4a make vio compile 2001-05-31 17:42:37 +03:00
tonu@hundin.mysql.fi
537846a412 Merge tonu@work.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/tonu/mysql-4.0
2001-05-31 17:20:02 +03:00
tonu@hundin.mysql.fi
1519e5d01d Support for VIO library 2001-05-31 17:18:25 +03:00
monty@work.mysql.com
df56b252a7 merge 2001-05-31 12:56:05 +02:00
monty@donna.mysql.fi
3dc4b35a05 Fixed problems with decimals withing IF()
Force add of FN_LIBCHAR to symlinks on windows
2001-05-29 13:46:17 +03:00
sasha@mysql.sashanet.com
ac379c408a symlink sql/violite.c to libmysql/violite.c, since violite.c got removed
from libmysql directory to make things compile
2001-05-24 14:34:45 -06:00
root@x3.internalnet
a5d4dddff5 .del-violite.c~984c09cffe14a11b Delete: libmysql/violite.c
acconfig.h	openssl support
acinclude.m4	openssl support
2001-05-20 20:11:11 +02:00
sasha@mysql.sashanet.com
7c9b9f471c Merged with 3.23, needs further fix-up 2001-05-10 15:06:35 -06:00
monty@donna.mysql.fi
9ee2a297c0 Fixes for embedded MySQL
Some limit optimization
2001-04-25 01:11:29 +03: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@work.mysql.com
93de112238 Merge 2001-04-19 00:58:30 +02:00
monty@donna.mysql.fi
ad7fa1c940 Don't force conf_to_src to be static an all systems
Removed unpredictable test from rpl000001.test
2001-04-18 02:53:21 +03:00
monty@donna.mysql.fi
1e80c3f3e1 Don't use ranges on HEAP tables with LIKE
Don't reconnect client on close
2001-04-17 03:55:25 +03:00
sasha@mysql.sashanet.com
593e7ab4f3 Ugly merge of 3.23 changes into 4.0 - fix up needed 2001-04-11 19:09:00 -06:00
monty@donna.mysql.fi
d2dc65f1b4 Fixed bug in REGEXP for Linux Alpha 2001-04-11 20:19:52 +03:00
monty@work.mysql.com
8f62579c38 Added all changes from old 4.0 version:
PSTACK, libmysqld and MySQL filesystem
UPDATE ... ORDER BY
DELETE ... ORDER BY
New faster fulltext handling
Faster compressed keys
2001-04-11 13:04:03 +02:00
sasha@mysql.sashanet.com
f754012ad0 got --with-other-libc to work, finally 2001-04-02 19:01:15 -06: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
monty@donna.mysql.com
450d98e341 Changed --replace to --replace_result in mysqltest
Changed errmsg -> my_errmsg (portability issue)
Fixed that mysqlbinlog writes SET TIMESTAMP before all queries
Fixed comments in default my.cnf files
2001-02-15 03:43:14 +02:00
tim@threads.polyesthetic.msg
bcd6abea6d Use INSTALL_DATA instead of cp.
mysql.server is a script, not data.
2001-02-01 20:49:04 -05:00
monty@donna.mysql.com
bdbc0ef7a0 New myisamchk option --sort-recover
Allow delete of crashed MyISAM tables
Fixed bug when BLOB was first part of key
Fixed bug when using result from CASE in GROUP BY
Fixed core-dump bug in monthname()
Optimized calling of check_db_name()
2001-01-31 04:47:25 +02:00
serg@serg.mysql.com
e47833bc44 errmsg.c buffer overflow in libmysqlclient fixed 2001-01-28 13:20:03 +01: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
tim@cane.mysql.fi
c40f815e1b Use C-style comments in common header files and C code. 2001-01-16 22:35:27 +02:00
tim@cane.mysql.fi
65a61dc4a3 If get_charset() fails when trying to load the server's charset,
use the default charset instead of failing.
2001-01-16 21:39:16 +02:00
monty@donna.mysql.com
74aefb4deb Update to new vio 2000-12-31 12:47:29 +02:00
monty@donna.mysql.com
5c18942398 cleanups 2000-12-31 12:21:42 +02:00
tim@cane.mysql.fi
57b5476aeb Makefile bug fixes. 2000-12-21 11:56:43 +02:00
tim@cane.mysql.fi
9a29f1f7a5 Compatibility fix for BSDi.
BSDi uses size_t * for the optlen arg to getsockopt, while other Unixes
use socklen_t *.
2000-12-21 11:54:08 +02:00
monty@tik.mysql.com
b186b4f27a Fixed that LPAD() and RPAD() cuts arguments
New test for string functions
2000-12-15 10:58:17 +02:00
sasha@mysql.sashanet.com
ec1359416b fixed up mysql-test - will not push this yet, as more clean up/testing is to follow 2000-12-07 07:54:59 -07:00
monty@donna.mysql.com
74e7ffe987 New thr_alarm struct for better integration with OS2
Run bootstrap in separate thread
Fix bug in FLUSH TABLES table_name
2000-11-28 04:47:47 +02:00
monty@donna.mysql.com
dc5e32ea40 Added connect_timeout and fix for transactions per statement 2000-11-27 02:28:41 +02:00
monty@donna.mysql.com
b65dbb6114 Fixed problem with auto-repair of MyISAM tables
Fixed bug in ISAM and MyISAM when updating from multiple-processes
2000-11-21 03:43:34 +02:00
monty@donna.mysql.com
61fd6baf4b Bug fix for NATURAL JOIN, Split manual sections and more statistic variables 2000-11-20 02:57:02 +02:00
monty@narttu.mysql.fi
b689a1a752 merge 2000-11-16 00:24:11 +02:00