mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-01 00:33:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
18575 commits 2853 branches 349 tags 1.7 GiB
Commit graph

8994 commits

Author SHA1 Message Date
serg@serg.mylan
9f94a42fcc BitKeeper/triggers/pre-delta 
don't checkin for Administrator or mysqldev
sql/log.cc@1.157
    restored a bugfix that was lost in a merge
 2004-12-22 22:59:19 +01:00
tomas@poseidon.ndb.mysql.com
ed3e1bb006 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-12-22 22:48:31 +01:00
Sinisa@sinisa.nasamreza.org
e409ebf143 A fix for the bug 2004-12-22 21:31:17 +02:00
dlenev@mysql.com
beb2c1d909 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-smfix
 2004-12-22 19:00:03 +03:00
dlenev@brandersnatch.localdomain
7b9fd879f6 Fix for bug "Microseconds are gobbled from the string result of 
STR_TO_DATE() function if there is another format specifier after %f 
in format string". Also small cleanup of STR_TO_DATE() implementation.
(After review version.)
 2004-12-22 18:58:25 +03:00
tomas@poseidon.ndb.mysql.com
99622f3fa1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-12-22 16:30:16 +01:00
tomas@poseidon.ndb.mysql.com
09dccee098 changed name of g_eventLogger so it can be used in TransporterRegistry and is the same as in the kernel 2004-12-22 16:29:01 +01:00
bar@mysql.com
78260fc1c8 Bugs#7278: Don't open a table if it contains columns with non-supported charsets 2004-12-22 18:56:57 +04:00
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
heikki@hundin.mysql.fi
64f36c94d1 ha_innodb.cc: 
Add a comment that no InnoDB table lock is now acquired in LOCK TABLES if AUTOCOMMIT=1. This helps to avoid deadlocks when porting old MyISAM applications to InnoDB.
 2004-12-22 11:11:16 +02:00
heikki@hundin.mysql.fi
73f61e9d15 Merge hundin.mysql.fi:/home/heikki/mysql-4.0 
into hundin.mysql.fi:/home/heikki/mysql-4.1
 2004-12-22 11:09:09 +02:00
heikki@hundin.mysql.fi
917e8b4da3 ha_innodb.cc: 
If AUTOCOMMIT=1, do not acquire an InnoDB table lock in LOCK TABLES; this makes porting of old MyISAM applications to InnoDB easier, since in that mode InnoDB table locks caused deadlocks very easily
 2004-12-22 11:01:25 +02:00
dlenev@mysql.com
348c2ea808 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-tzbug
 2004-12-21 17:47:48 +03:00
jan@hundin.mysql.fi
d3a979888d Review fixes. 2004-12-21 15:53:01 +02:00
bar@mysql.com
57ec14d939 Bug#7302: UCS2 data in ENUM field get truncated when new column is added 2004-12-21 17:12:27 +04:00
dlenev@mysql.com
0ef4413f36 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-tzbug
 2004-12-21 15:42:19 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
ecd85b1836 Bug#6481 - storage_engine system variable allows nonsensical value 
Check that the requested storage engine is enabled.
 2004-12-21 11:09:48 +00:00
ram@gw.mysql.r18.ru
dfbdbfd006 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7281
 2004-12-21 10:51:11 +04:00
jan@hundin.mysql.fi
198dc7a8ec Content merge. 2004-12-21 07:49:38 +02:00
sergefp@mysql.com
0700f27ca1 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-bug6825
 2004-12-21 02:32:30 +03:00
sergefp@mysql.com
88b63ab669 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/dbdata/psergey/mysql-5.0-nov-clean
 2004-12-21 02:28:12 +03:00
sergefp@mysql.com
e89f5a7136 Fix for BUG#4480: In joins with SELECT_STRAIGHT_JOIN re-order tables by outer join dependency, 
so we read dependent tables after tables they depend on (this is needed for outer joins)
 2004-12-21 01:59:58 +03:00
joreland@mysql.com
c6837c2f7a Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2004-12-20 16:33:45 +01:00
pekka@mysql.com
6463a6d7cd ndb: wl-1893: range scanning backwards, handler 2004-12-20 15:12:42 +01:00
tomas@poseidon.ndb.mysql.com
7b47be8990 added config parameter Group on connection 
moved NdbWaiter, m_ndb_cluster_connection, to impl class
    moved node selection things to cluster connection
    moved all private things to impl class
    added opts for shared memory and node selection
    changed opts handling somewhat; introduced enum for options and common handling of option variables
    added checks for transporter support
    automatic addition of shared mem transporters
    moved wait_until_ready code to cluster connection
    added control of usage of new node selection method
 2004-12-20 12:36:14 +01:00
ram@gw.mysql.r18.ru
da562b7e02 A fix (bug : RAND(RAND) crashes server). 2004-12-20 13:47:38 +04:00
monty@mysql.com
ef910e695b Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2004-12-19 20:26:30 +02:00
monty@mysql.com
6477b4dfd2 Merge with global tree 
Fixed some found bugs in BIT fields
Added more test cases for BIT fields and varchar
 2004-12-19 20:25:19 +02:00
dlenev@mysql.com
b174219777 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0
 2004-12-19 12:52:18 +03:00
dlenev@brandersnatch.localdomain
48fcadf358 Small cleanup of derived tables handling. 
We should not call free_tmp_table() for derived table in 
mysql_derived_filling(), since by this moment this table is already
registered in THD::derived_tables list and thus free_tmp_table() will
be called for it automatically in close_thread_tables().
 2004-12-19 12:51:40 +03:00
dlenev@mysql.com
ca8373f49d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-tzbug
 2004-12-19 11:32:21 +03:00
guilhem@mysql.com
031474cf17 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2004-12-18 18:31:49 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
1be319a708 Merge Bug#7391 from 4.0 2004-12-18 15:12:10 +00:00
monty@mysql.com
eb83e8a046 Simplify code during review 2004-12-18 13:45:19 +02:00
joreland@mysql.com
652a29711b merge 2004-12-18 11:49:15 +01:00
monty@mysql.com
2a215c17bb Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2004-12-18 12:49:14 +02:00
gluh@gluh.mysql.r18.ru
bc7860c80c Fix for bug : information_schema: redundant non-standard TABLE_NAMES table 2004-12-18 13:49:13 +03:00
gluh@gluh.mysql.r18.ru
bf0104045d Fix for bug : information_schema: can't access when table-name = reserved word 2004-12-18 12:48:01 +03:00
monty@mysql.com
f37fd31ddc Merge with global tree 2004-12-18 06:05:16 +02:00
monty@mysql.com
3fb088a075 Add 0x before pointers (to help with debugging) 
Add support for VARCHAR with 1 or 2 length bytes
Enable VARCHAR packing in MyISAM files (previous patch didn't pack data properly)
Give error if we got problems in temporary tables during a SELECT
Don't use new table generated by ALTER TABLE if index generation fails
Fixed wrong call by range_end() (Could cause an ASSERT in debug mode)
 2004-12-18 05:19:21 +02:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
1e07c1a6c1 Remove bogus lines 2004-12-18 02:34:11 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
3047649845 Bug#7391 - Multi-table UPDATE security regression 
Add in missing privilege checks. 
  Tests for the privileges.
 2004-12-18 02:07:32 +00:00
petr@mysql.com
0cca540502 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/cps/mysql/trees/mysql-5.0
 2004-12-18 03:53:43 +03:00
petr@mysql.com
299a2cbeb3 BUG#7384 IM fails to compile on Solaris. 
Solaris doesn't define INADDR_NONE macro. This resulted in compilation
failure. (advanced fix)
 2004-12-18 03:21:20 +03:00
guilhem@mysql.com
884663662b Fix for BUG#7358: removing warning reporting of mysqldump 4.1.8 when calling SHOW CREATE DATABASE, as we deal almost gracefully with it 
(back to behaviour of 4.1.7). Warning was not fatal: mysqldump continued. And the good thing is that it helped spot that starting from 4.1.7,
SHOW CREATE DATABASE failed (if --single-transaction and first db has non-empty InnoDB table and there is a second db) and thus mysqldump
produced CREATE DATABASE statements missing the CHARACTER SET clause. Removing the bug which was in the server, and the warning reporting in
mysqldump (compatibility with old servers).
 2004-12-17 23:37:43 +01:00
lenz@mysql.com
88c40b0df9 Merge mysql.com:/space/my/mysql-5.0 
into mysql.com:/space/my/mysql-5.0-build
 2004-12-17 18:33:53 +01:00
lenz@mysql.com
750f3937d7 - typo fix 2004-12-17 18:00:05 +01:00
lenz@mysql.com
63534a3d98 - make sure to include sql/share/errmsg.txt into the source distribution 2004-12-17 17:46:46 +01:00
ram@gw.mysql.r18.ru
0effd2ce04 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.bit.new
 2004-12-17 18:58:44 +04:00
kaa@polly.local
4644e54f8f Merge akopytov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into polly.local:/home/kaa/src/mysql-5.0
 2004-12-17 17:31:16 +03:00