Commit graph

161 commits

Author SHA1 Message Date
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
jani@rhols221.adsl.netsonic.fi
5f8ef50b35 Added a warning to my_print_defaults if --verbose is given
and --defaults-file is a non-existing or non-regular file.
Bug#755
2003-08-27 19:22:14 +03:00
pem@mysql.com
7f158dd12a Merge 4.1 into 5.0 2003-08-26 11:51:09 +02: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
kostja@oak.local
50d3291aee manual merge 2003-07-31 17:11:52 +04: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)
6b303f846b Including client code into libmysqld
Merging
2003-07-14 16:41:58 +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
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)
c224b55835 SCRUM
Including client code into embedded library

Code trimming (fixes of comments etc)
2003-07-04 11:40:10 +05: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
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)
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
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
hf@deer.(none)
f5bd6416de Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-06-09 14:51:40 +05: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
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
hf@deer.(none)
a0d00113e5 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-06-04 15:13:07 +05:00
hf@deer.(none)
382aba188b SCRUM
simultaneously usable libraries

unification of client structures
2003-06-04 15:12:32 +05: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
pem@mysql.com
35c82164f6 Merged 4.1 to 5.0. 2003-04-29 12:06:04 +02: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
hf@genie.(none)
0ee0589e93 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into genie.(none):/home/hf/work/mysql-5.0.kil
2003-03-31 13:42:37 +05:00
hf@genie.(none)
dd49c33f20 SCRUM
two versions of KILL implementation
2003-03-21 09:37:01 +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@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
hf@deer.mysql.r18.ru
389680e04e Conflicts resolving 2003-01-20 18:59:45 +04:00
hf@deer.mysql.r18.ru
1f6b615677 SCRUM
embedded-related changes
2003-01-20 18:47:25 +04:00
venu@myvenu.com
a39da98d0d Initial multi query execution support 2003-01-18 11:53:38 -08:00
hf@deer.mysql.r18.ru
96089e2b3a resolving conflicts 2003-01-15 13:15:35 +04:00
monty@mashka.mysql.fi
803dff1002 Merge with 4.0.8 2003-01-06 02:04:52 +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
852508a4cf mysql_com.h:
ulong fails to compile on FreeBSD. Peter, alsways use "unsigned long" instead!!!
2002-12-20 16:21:22 +04:00
hf@deer.mysql.r18.ru
8a205e4ba3 Merge 2002-12-19 14:57:24 +04:00
bar@bar.mysql.r18.ru
c3053148f4 BINARY_FLAG has been restored.
It's needed by ODBC code.
2002-12-19 14:36:05 +04:00
hf@deer.mysql.r18.ru
e3b3b68307 Big purge about embedded library (scrum) 2002-12-16 17:33:29 +04: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
peter@mysql.com
1d920529a8 SCRAM Remove spaces from most changed files.
This alters not only my code so it looks like I'm not only one adding the spaces.
2002-12-05 01:14:51 +03: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
peter@mysql.com
7e6977808f Correct bug which exposed itself in rpl000017
Commit for merge
2002-11-29 21:34:13 +03:00
bell@sanja.is.com.ua
4be2cfd62d merging 2002-11-27 19:31:11 +02: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
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
bell@sanja.is.com.ua
7a9f47759e basic row Items (SCRUM) 2002-11-15 20:32:09 +02:00
peter@mysql.com
ecedc7ac35 More work on secure authentication. Commit for merge 2002-11-05 20:21:55 +03:00
peter@mysql.com
1545cbccd3 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-27 13:13:31 +03:00
bar@bar.mysql.r18.ru
95aef91521 BINARY charset is now used instead of binary_flag 2002-10-25 13:58:32 +05:00
peter@mysql.com
37245fd17f More work on secure connection protocol. commited in order to do the sync with new large pushed
bunch.
2002-10-19 23:18:31 +04:00
peter@mysql.com
c4ea39d810 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-06 13:43:42 +04: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
bell@sanja.is.com.ua
199f667c19 merging 2002-10-04 14:15:59 +03:00
peter@mysql.com
66b1435ee2 Merging... 2002-10-03 00:13:08 +04:00
peter@mysql.com
f1155a98a4 Changeset to deal with 4.1 -> 4.0 merge 2002-10-02 23:43:27 +04: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
bell@sanja.is.com.ua
b07aaeb295 subselect with union
new error handling
Item_ref bug fixed
2002-09-03 09:50:36 +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
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@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
jani@rhols221.adsl.netsonic.fi
7cad1f9313 Added interface for first set of dynamic variables. 2002-06-28 19:30:09 +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
Sinisa@sinisa.nasamreza.org
d65671f778 Features made for Schlund plus several bug fixes.
Read a manual for more detail
2002-05-15 13:50:38 +03:00
monty@hundin.mysql.fi
2e2b146ba5 Fix for HAVE_QUERY_CACHE
Remove not used flag CLIENT_CHANGE_USER
2002-04-02 19:10:55 +03:00
monty@hundin.mysql.fi
727e507bca merge with 3.23.50 2002-03-27 01:56:10 +02:00
monty@hundin.mysql.fi
ce541b292a support for unsigned FLOAT/DOUBLE 2002-03-27 00:50:54 +02:00
monty@hundin.mysql.fi
3a571c7c13 Fixed overflow bug 2002-03-26 13:24:50 +02:00
monty@hundin.mysql.fi
df5f8c18eb Move HA_EXTRA_NO_READCHECK to ha_open
Fixed bug in multi-table-delete
2002-01-16 23:02:26 +02:00
monty@hundin.mysql.fi
ff17389116 Fix for FLUSH QUERY CACHE
Fix for new bug in CREATE TABLE when sorting keys.
2002-01-05 22:51:42 +02:00
monty@hundin.mysql.fi
1d3e058c4b Added FLUSH DES_KEY_FILE.
New HEX() function.
Final (?) cleanup of des_encrypt() / des_decrypt().
Added missing files to Makefiles.
2001-12-13 15:53:18 +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
4c17825acd Update of query cache code 2001-12-06 01:05:30 +02:00
monty@hundin.mysql.fi
1d26537da5 Query cache.
Remove some warnings
2001-12-02 14:34:01 +02: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
196f620e90 Portability fixes + a couple of bug fixes introduced by last push. 2001-10-08 23:20:19 +03:00
monty@hundin.mysql.fi
46a660f450 Portability fix 2001-10-08 07:52:53 +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
c0f87c836a merged 2001-10-03 14:21:16 -06:00
monty@tik.mysql.fi
e05bf277d6 Final fixes for INSERT into MERGE tables.
Move MAX_BLOB_WIDTH to be global
Added full support for unsigned BIGINT
Fixed spelling errors
2001-09-27 21:45:48 +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
2038a46e92 fixes for MYSQL manager 2001-09-19 14:30:43 -06:00
monty@work.mysql.com
447c18954e merge with 3.23.42 2001-09-02 18:38:33 +02: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
monty@hundin.mysql.fi
59e7c97dab Remove warnings and portability fixes
New global read lock code
Fixed bug in DATETIME with WHERE optimization
Made UNION code more general.
2001-08-14 20:33:49 +03:00
sasha@mysql.sashanet.com
7267133886 merged 2001-08-11 17:28:41 -06:00
monty@hundin.mysql.fi
e7575da7bb Portability fixes
Added record_rnd_buffer
Added --safe-user-create
Fix for ALTER TABLE RENAME on windows
2001-08-10 17:37:37 +03:00
monty@tik.mysql.fi
0d55e93614 Fix when using --without-server --with-thread-safe-client
Added prototype for my_thread_end
New error message for MATCH
Give error when using myisamchk --force --readonly
2001-08-04 00:10:00 +03:00
tonu@hundin.mysql.fi
f515a3ae4a make vio compile 2001-05-31 17:42:37 +03:00