monty@mysql.com
e2ea35ec67
Merge with 4.1
2005-02-22 15:47:00 +02:00
mats@mysql.com
0ad02a920c
Merge from 4.0
2005-02-18 14:19:08 +01:00
mats@mysql.com
d0f1b5f3fd
Merge mysql.com:/home/bkroot/mysql-4.0
...
into mysql.com:/home/bk/b7879-mysql-4.0
2005-02-18 13:50:19 +01:00
serg@serg.mylan
530eecbd99
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-17 14:00:44 +01:00
monty@mysql.com
410e51c854
Fixed failing test cases 'row.test' when running with --ps-protocol
...
Simple optimzations done while reviewing code
2005-02-15 16:45:00 +02:00
mats@mysql.com
625f7f0d55
Bug#7879: Using TL_READ_NO_INSERT locks instead of TL_READ locks when
...
reading tables in "complex" SQL statements. If inserts happen in a
table being read, the statements have no serialization order and the
change can therefore not be reproduced on the slave.
2005-02-15 11:02:01 +01:00
serg@serg.mylan
fd828e5b4d
manually merged
2005-02-14 21:50:09 +01:00
hf@deer.(none)
b94a482ee9
Precision Math implementation
2005-02-09 02:50:45 +04:00
monty@mysql.com
422c2eb868
4.1 -> 5.0 merge
2005-02-03 13:18:30 +02:00
monty@mysql.com
3936edd7fa
Fixed during review of new pulled code
2005-02-02 20:28:01 +02:00
serg@serg.mylan
33fc4b10b6
configure.in
...
don't define UNIV_DEBUG in CFLAGS/CXXFLAGS anymore
sql/mysqld.cc
hide from the user options that do nothing
sql/sql_update.cc
better fix for uninitialized used_index
2005-02-02 12:08:20 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
6a354b1b04
Bug#7011
...
Merge from 4.0
2005-01-31 12:48:00 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
500fbf5c0f
Bug#7011
...
Fix replication for multi-update
new test - rpl_multi_update2
2005-01-30 10:24:03 +00:00
serg@serg.mylan
3c5060981f
query_id and my_xid -> ulonglong
...
fix for binlog+autocommit+tclog
comments, style fixes
2005-01-27 22:38:56 +01:00
serg@serg.mylan
c76405a7ee
merged
2005-01-24 19:41:42 +01:00
serg@serg.mylan
67ba2e367a
fixes/cleanups according to Coverity report
2005-01-24 15:48:25 +01:00
monty@mysql.com
314cf993c6
Fixed memory reference errors found by valgrind
2005-01-12 03:38:53 +02:00
monty@mysql.com
bda0a78184
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-01-06 13:31:31 +02:00
monty@mysql.com
d35140a851
First stage of table definition cache
...
Split TABLE to TABLE and TABLE_SHARE (TABLE_SHARE is still allocated as part of table, will be fixed soon)
Created Field::make_field() and made Field_num::make_field() to call this
Added 'TABLE_SHARE->db' that points to database name; Changed all usage of table_cache_key as database name to use this instead
Changed field->table_name to point to pointer to alias. This allows us to change alias for a table by just updating one pointer.
Renamed TABLE_SHARE->real_name to table_name
Renamed TABLE->table_name to alias
Renamed TABLE_LIST->real_name to table_name
2005-01-06 13:00:13 +02:00
bell@sanja.is.com.ua
a8a5f3590c
fixed bugs in view code with prepared statemnts
2005-01-04 18:04:16 +02:00
monty@mysql.com
7cf8285b3f
After merge fixes
...
Add support for warnings for prepare of prepared statements
Fixed test to work with --ps-protocol
Fixed some test results
2005-01-04 13:46:53 +02:00
monty@mysql.com
309b1a2b6c
Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY
2005-01-03 23:04:52 +02:00
monty@mysql.com
2299e1eca4
Better handling of ensuring that setup_tables() are not called twice
...
This fixed a bug in prepared statements when used with outher joins
Fixed a bug in SUM(DISTINCT) when used with prepared statements.
Some safety fixes in test scripts to ensure that previous test failures shouldn't affect other tests
2005-01-03 21:04:33 +02:00
monty@mysql.com
1bd22faa05
Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
...
This allows use to use INSERT IGNORE ... ON DUPLICATE ...
2004-12-31 12:04:35 +02:00
monty@mysql.com
d71c030587
After merge fixes
2004-12-31 00:44:00 +02:00
monty@mishka.local
4f4bbfc279
Merge with 4.1
2004-12-22 13:54:39 +02:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
1be319a708
Merge Bug#7391 from 4.0
2004-12-18 15:12:10 +00: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
dlenev@mysql.com
62a6d9749b
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg6765
2004-12-09 13:33:12 +03:00
dlenev@brandersnatch.localdomain
4b0882e0a6
Fix for bug #6765 "Implicit access to time zone description
...
tables requires privileges for them if some table or column level grants
present" (with after-review fixes).
We should set SELECT_ACL for implicitly opened tables in
my_tz_check_n_skip_implicit_tables() to be able to bypass privilege
checking in check_grant(). Also we should exclude those tables from
privilege checking in multi-update.
2004-12-09 13:31:46 +03:00
monty@mysql.com
75d0958dc3
After merge fixes
...
Fixed compiler warnings
Fix core dump when sending SIGHUP to mysqld
2004-12-06 17:15:54 +02:00
mskold@mysql.com
f6209be015
New fix for bug#6796 Wrong outcome of update operation of ndb table
2004-12-06 14:34:02 +01:00
mskold@mysql.com
75da2fb3f4
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-12-06 14:15:52 +01:00
monty@mysql.com
0de4777187
Merge with 4.1
2004-12-06 11:38:56 +02:00
mats@mysql.com
2bbdf2403d
Bug#6391 (binlog-do-db rules ignored)
...
CREATE DATABASE statement used the current database instead of the
database created when checking conditions for replication.
CREATE/DROP/ALTER DATABASE statements are now replicated based on
the manipulated database.
2004-12-03 12:13:51 +01:00
mskold@mysql.com
065184dac3
Fix for Bug #6794 Wrong outcome of update operation of ndb table
2004-11-28 22:28:36 +01:00
bell@sanja.is.com.ua
a1cac9687e
spelling fixed/comments added (postreview fixes)
2004-11-25 09:28:32 +02:00
bell@sanja.is.com.ua
1e3d8b0839
post-merge fix
2004-11-25 02:23:13 +02:00
bell@sanja.is.com.ua
072d38eb12
merge
2004-11-21 20:08:12 +02:00
bell@sanja.is.com.ua
21eb2e2eae
post merge
2004-11-21 19:33:49 +02:00
bell@sanja.is.com.ua
7210195f1e
now my_printf_error is not better then my_error, but my_error call is shorter
...
used only one implementation of format parser of (printf)
fixed multistatement
2004-11-13 19:35:51 +02:00
bell@sanja.is.com.ua
1555469b64
merge
2004-11-12 15:36:31 +02:00
bell@sanja.is.com.ua
31f7811183
post-review fixes
2004-11-12 14:34:00 +02:00
konstantin@mysql.com
1d32e06be9
Few more places with thd->lex replaced with lex (mysql_update,
...
check_simple_select). This change was inspired by Monty in December 2003
when thd->lex became a pointer in 4.1.
2004-11-11 22:37:48 +03:00
bell@sanja.is.com.ua
0ef0b030a5
merge
2004-11-11 21:18:10 +02:00
bell@sanja.is.com.ua
a41ef77b7b
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-view-5.0
2004-11-08 03:33:52 +02:00
bell@sanja.is.com.ua
9d0bb7426a
postreview fixes
2004-11-08 01:54:23 +02:00
bell@sanja.is.com.ua
7eae926e26
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-view-5.0
2004-11-06 12:46:46 +02:00
bell@sanja.is.com.ua
064b02203f
new lock for multiupdate:
...
- open and create derived tables
- detect which tables should be locked for write
- lock and fill derived tables
some unitialized variables fixed
2004-11-05 17:29:47 +02:00