Commit 1cca44ab authored by serg@serg.mysql.com's avatar serg@serg.mysql.com

Merge

parents 444cd700 6a0faa9a
...@@ -129,6 +129,8 @@ echo "If you would like to use a different browser, set the 'BROWSER' environmen ...@@ -129,6 +129,8 @@ echo "If you would like to use a different browser, set the 'BROWSER' environmen
echo "variable." echo "variable."
echo echo
$BROWSER file://`pwd`/manual_toc.html $BROWSER file:`pwd`/manual_toc.html
echo "-- Press Enter to Continue --"
read
cleanup cleanup
...@@ -4319,6 +4319,12 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}. ...@@ -4319,6 +4319,12 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}.
@image{Flags/netherlands} Netherlands [Silverpoint] @ @image{Flags/netherlands} Netherlands [Silverpoint] @
@uref{http://mysql.silverpoint.nl/, WWW} @uref{http://mysql.silverpoint.nl/, WWW}
@item
@c EMAIL: mysql@widexs.nl (Wouter de Jong)
@image{Flags/netherlands} Netherlands [Widexs BV] @
@uref{http://mysql.widexs.nl/, WWW}
@uref{ftp://mysql.widexs.nl/pub/mysql/, FTP}
@item @item
@c EMAIL: W.Sylwestrzak@icm.edu.pl (Wojtek Sylwestrzak) @c EMAIL: W.Sylwestrzak@icm.edu.pl (Wojtek Sylwestrzak)
@c mirroring nightly at 05:25 @c mirroring nightly at 05:25
...@@ -4435,11 +4441,11 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}. ...@@ -4435,11 +4441,11 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}.
@uref{http://ftp.plig.org/pub/mysql/, WWW} @uref{http://ftp.plig.org/pub/mysql/, WWW}
@uref{ftp://ftp.plig.org/pub/mysql/, FTP} @uref{ftp://ftp.plig.org/pub/mysql/, FTP}
@item @c @item
@c lance@uklinux.net (Lance) @c lance@uklinux.net (Lance)
@image{Flags/great-britain} UK [uklinux.net] @ @c @image{Flags/great-britain} UK [uklinux.net] @
@uref{http://mirror.uklinux.net/mysql/, WWW} @c @uref{http://mirror.uklinux.net/mysql/, WWW}
@uref{ftp://mirror.uklinux.net/pub/mysql/, FTP} @c @uref{ftp://mirror.uklinux.net/pub/mysql/, FTP}
@c @item @c @item
@c unknown @c unknown
...@@ -40600,6 +40606,7 @@ for all MySQL fieldtypes (version 2001.1.1). By SciBit @uref{http://www.scibit.c ...@@ -40600,6 +40606,7 @@ for all MySQL fieldtypes (version 2001.1.1). By SciBit @uref{http://www.scibit.c
@item @uref{http://www.fastflow.it/mylua/, MyLUA home page} @item @uref{http://www.fastflow.it/mylua/, MyLUA home page}
How to use the LUA language to write @strong{MySQL} @code{PROCEDURE} that can How to use the LUA language to write @strong{MySQL} @code{PROCEDURE} that can
be loaded runtime. be loaded runtime.
@itemize @bullet @itemize @bullet
@item @uref{http://www.mysql.com/Downloads/Contrib/lua-4.0.tar.gz, Lua 4.0} @item @uref{http://www.mysql.com/Downloads/Contrib/lua-4.0.tar.gz, Lua 4.0}
LUA 4.0 LUA 4.0
...@@ -40607,6 +40614,10 @@ LUA 4.0 ...@@ -40607,6 +40614,10 @@ LUA 4.0
Patch for MySQL 3.23.32 to use LUA 4.0. By Cristian Giussani. Patch for MySQL 3.23.32 to use LUA 4.0. By Cristian Giussani.
@end itemize @end itemize
@item @uref{http://www.mysql.com/Downloads/Contrib/patched_myodbc.zip, patched_myodbc.zip}
Patch (for Omniform 4.0 support) to the MyODBC driver.
By Thomas Thaele @email{tthaele@@papenmeier.de}
@end itemize @end itemize
@appendixsec Clients @appendixsec Clients
...@@ -29,7 +29,6 @@ Created 10/21/1995 Heikki Tuuri ...@@ -29,7 +29,6 @@ Created 10/21/1995 Heikki Tuuri
#endif #endif
#ifndef S_IRUSR #ifndef S_IRUSR
#define
#define S_IRUSR 00400 #define S_IRUSR 00400
#define S_IWUSR 00200 #define S_IWUSR 00200
#define S_IRGRP 00040 #define S_IRGRP 00040
......
ChargeID ServiceID ChargeDate ChargeAmount FedTaxes ProvTaxes ChargeStatus ChargeAuthorizationMessage ChargeComment ChargeTimeStamp
1 1 2001-03-01 1.00 1.00 1.00 New blablabla NULL now
2 1 2001-03-01 1.00 1.00 1.00 New NULL NULL now
# test for bug reported by Mark Steele
drop table if exists tblChange;
CREATE TABLE tblCharge (
ChargeID int(10) unsigned DEFAULT '0' NOT NULL auto_increment,
ServiceID int(10) unsigned DEFAULT '0' NOT NULL,
ChargeDate date DEFAULT '0000-00-00' NOT NULL,
ChargeAmount decimal(20,2) DEFAULT '0.00' NOT NULL,
FedTaxes decimal(20,2) DEFAULT '0.00' NOT NULL,
ProvTaxes decimal(20,2) DEFAULT '0.00' NOT NULL,
ChargeStatus enum('New','Auth','Unauth','Sale','Denied','Refund')
DEFAULT 'New' NOT NULL,
ChargeAuthorizationMessage text,
ChargeComment text,
ChargeTimeStamp varchar(20),
PRIMARY KEY (ChargeID),
KEY ServiceID (ServiceID),
KEY ChargeDate (ChargeDate)
) type=BDB;
BEGIN;
INSERT INTO tblCharge
VALUES(NULL,1,'2001-03-01',1,1,1,'New',NULL,NULL,'now');
COMMIT;
BEGIN;
UPDATE tblCharge SET ChargeAuthorizationMessage = 'blablabla' WHERE
ChargeID = 1;
COMMIT;
INSERT INTO tblCharge
VALUES(NULL,1,'2001-03-01',1,1,1,'New',NULL,NULL,'now');
select * from tblCharge;
drop table tblCharge;
...@@ -428,3 +428,5 @@ select * from t1 where i=1 and j=2; ...@@ -428,3 +428,5 @@ select * from t1 where i=1 and j=2;
create index ax1 on t1 (i,j); create index ax1 on t1 (i,j);
select * from t1 where i=1 and j=2; select * from t1 where i=1 and j=2;
drop table t1; drop table t1;
...@@ -54,4 +54,3 @@ show create table t2; ...@@ -54,4 +54,3 @@ show create table t2;
select * from t2 where MATCH inhalt AGAINST (NULL); select * from t2 where MATCH inhalt AGAINST (NULL);
drop table t1,t2; drop table t1,t2;
...@@ -4075,8 +4075,8 @@ char *Field_blob::pack(char *to, const char *from, uint max_length) ...@@ -4075,8 +4075,8 @@ char *Field_blob::pack(char *to, const char *from, uint max_length)
const char *Field_blob::unpack(char *to, const char *from) const char *Field_blob::unpack(char *to, const char *from)
{ {
memcpy(to,from,packlength); memcpy(to,from,packlength);
ulong length=get_length(from);
from+=packlength; from+=packlength;
ulong length=get_length();
if (length) if (length)
memcpy_fixed(to+packlength, &from, sizeof(from)); memcpy_fixed(to+packlength, &from, sizeof(from));
else else
......
...@@ -1222,7 +1222,21 @@ ha_innobase::write_row( ...@@ -1222,7 +1222,21 @@ ha_innobase::write_row(
} }
if (table->next_number_field && record == table->record[0]) { if (table->next_number_field && record == table->record[0]) {
/* Set the 'in_update_remember_pos' flag to FALSE to
make sure all columns are fetched in the select done by
update_auto_increment */
prebuilt->in_update_remember_pos = FALSE;
update_auto_increment(); update_auto_increment();
/* We have to set sql_stat_start to TRUE because
update_auto_increment has called a select, and
has reset that flag; row_insert_for_mysql has to
know to set the IX intention lock on the table, something
it only does at the start of each statement */
prebuilt->sql_stat_start = TRUE;
} }
if (prebuilt->mysql_template == NULL if (prebuilt->mysql_template == NULL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment