serg@serg.mylan
e1e5b97dea
manually merged
...
Gluh's SESSION/GLOBAL for @variables fix in sql_yacc.yy and
Bar's well_formed_len() changes in ndb code
did not make it and should be re-applied manually
2005-04-06 21:19:20 +02:00
serg@serg.mylan
78332dcf78
merged
2005-04-06 20:20:37 +02:00
konstantin@mysql.com
5f8d71710b
Minor fix in cursors execution.
2005-04-06 22:09:43 +04:00
konstantin@mysql.com
70aecbb8a4
Refactor parts of do_select() (JOIN execution).
2005-04-06 21:48:16 +04:00
monty@mysql.com
a7c6348192
Fixed errors found during review
2005-04-06 19:43:35 +03:00
hf@deer.(none)
51f0963b8e
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.errmsg
2005-04-06 21:05:45 +05:00
monty@mysql.com
beb28b27e0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-04-06 17:23:34 +03:00
monty@mysql.com
49e721677f
Fixed errors descovered by valgrind 2.4
...
Added suppression file for some valgrind warnings that are not real errors
2005-04-06 17:22:21 +03:00
hf@deer.(none)
b552ed8fd3
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.errmsg
2005-04-06 15:51:24 +05:00
hf@deer.(none)
7cd0e43437
Stupid error message for 'insert "aaa"' into decimal column fixed
2005-04-06 15:49:55 +05:00
msvensson@neptunus.(none)
1e030d5d93
BUG#9626 Several serious errors reported by Valgrind in latest 5.0 bk tree
...
- Fixing obvious ones
2005-04-06 12:27:43 +02:00
gluh@mysql.com
85bf400612
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
2005-04-06 15:19:02 +05:00
bar@mysql.com
1c46a02069
Minor clean-ups for the previous commit.
2005-04-06 15:12:44 +05:00
gluh@mysql.com
decfc86fbb
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
2005-04-06 14:14:13 +05:00
gluh@eagle.intranet.mysql.r18.ru
6f18d7d26f
Fix for bug #9286 : SESSION/GLOBAL should be disallowed for user variables
2005-04-06 14:13:06 +05:00
msvensson@neptunus.(none)
9586a06f85
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-06 10:56:51 +02:00
msvensson@neptunus.(none)
a47bc28876
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-06 10:56:02 +02:00
bar@mysql.com
0134a2b286
Adding a new parameter for well_formed_length to
...
return error. We'll use it for better warnign reporting.
2005-04-06 11:53:15 +05:00
jimw@mysql.com
b95cb4e654
Merge
2005-04-05 19:45:34 -07:00
jani@ua141d10.elisa.omakaista.fi
08d51d05dc
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-04-05 23:20:09 +03:00
jani@ua141d10.elisa.omakaista.fi
1dd12e9d04
Some of the argument place holders were not quite correct compared to
...
the argument type. Fixed also some float() casts to double() as query_id
is now actually longlong type. Related to Bug#9646.
2005-04-05 23:14:56 +03:00
jimw@mysql.com
a12f66251b
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-04-05 12:37:23 -07:00
msvensson@neptunus.(none)
771133bc6c
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2156.1.5
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-05 21:31:54 +02:00
msvensson@neptunus.(none)
9a3a9d037f
Merge neptunus.(none):/home/msvensson/mysql/bug6762-1.2152.20.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2156.1.5
2005-04-05 21:30:24 +02:00
serg@serg.mylan
42277bdd2f
Per Heikki's request make trans_register_ha tolerant to multiple registrations
2005-04-05 18:42:34 +02:00
jimw@mysql.com
9ff854dd12
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-04-05 07:59:11 -07:00
heikki@hundin.mysql.fi
a3e6b30a89
handler.cc, ha_innodb.cc:
...
Fix Bug #8650 : InnoDB does not rollback SQL statement at an error
2005-04-05 17:56:40 +03:00
pem@mysql.com
3f7901c6ed
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-04-05 16:01:29 +02:00
mskold@mysql.com
f792eaf061
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-05 16:01:28 +02:00
mskold@mysql.com
70482c4127
Fix Bug #9517 Condition pushdown to storage engine does not work for update/delete, post review fix, removed quick constraint
2005-04-05 15:56:43 +02:00
pem@mysql.comhem.se
b18ca48c47
Additional fix for BUG#5907: Traditional mode: invalid value can be inserted via a stored procedure
...
... make the handler catch too.
2005-04-05 15:49:10 +02:00
jimw@mysql.com
39cd93e867
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-04-05 06:36:16 -07:00
mskold@mysql.com
9189816e07
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-05 14:58:42 +02:00
serg@serg.mylan
71811298b9
sql/item.cc
...
after merge fix
sql/mysqld.cc
too early for sync-binlog=1 by default :)
2005-04-05 14:46:18 +02:00
serg@serg.mylan
c796ea598c
Merge
2005-04-05 13:23:11 +02:00
serg@serg.mylan
810b2c3d40
remove the rest of isam/merge references
...
fix a race condition in TC_LOG_BINLOG::unlog
2005-04-05 13:17:49 +02:00
gluh@eagle.intranet.mysql.r18.ru
6c8624f6d5
Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement
...
restore original 'lex->query_tables' table list after
processing of information schema table
remove unnecessary operations
2005-04-05 16:09:56 +05:00
msvensson@neptunus.(none)
36120cd6af
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug6762
2005-04-05 13:07:46 +02:00
msvensson@neptunus.(none)
f22b8930c3
Fix swedish error message
2005-04-05 13:01:16 +02:00
gluh@mysql.com
9dd3e180b9
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Bugs/mysql-5.0
2005-04-05 15:13:07 +05:00
gluh@eagle.intranet.mysql.r18.ru
6c8c2d22b9
Fix for bug#7214: information_schema: unauthorized user can see metadata
...
the fix for 'columns' table only
Rights check for 'routines' table is already done
(see WL2131 Access control for SHOW ... PROCEDURE|FUNCTION ...)
rename 'testtets' database to 'mysqltest' to keep number of
DBs which created by mysql-test as small as possible
2005-04-05 15:12:15 +05:00
ramil@mysql.com
0ba6c67d13
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-04-05 14:42:18 +05:00
gluh@eagle.intranet.mysql.r18.ru
fed0ba272a
Code optimization(discussed with Monty)
2005-04-05 14:31:46 +05:00
msvensson@neptunus.(none)
f8ae1e53c8
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug6762
2005-04-05 11:23:17 +02:00
ramil@mysql.com
f57c7d8b11
Fix for bug #9571 : Primary key creation causes server crash.
2005-04-05 13:40:34 +05:00
jimw@mysql.com
bb215f648b
Merge
2005-04-04 23:03:56 -07:00
jimw@mysql.com
247f2ac563
Merge new tests
2005-04-04 18:29:18 -07:00
jimw@mysql.com
59b1a1f62f
Merge mysql.com:/home/jimw/my/mysql-4.1-9472b
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-04 18:27:27 -07:00
sergefp@mysql.com
ea43deb9e3
Merge mysql.com:/home/psergey/mysql-4.1-bug8877
...
into mysql.com:/home/psergey/mysql-5.0-bug8877-merge
2005-04-05 03:36:14 +04:00
sergefp@mysql.com
53e0b5b5db
Removed extra comment
2005-04-05 03:34:39 +04:00