pem@mysql.com
736e78251e
Merging 4.1 to 5.0.
2003-04-04 13:45:35 +02:00
monty@narttu.mysql.fi
a7708c7904
Merge with 4.0
2003-04-03 21:19:12 +03:00
guilhem@mysql.com
654410a3d3
Deprecated the update log (Sprint task #792 ). Now --log-update
...
just turns on --log-bin and prints a warning. SQL_LOG_UPDATE
is handled in two ways (see mysqld.cc for comments).
2003-04-02 00:15:20 +02:00
guilhem@mysql.com
4824d6c66c
Sprint task #856 : make table exclusion rules (in replication)
...
apply to GRANT and REVOKE too. For example if replicate-wild-ignore-table=mysql.%,
GRANT and REVOKE will not be replicated on the slave.
2003-04-01 22:49:40 +02:00
bar@bar.mysql.r18.ru
5b50426f8f
Some optimization in CHARSET_INFO:
...
We don't need separate hash_sort() and hash_caseup()
We don't need tosort(). strnxfrm will do the same.
2003-04-01 12:45:16 +05:00
bar@bar.mysql.r18.ru
caf31a0790
Preparing to client<->server autoconvert
2003-03-17 13:14:04 +04:00
bar@bar.mysql.r18.ru
4b5bfe990f
sql_acl.cc, item.h:
...
use of new argument
sql_analyse.h:
macros from mysql_priv.h. Should be deleted soon.
mysql_priv.h:
_default_charset_info has been removed
item_cmpfunc.h:
Use cmp_charset
hostname.cc, hash_filo.h:
Move charset to constructor argument
2003-03-07 12:21:32 +04:00
lenz@mysql.com
2b1f8fbe67
Reverted Sinisa's patch "Fixing the error messages returned on GRANT
...
commands" again, since this problem had been fixed differently
already (Thanks to Serg for spotting this)
2003-02-19 16:16:27 +01:00
lenz@mysql.com
64b2048914
- Applying Sinisa's Patch "Fixing the error messages returned on
...
GRANT commands"
2003-02-19 14:50:40 +01: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
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
15aee37456
merge
2003-02-10 18:01:29 +02:00
serg@sergbook.mysql.com
14b4b58de7
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-02-10 14:56:30 +01:00
serg@sergbook.mysql.com
3cc3ec177f
error message fixed (new error code will be introduced in 4.1)
2003-02-10 14:47:39 +01:00
monty@mashka.mysql.fi
023d6dd39b
Merge with 4.0.11
2003-02-04 21:52:14 +02:00
bar@bar.mysql.r18.ru
735399a850
Move latin1 into a separarte file
2003-01-29 17:31:20 +04: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
Sinisa@sinisa.nasamreza.org
74f478f9a5
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-01-21 15:54:36 +02:00
hf@deer.mysql.r18.ru
389680e04e
Conflicts resolving
2003-01-20 18:59:45 +04:00
monty@mashka.mysql.fi
183df2da7f
Fixes cases where thd->query was not protected.
...
This fixes a problem with SHOW PROCESSLIST
2003-01-19 02:00:26 +02: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
hf@deer.mysql.r18.ru
96089e2b3a
resolving conflicts
2003-01-15 13:15:35 +04:00
Sinisa@sinisa.nasamreza.org
6b386c08a5
Fix for a bug in SHOW GRANTS when :
...
grant on database.* to xx@yy with grant option;
is done.
2003-01-11 18:02:10 +02:00
Sinisa@sinisa.nasamreza.org
6b9f24be88
changing a bit SHOW GRANTS to display empty row in global table.
2003-01-09 23:21:20 +02:00
monty@mashka.mysql.fi
07daf3169e
Merge with 4.0.8
2003-01-03 00:04:33 +02:00
monty@mashka.mysql.fi
3ca695ea0b
Cut hostnames at HOSTNAME_LENGTH to avoid theoretical hostname overruns
...
Changed long packat handling to check for packets of length 0xffffff.
This does however break packet handling for older clients.
If you are using packets >= 16M then you need to upgrade client and server
after this patch.
2002-12-26 18:26:37 +02:00
hf@deer.mysql.r18.ru
c1e69d2cca
Merging
2002-12-16 18:58:55 +04:00
hf@deer.mysql.r18.ru
e3b3b68307
Big purge about embedded library (scrum)
2002-12-16 17:33:29 +04:00
monty@mashka.mysql.fi
d783e18436
merge
2002-12-14 17:49:01 +02:00
hf@deer.mysql.r18.ru
3517febe97
Resolving merge conflicts
2002-12-12 12:49:56 +04:00
bar@bar.mysql.r18.ru
6f5098c5c9
Always use latin1 for acl
2002-12-11 17:20:40 +04: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
monty@mashka.mysql.fi
7e312565c3
Remove usage of acl_getroot() in embedded server.
...
Fixed compilation problem when OPENSSL was enabled.
2002-12-06 22:01:12 +02:00
peter@mysql.com
3ee8bee22f
Basically minor code optimizations and cleanups
2002-12-05 03:55:29 +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
7e6977808f
Correct bug which exposed itself in rpl000017
...
Commit for merge
2002-11-29 21:34:13 +03:00
hf@genie.(none)
5e8b27c0d3
Pull conflicts resolutions
2002-11-29 12:35:48 +04: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
monty@mashka.mysql.fi
806294c573
Fixes after merge with 4.0
2002-11-21 22:25:53 +02:00
monty@mashka.mysql.fi
dac6498f9b
Merge with 4.0
2002-11-21 15:56:48 +02:00
monty@butch.
890b39bb68
merge
2002-11-07 12:49:01 +02:00
monty@hundin.mysql.fi
65badfff1a
Put temporary files in binlog cache when using BEGIN/COMMIT
...
Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
New variables @@rand_seed1 and @@rand_seed2 (used by replication)
DROP TEMPORARY TABLE
2002-11-07 04:02:37 +02:00
monty@butch.
a2bdf9265f
Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes.
2002-11-07 03:54:00 +02:00
peter@mysql.com
ecedc7ac35
More work on secure authentication. Commit for merge
2002-11-05 20:21:55 +03:00
monty@hundin.mysql.fi
2bcd60e113
Merge
2002-10-31 10:44:20 +02:00
gluh@gluh.(none)
808d87f810
Some changes for SSL
2002-10-30 18:27:15 +04:00
monty@hundin.mysql.fi
1e0538324d
Added back old LARGEFILE handling
...
Fixed reference to freed memory in acl_init()/grant_init()
Fixed possible memory leak. (Could only happen in very strange circumstances)
Fixed bug in ALTER TABLE with BDB tables
Updated mysql-test for valgrind
2002-10-29 21:59:03 +02:00
