hf@deer.mysql.r18.ru
3517febe97
Resolving merge conflicts
2002-12-12 12:49:56 +04:00
monty@mashka.mysql.fi
a241d9a0f7
Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
2002-12-11 09:18:43 +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
peter@mysql.com
9be360eead
Minor new auth fixes
2002-12-09 14:29:17 +03:00
monty@mashka.mysql.fi
f1d35b29bc
merge fix
2002-12-06 21:15:05 +02:00
monty@mashka.mysql.fi
35ff08c2af
After merge fixes
...
Added THD to add_to_xxx_list() functions for faster parsing.
2002-12-06 21:11:27 +02:00
bell@sanja.is.com.ua
f1858ec331
fixed bug of PROCEDURE in same query with subselects
...
prohibited using procedure inside subquery
fixed error handling of procedure analize
2002-12-06 00:40:28 +02:00
monty@mashka.mysql.fi
859b688476
Merge with 4.0.6
2002-12-05 19:38:42 +02:00
peter@mysql.com
3ee8bee22f
Basically minor code optimizations and cleanups
2002-12-05 03:55:29 +03: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
5fa02daa69
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2002-12-04 16:26:29 +03:00
serg@serg.mysql.com
6dfd1d867e
merged
2002-12-04 10:16:19 +01:00
serg@serg.mysql.com
9e61e636be
proper casting in COM_TABLE_DUMP (backported from 4.0)
2002-12-04 09:54:58 +01:00
bell@sanja.is.com.ua
91bd1e4cc5
fixed error message
2002-12-04 01:32:45 +02:00
serg@serg.mysql.com
33de7e55f9
Security bug: password length check should be in check_user, not check_connections(),
...
otherwise COM_CHANGE_USER is unprotected and can be used for both privilege escalation and buffer overrun
2002-12-04 00:27:09 +01:00
serg@serg.mysql.com
e54134fde7
merged
2002-12-02 20:41:34 +01:00
serg@serg.mysql.com
2320923a7b
INSERT ... ON DUPLICATE KEY UPDATE ...
2002-12-02 20:38:00 +01:00
peter@mysql.com
1bf744911f
Megrge new changes in...
2002-12-01 11:18:19 +03:00
bell@sanja.is.com.ua
75da3049c3
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-12-01 00:17:33 +02:00
bell@sanja.is.com.ua
c6b48c6f26
fix of error handling
2002-12-01 00:11:22 +02:00
peter@mysql.com
a24258375a
SCRUM: Montymise code
...
fix mysql_change_user() for old clients
2002-11-30 20:58:53 +03:00
Sinisa@sinisa.nasamreza.org
a24b780207
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-30 19:54:52 +02:00
bell@sanja.is.com.ua
9da705ef2f
check of using same table for changing and select
2002-11-30 19:26:18 +02: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
serg@serg.mysql.com
82eb69a4a2
removed left-over UPDATE_ACL from REPLACE
2002-11-30 13:03:55 +01:00
peter@mysql.com
08f51eaedd
Merging....
2002-11-29 22:03:14 +03:00
Sinisa@sinisa.nasamreza.org
959b30672e
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-29 17:06:26 +02:00
monty@mashka.mysql.fi
6603d75213
New multi-table-update code
...
New (simpler) internal timestamp handling.
More debuging to heap tables.
Small cleanups to multi-table-delete
false -> 0 and true -> 1 (We should use TRUE and FALSE)
2002-11-29 16:40:18 +02:00
Sinisa@sinisa.nasamreza.org
5b7a2f56ee
many, many changes
2002-11-29 15:22:47 +02:00
serg@serg.mysql.com
409f7af3cf
make multi updates statistics visible in SHOW STATUS as Com_update_multi
2002-11-29 13:17:54 +01:00
serg@serg.mysql.com
fcec08584a
s/SQLCOM_MULTI_UPDATE/SQLCOM_UPDATE_MULTI/ to be in line with SQLCOM_DELETE_MULTI
2002-11-29 12:29:27 +01:00
hf@genie.(none)
5e8b27c0d3
Pull conflicts resolutions
2002-11-29 12:35:48 +04:00
bell@sanja.is.com.ua
ec38595696
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-11-28 20:01:22 +02:00
bell@sanja.is.com.ua
b8b7d0b03b
fixed * without tables in IN bug
...
fixed sunction-test select in IN bug
fixed unions in subselect bug
2002-11-28 19:29:26 +02:00
Sinisa@sinisa.nasamreza.org
8a53d1ca6a
adding mandatory aliases for derived tables as per SQL-99
...
doing it in sql_yacc.yy does not work
this commit contains fixes for other tests
there are fixes in subselect test which will have to be changed
once fix_fields is fixed to work with aliased derived tables
2002-11-28 19:19:21 +02:00
serg@serg.mysql.com
f60e47fdfb
INSERT ... UPDATE syntax (syntax only)
...
sql_yacc.yy and sql_parse.cc cleanup
2002-11-28 17:25:41 +01:00
bell@sanja.is.com.ua
1784d97f7a
merging
2002-11-27 17:10:21 +02:00
bell@sanja.is.com.ua
018a88897d
after merging fix
2002-11-27 15:52:32 +02:00
bell@sanja.is.com.ua
02803cf5e9
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-11-27 14:31:39 +02:00
bell@sanja.is.com.ua
79047ef5f6
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-update-4.1
2002-11-27 13:30:45 +02:00
pem@mysql.com
5d292d622c
Merge work.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/pem/work/mysql-4.1
2002-11-27 11:23:36 +01:00
bell@sanja.is.com.ua
32df7cacac
merging
2002-11-27 11:32:09 +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
bell@sanja.is.com.ua
aa8af5d6f4
reverse order in global select list allow to avoid recursion in derived tables
2002-11-27 01:12:16 +02:00
bell@sanja.is.com.ua
e419b767ac
multi-delete with subselects (SCRUM)
2002-11-26 22:33:33 +02:00
pem@mysql.com
3ef655ac3e
Pass thd as an argument to yyparse(), getting rid of all current_thd in the parser.
2002-11-26 14:18:16 +01:00
bell@sanja.is.com.ua
d40bec6829
Merge
2002-11-25 17:53:03 +02: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
