50d3291aee
manual merge
2003-07-31 17:11:52 +04:00
a5eacc69e6
mysqld.cc:
...
innodb_fast_shutdown CAN take an argument though it was not specified so in mysqld.cc
2003-07-29 00:04:56 +03:00
67da1edee2
'mysqld --verbose' should not print help screen
2003-07-27 10:26:29 +02:00
c6a38a2557
Bug#909: mysqld --verbose --help != mysqld --help --verbose
...
Proposed fix for bug#909
2003-07-25 11:03:57 +05:00
33c47c7ead
Fix for service issue with paths having spaces (bug #687 )
2003-07-23 21:57:44 -04:00
99aa453f37
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_663/mysql-4.1
2003-07-22 19:02:36 -04:00
f32299279d
fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump)
2003-07-22 18:58:30 -04:00
d90129d1e9
Merge oak.local:/home/kostja/mysql/mysql-4.1-root
...
into oak.local:/home/kostja/mysql/mysql-4.1
2003-07-18 18:16:46 +04:00
333bddb33f
SCRUM:
...
Task 499 'init_connect, init_slave options'
2003-07-18 14:11:01 +05:00
0b7f817fa4
Scrum task 425: Added --verbose option for --help
2003-07-18 13:28:38 +05:00
26ecd86539
Conflict resolution
2003-07-16 13:35:34 -07:00
df7c1e8165
Better fix for bug #791 : At binlog rotation, INSERTs may not find their way into the binlog
2003-07-14 14:59:26 +03:00
34c8918915
removed 2 small useless if().
2003-07-12 15:06:40 +02:00
fbebac9a48
Fix for BUG#791:
...
a safer way of initing the mutexes in MYSQL_LOG.
is_open() is now always thread-safe.
See each file for details.
2003-07-11 14:26:44 +02:00
941a8623ca
resolved conflict with pulled changeset
2003-07-09 18:24:43 +04:00
d9e7072210
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mashka.mysql.fi:/home/my/mysql-4.0
2003-07-09 00:00:16 +03:00
b2cbd83913
Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS
...
Removed double my_thread_end() which caused fatal error on windows if mysqld died on startup
2003-07-08 23:58:04 +03:00
0f28677af6
Merge oak.local:/home/kostja/mysql/mysql-4.1-root
...
into oak.local:/home/kostja/mysql/mysql-4.1
2003-07-08 12:03:46 +04:00
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
74ac300642
typos fixed
2003-07-07 19:35:11 +02:00
ebcc7b5a4f
Support for variables with components
...
Added framework to create/drop and manager buffers for multiple key caches
2003-07-06 19:09:57 +03:00
9c73d91d54
WL#912 (more user control on relay logs):
...
FLUSH LOGS now rotates relay logs,
and a new variable max_relay_log_size.
Plus a very small bit of code cleaning.
2003-07-06 17:59:54 +02:00
42e5754a4b
Fixed problem with stacksize on Unixware
2003-07-04 01:21:42 +03:00
ace8a06323
I committed the same changeset in my tree yesterday, but broke the tree since,
...
so I commit again in a fresh tree.
Fix for bug#763 (Relay_log_space too big by 4 bytes),
plus comments and DBUG_PRINT, and we don't start replication
if --bootstrap.
2003-07-03 01:08:36 +02:00
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
2a33b0514e
fixed uninitialized pointer
2003-07-01 19:05:08 +03:00
f1353c1dda
merged
2003-07-01 10:03:20 +03:00
236560e8b3
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-06-30 09:53:04 -07:00
9a446b9797
mysqld.cc, handler.cc:
...
Added multiple key cache
2003-06-30 09:47:56 -07:00
541b0d5322
Added support for structured options (WL task ID 947).
2003-06-27 18:51:39 +03:00
34919a03c4
Added thread variable max_seeks_for_key
...
Change optimizer to prefer key lookups before table scan
Change table scans to be done after tables with constrains on scanned table
2003-06-27 03:04:54 +03:00
76315814b7
Fixed error handling to be able do not interrupt update (907) (SCRUM)
...
fixed bug of current select pointer in subselect execution
fixed layuot
2003-06-25 01:19:09 +03:00
afe1547866
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.defweek
2003-06-23 12:03:50 +05:00
def18de12c
Warn that --log-slave-updates is used without --log-bin and disabled (WL#998)
2003-06-20 13:54:22 +02:00
289d375f50
SCRUM
...
Task ID 894:
Backport default_week_format variable to 4.0
2003-06-19 14:02:19 +05:00
5425591503
Merge
2003-06-18 07:31:23 -07:00
1e62d6070a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-06-14 11:38:09 +03:00
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
9f67e10d0d
consistency fix - all help texts for command-line options should end with a dot.
2003-06-13 10:59:02 +02:00
ecdb1c768c
Changed safemalloc structure to not have to be 8 byte aligned. (Portability problem)
2003-06-12 22:39:45 +03:00
a0f3dcc3c8
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-06-12 06:22:35 -07:00
f547f2769f
Many files:
...
New feature: preload indexes into key cache.
mi_preload.c:
new file
Many files:
Added preload statement.
2003-06-12 04:29:02 -07:00
d640ff4a97
Don't install signal handler for SIGINT by default
...
Added option --gdb
Free memory used by replicate_xxx and binglog_xxx options
2003-06-10 21:42:29 +03:00
255a40c2f0
sql_yacc.yy, sql_parse.cc, sql_lex.h, mysqld.cc, lex.h:
...
Add syntax SAVEPOINT id and ROLLBACK TO SAVEPOINT id. This is compatible with DB2 and Oracle but not with SQL Server. Savepoints do not do anything yet, this is just parsing.
2003-06-06 04:18:58 +03:00
7a54334443
Merge with 4.0.13
2003-06-05 17:33:38 +03:00
058d8ed14b
mysqld won't give a warning any more, if --user=user_name is used,
...
if 'user_name' is the current user and it is not root.
2003-06-05 16:56:38 +03:00
772adcbd99
Print error if we can't delete an alarm
...
More debugging variables
Increment aborted_threads in case of killed or too big packet
2003-06-05 12:29:13 +03:00
dad0664579
merge with public tree
2003-06-05 00:12:45 +03:00
40109c574a
Merge with 4.0.13
2003-06-04 19:21:51 +03:00
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
