guilhem@mysql.com
83f35b8a81
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-08-19 15:22:36 +02:00
guilhem@mysql.com
fefa92f3a7
Fixes for BUG#1091,1092,1093. Synopsis of these bugs:
...
mysqlbinlog segfaults if --position is just before Exec_load event
mysqlbinlog prints uncommented warnings if --database and compiled with debug
mysqlbinlog --database does not filter LOAD DATA INFILE
2003-08-19 15:12:44 +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
jani@rhols221.adsl.netsonic.fi
2a53d5a60e
Fixed a limitation bug in mysqlimport. sql_statement was designed to
...
contain max 1280 characters, but sometimes in rare cases when --columns
was used, more than 1280 characters was needed. This is case when a lot
of columns was specified using this option. Raised the max value to 8448,
which should be enough.
2003-08-16 17:03:48 +03:00
monty@mashka.mysql.fi
2263e3e51f
Merge with 4.0.14
2003-08-11 22:44:43 +03:00
kostja@oak.local
765053c838
Merge oak.local:/home/kostja/mysql/mysql-4.1-root
...
into oak.local:/home/kostja/mysql/mysql-4.1
2003-08-07 22:19:42 +04:00
vva@eagle.mysql.r18.ru
26abb7d368
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
2003-08-07 14:19:41 -04:00
vva@eagle.mysql.r18.ru
5ad00d9963
fixed bug with missing '\' in string constant in client/mysqldump.cc
2003-08-07 14:18:43 -04:00
kostja@oak.local
c23975aace
Merge oak.local:/home/kostja/mysql/mysql-4.1-root
...
into oak.local:/home/kostja/mysql/mysql-4.1
2003-08-07 13:29:25 +04:00
kostja@oak.local
50d3291aee
manual merge
2003-07-31 17:11:52 +04:00
bar@bar.mysql.r18.ru
44c0ca610e
mysqldump.c:
...
Use the default character set instead of binary. This is to make "mysqlshow" -> "cat'n'paste database name" -> "mysqldump dbname" circle working.
2003-07-31 09:00:22 +05:00
hf@deer.(none)
e849dad4f3
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-07-23 15:23:53 +05:00
vva@eagle.mysql.r18.ru
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
vva@eagle.mysql.r18.ru
f32299279d
fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump)
2003-07-22 18:58:30 -04:00
kostja@oak.local
7dab500b7a
Merge oak.local:/home/kostja/mysql/mysql-4.1-root
...
into oak.local:/home/kostja/mysql/mysql-4.1
2003-07-17 14:55:13 +04:00
vva@eagle.mysql.r18.ru
ac08d278b9
fixed bug Bug #683 (Prompt for password doesn't go to console for Windows)
2003-07-16 18:15:35 -04:00
hf@deer.(none)
11de0b35f7
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-07-15 20:06:27 +05:00
ram@mysql.r18.ru
bc753e138c
bugfix for the bugfix for the bug #539
2003-07-15 17:38:01 +05:00
ram@mysql.r18.ru
e1aaa670cc
mysql should ignore ' " ` symbols inside comments (Bug #539 ).
2003-07-15 14:38:48 +05:00
kostja@oak.local
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
vva@eagle.mysql.r18.ru
c96c87d51d
fixed bug #670
2003-07-04 16:06:17 -04:00
hf@deer.(none)
9d4bae335c
Resolving conflicts
2003-07-04 13:21:14 +05:00
monty@narttu.mysql.fi
f3af0d7ce4
Status query on killed mysql connection results in segmentation fault (Bug #738 )
...
Added MAX_PASSWORD_LENGTH. This increased master-slave passwords to 32 bytes (Bug #766 )
Fixed server crash on purge master logs or show master logs when binlog is off. (Bug #733 )
2003-07-04 03:18:15 +03:00
monty@narttu.mysql.fi
f259f379e4
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-07-03 11:56:30 +03:00
monty@narttu.mysql.fi
c21728f8c8
Cleaner implementation if INSERT ... SELECT with same tables
...
Tests cleanup (put drop database first in tests)
2003-07-03 11:55:36 +03:00
vva@eagle.mysql.r18.ru
da9d454cc3
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_672/mysql-4.0
2003-07-02 17:37:23 -04:00
vva@eagle.mysql.r18.ru
55e046a807
fixed bug #672
2003-07-02 16:56:27 -04:00
venu@hundin.mysql.fi
19bc36241a
Removed dbug.h inclussion from client/get_password.c (windows build fix)
2003-07-02 10:49:07 +03:00
Sinisa@sinisa.nasamreza.org
b7644c9212
merge changes
2003-07-02 00:26:23 +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
vva@eagle.mysql.r18.ru
c34eec515e
made error output more detailed
2003-07-01 14:00:57 -04:00
vva@eagle.mysql.r18.ru
a86d23b93a
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_671/mysql-4.0
2003-07-01 13:21:35 -04:00
vva@eagle.mysql.r18.ru
20081b6293
removed --table option (fixed Bug #671 )
2003-07-01 13:17:03 -04:00
monty@mashka.mysql.fi
dfac0fc90a
Allow one to use MERGE tables with tables from different databases
...
Added command 'replace_column' to mysqltest
2003-06-27 16:29:10 +03:00
Sinisa@sinisa.nasamreza.org
66b60b57af
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-06-25 18:40:31 +03:00
guilhem@mysql.com
e8a8b8c346
fix for BUG#691 (4.0 mysqlbinlog couldn't read 3.23 binlog).
...
Safe parenthesis.
2003-06-20 15:48:52 +02: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
Sinisa@sinisa.nasamreza.org
833e3db2a7
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-06-17 16:24:31 +03:00
guilhem@mysql.com
3f33f17114
Fix for nightly build test failure (test update).
...
More messages.
Testcase for bug 651.
2003-06-16 15:49:54 +02:00
monty@narttu.mysql.fi
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
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
serg@serg.mylan
9f67e10d0d
consistency fix - all help texts for command-line options should end with a dot.
2003-06-13 10:59:02 +02:00
bar@bar.mysql.r18.ru
b80219f182
mysqldump.c:
...
SET NAMES is not sent to server when SET NAMES is not dumped
Server decides which character set to use in this case
2003-06-10 12:07:02 +05:00
bar@bar.mysql.r18.ru
1ffc3cca56
mysqldump.c:
...
SET NAMES is not produced in compatibility modes
2003-06-10 11:34:00 +05: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
Sinisa@sinisa.nasamreza.org
9bd57aa40e
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-06-02 14:14:10 +03:00
bar@bar.mysql.r18.ru
bb611fa0a2
mysqlshow and mysqldump now send their vharacter set to server
...
character_set_results is now the same with character_set_client by default
2003-05-30 23:09:35 +05:00