konstantin@mysql.com
d2c1f3fc37
First step of implementation of WL#1518 "make bundled zlib
...
usable for unix builds": zlib 1.2.1 imported
2004-07-21 17:36:26 -07:00
miguel@hegel.(none)
58bdb6221c
Export the stmt functions on Embedded Server
2004-07-21 19:29:08 -04:00
serg@serg.mylan
27e61d1585
after merge fixes 2
2004-07-22 00:57:31 +02:00
serg@serg.mylan
aa35efd292
after merge fixes
2004-07-22 00:26:33 +02:00
serg@serg.mylan
c9fd775777
merged
2004-07-21 23:32:11 +02:00
bell@sanja.is.com.ua
02614a0247
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-07-21 22:48:05 +03:00
bell@sanja.is.com.ua
a1b6f6db0e
LEX initialization fixed
2004-07-21 22:44:12 +03:00
bell@sanja.is.com.ua
ced57b08a2
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2004-07-21 20:22:13 +03:00
serg@serg.mylan
849ab31863
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-21 19:17:50 +02:00
serg@serg.mylan
555442bf6a
fixed ORDER BY ?
...
new tests to ensure that prepared statement *really* work
(and that MySQL not picks up some number from arbitrary location
that happens to match the parameter's value)
2004-07-21 19:17:07 +02:00
hf@deer.(none)
cbff743b2d
Final patch for WL#1600(warn if max_allowed_packet used)
2004-07-21 21:27:45 +05:00
hf@deer.(none)
5bff13bc72
Merging
2004-07-21 19:10:37 +05:00
pem@mysql.comhem.se
c0ae841258
Fixed BUG#2653: Undeclared variables not detected in stored procedures.
...
We now get an run-time error instead of a crash (although a slightly misleading
error message, but it's an improvement).
2004-07-21 14:53:09 +02:00
bell@sanja.is.com.ua
a1d734e0ed
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-2-5.0
2004-07-21 14:02:40 +03:00
bell@sanja.is.com.ua
7145dedb3d
test of duplicate field names (BUG#4608)
2004-07-21 12:14:45 +03:00
bell@sanja.is.com.ua
ad9a6e0858
error message interception (Bug#4598)
...
error handling of view initialization fixed (Bug#4599)
2004-07-21 04:26:20 +03:00
guilhem@mysql.com
84d9b862f6
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-07-21 00:53:10 +02:00
guilhem@mysql.com
e649dbfcb0
Sanja will probably rework this tomorrow; we need to unify the normal
...
client code and replication slave code, as far as LOAD DATA INFILE and
other queries' execution is concerned. Duplication of code leads to
replication bugs, because the replication duplicate lags much behind.
Fix for 2 Valgrind errors on slave replicating LOAD DATA INFILE
- one serious (causing a random test failure in rpl_loaddata in 5.0)
- one not serious (theoretically a bug but not dangerous): uninited thd->row_count
2004-07-21 00:52:35 +02:00
serg@serg.mylan
108be666d9
Merge bk-internal:/home/bk/mysql-5.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-07-21 00:46:09 +02:00
serg@serg.mylan
f9de714945
misc fixes for compile-time errors
2004-07-21 00:45:08 +02:00
bell@sanja.is.com.ua
77a230c675
test of SHOW PRIVILEGES
2004-07-21 00:45:52 +03:00
bell@sanja.is.com.ua
c1072c4667
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2004-07-20 23:54:13 +03:00
brian@brian-akers-computer.local
943142e126
Updates for archive storage engine.
2004-07-20 13:25:55 -07:00
paul@kite-hub.kitebird.com
ded2e96afe
sql_show.cc:
...
Add views privileges to SHOW PRIVILEGES output.
(Bug #4656 )
2004-07-20 15:03:22 -05:00
bell@sanja.is.com.ua
8bc592f1b0
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2004-07-20 22:10:47 +03:00
tim@sand.box
8ebc968205
Merge tsmith@build.mysql.com:/home/bk/mysql-4.1
...
into sand.box:/home/tim/m/41/bk
2004-07-20 10:09:55 -06:00
tim@sand.box
dfb3e33850
Get ps_1general test to pass (replace .result with .reject - some text
...
was changed in the SHOW STORAGE ENGINES results)
2004-07-20 10:06:28 -06:00
bell@sanja.is.com.ua
10ce8cdef5
fixed quoting of identifiers in VIEWs (BUG#4613)
2004-07-20 18:51:02 +03:00
serg@serg.mylan
a3c4a6d04b
results updated
2004-07-20 16:51:30 +02:00
serg@serg.mylan
8d080cbcfa
manual merge
2004-07-20 15:34:57 +02:00
serg@serg.mylan
27f9f14e1d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-20 11:14:20 +02:00
serg@serg.mylan
5f3461838b
oops, forgot to checkin...
2004-07-20 11:13:23 +02:00
serg@serg.mylan
9de748d1d3
results fixed after merge
2004-07-20 11:00:10 +02:00
bell@sanja.is.com.ua
054cdbe72c
fix case what VIEW have not tables (BUG#4614)
2004-07-20 10:34:39 +03:00
bell@sanja.is.com.ua
1e3f10a4b1
mark subquery in the FROM clause like derived and quoate all identifiers (BUG#4609)
2004-07-20 08:48:28 +03:00
serg@serg.mylan
14853c80d6
compare correct types
2004-07-20 02:44:39 +02:00
serg@serg.mylan
1f0cd873c5
manual merged (blame me!)
2004-07-20 00:53:24 +02:00
konstantin@mysql.com
c9656ba551
Compilation failure on Windows fixed.
2004-07-19 15:12:23 -07:00
bell@sanja.is.com.ua
4246f40065
fixed case when frivileges check switched off (BUG#4631)
2004-07-20 01:01:02 +03:00
serg@serg.mylan
64fa4cc124
merged with 'ul'
2004-07-19 23:46:06 +02:00
konstantin@mysql.com
09b501d6be
Fixes for MSVC++ compiler.
2004-07-19 13:43:19 -07:00
paul@ice.snake.net
e2d6d838e1
handler.cc:
...
Revise output of SHOW ENGINES.
2004-07-19 15:09:21 -05:00
bell@sanja.is.com.ua
3e40d59688
fixed test
2004-07-19 18:33:22 +03:00
serg@serg.mylan
acfcf76228
make acl_init() more robust -
...
don't be confused if new privilege - ENUM ('N','Y') - columns are added (mostly because of downgrade)
don't expect NOT NULL fields to never contain a NULL :) - somebody may've changed table definition, or we may be reading the wrong column
2004-07-19 16:01:53 +02:00
lenz@mysql.com
1ed37f97a3
- only include the GPL license in the LICENSE text, not the FOSS
...
exception (it only applies to 4.0 and above)
2004-07-19 12:32:36 +02:00
bell@sanja.is.com.ua
c5a84657a8
standard values for table type in SHOW TABLES (BUG#4603)
2004-07-19 12:07:33 +03:00
paul@ice.snake.net
849de1e629
mysql_fix_privilege_tables.sql:
...
Fix the other typo, too. :-)
2004-07-18 22:16:42 -05:00
paul@ice.snake.net
d74b122fd9
mysql_fix_privilege_tables.sql:
...
Fix typo in comments.
2004-07-18 22:11:47 -05:00
guilhem@mysql.com
e5c2285782
Fix for BUG#4551 "Temporary InnoDB tables not replicated properly with CREATE TABLE .. SELECT"
...
The problem was that (for any storage engine), the created temporary table was not removed if CREATE SELECT failed (because
of a constraint violation for example). This was not consistent with the manual and with CREATE SELECT (no TEMPORARY).
2004-07-18 14:34:35 +02:00
guilhem@mysql.com
37bf41a7ae
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-07-17 17:10:52 +02:00