mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
28286 commits 2781 branches 343 tags 1.6 GiB
Commit graph

13492 commits

Author SHA1 Message Date
joerg@mysql.com
415053f2d8 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/M51/mysql-5.1
 2005-11-23 11:53:21 +01:00
joerg@mysql.com
3a7d81258c Merge mysql.com:/M51/mysql-5.1 into mysql.com:/M51/clone-5.1 2005-11-23 11:24:52 +01:00
pem@mysql.com
f1f257c06c Added myself to authors.h. 2005-11-23 11:07:08 +01:00
kent@mysql.com
ffb5a275c3 configure.in: 
Changed version to 5.1.3
 2005-11-23 01:09:13 +01:00
eric@mysql.com
bb4cfc9924 Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/eric/fed-txn-mysql-5.1-new
 2005-11-22 11:42:09 -08:00
patg@krsna.patg.net
4e666f2f99 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.1-new
 2005-11-21 15:31:12 -08:00
patg@krsna.patg.net
88776a8244 BUG #14524 
Post-review fixes to original changeset http://lists.mysql.com/internals/32422
 2005-11-21 15:21:04 -08:00
konstantin@mysql.com
1fa45d6121 Merge mysql.com:/opt/local/work/mysql-5.0-8568 
into  mysql.com:/opt/local/work/mysql-5.1-new
 2005-11-19 19:26:22 +03:00
konstantin@mysql.com
723baa4d90 A fix for Bug#14845 "mysql_stmt_fetch returns MYSQL_NO_DATA when 
COUNT(*) is 0" (the test case has been pushed already)
 2005-11-19 19:00:02 +03:00
guilhem@mysql.com
b3845d1f60 Fix after merge of 5.0 into 5.1. Failed tests before merge: bdb-deadlock, ndb_cache2, ndb_multi2, 
ps_6bdb (this one fails circa once over 4 runs). After the merge: the same PLUS mysql_client_test&sp (due to problem in fix of BUG#14845 which has also
been noticed in 5.0 too and Konstantin is looking at it) PLUS mysqlcheck (just consequence of mysql_client_test).
And a replication bugfix (thd->spcont must be taken into account when calling tables_ok(), as in 5.0,
and so some brackets were missing which changed one test).
Pekka will look at the NDB code where I just used "ul": ndb_charset test, and storage/ndb/src/kernel/vm/SimulatedBlock.cpp
and storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp (SimulatedBlock.hpp automerged);
please also check storage/ndb/src/ndbapi/NdbRecAttr.cpp. Petr please check ha_tina.cc.
 2005-11-19 15:56:55 +01:00
guilhem@mysql.com
a7c3aed5f4 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
 2005-11-19 13:06:16 +01:00
guilhem@mysql.com
24006266d0 Merge mysql.com:/home/mysql_src/mysql-5.0-van 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
(2nd try; Pekka kindly accepted to fix storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
and storage/ndb/src/kernel/vm/SimulatedBlock.cpp after I push).
 2005-11-19 10:43:28 +01:00
patg@krsna.patg.net
f6cd0148b8 BUG #14524 
Patch that fixes crashing when partition uses blackole for 
underlying tables.
 2005-11-18 17:02:27 -08:00
konstantin@mysql.com
86f1896fb0 Bug#13510 "Setting password local variable changes current 
password": additional fix, also make sure that a syntax error is 
returned for set names="foo" when there is no such variable or no
stored procedure.
 2005-11-19 01:22:12 +03:00
guilhem@mysql.com
7d7eb22ed1 fix after merge of 5.0 into 5.1 2005-11-18 21:34:54 +01:00
evgen@moonbone.local
c9ab4d614e Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/13622-bug-5.0-mysql
 2005-11-18 22:11:34 +03:00
guilhem@mysql.com
2f95fc2701 Merge mysql.com:/home/mysql_src/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
 2005-11-18 16:38:01 +01:00
konstantin@mysql.com
c20fe5dffd More authors. 2005-11-18 14:39:44 +03:00
omer@mysql.com
46f140deb3 Updated authors.h file (and show_check.result file) to include QA team members 
Note: This change was reviewed by Brian before the commit.
 2005-11-17 17:35:50 -08:00
evgen@moonbone.local
a031778955 Manually merged 2005-11-18 01:16:15 +03:00
jimw@mysql.com
f8ce7bc01e Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-17 13:37:30 -08:00
jimw@mysql.com
cee6671756 Merge mysql.com:/home/jimw/my/mysql-4.1-11796 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-11-17 10:58:46 -08:00
konstantin@mysql.com
a42b3730aa Post-review fixes (Bug#13524). 2005-11-17 19:40:48 +03:00
konstantin@mysql.com
c2a1c6c81f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-13524
 2005-11-17 19:26:58 +03:00
guilhem@mysql.com
50afa94dd5 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/mysql_src/mysql-5.1
 2005-11-17 15:59:39 +01:00
guilhem@mysql.com
2c8d2ebe6f Fix for BUG#15018 "valgrind error in Rpl_filter (uninitalized memory - could crash)". 
The code was reading a HASH or DYNAMIC_ARRAY which may be uninited (difference from 5.0
is that those vars were always zeroed in 5.0 because were static globals, while they are new'd in 5.1).
 2005-11-17 15:58:55 +01:00
grog@mysql.com
e91e55d643 set_var.cc, mysqld.cc, ha_innodb.h: 
BUG#12701: SHOW VARIABLES does not show correct size of buffer pool.
ha_innodb.cc:
  BUG#12701: SHOW VARIABLES does not show correct size of buffer pool
 2005-11-17 15:08:49 +01:00
andrey@lmy004.
2982de9ab6 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bdb_region
 2005-11-17 15:01:28 +01:00
andrey@lmy004.
3fa9c4243b reorder the variables - should be in alphabetical order 2005-11-17 14:58:14 +01:00
konstantin@mysql.com
85f5263284 A fix and a test case for Bug#13524 "lock timeout gives 
incorrect warning on open cursor"
 2005-11-17 16:20:12 +03:00
eric@mysql.com
c8485ed447 Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/eric/fed-txn-mysql-5.1-new
 2005-11-17 02:54:17 -08:00
dlenev@mysql.com
f0e558c1b8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13399-2
 2005-11-17 04:38:10 +03:00
dlenev@mysql.com
63fcccb193 Fix for bug #13399 Crash when executing PS/SP which should activate trigger 
which is now dropped" and bug #12329 "Bogus error msg when executing PS with
stored procedure after SP was re-created".
 2005-11-17 03:51:14 +03:00
konstantin@mysql.com
9e1f155864 A fix and a test case for Bug#14077 "Failure to replicate a stored 
function with a cursor". Enable execution of SELECT queries in SP on slave.
 2005-11-17 03:15:10 +03:00
jimw@mysql.com
4f6a1e6ef1 Merge mysql.com:/home/jimw/my/mysql-5.1-14876 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-11-16 15:51:35 -08:00
ingo@mysql.com
1237c2fbcc Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-11-16 21:33:38 +01:00
ingo@production.mysql.com
e55fd656dc Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
 2005-11-16 18:47:17 +01:00
ingo@production.mysql.com
82d91620ce Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
 2005-11-16 16:04:34 +01:00
ingo@mysql.com
41bb21de16 Bug#14616 - Freshly imported table returns error 124 when using LIMIT 
After merge fix.
 2005-11-16 15:58:17 +01:00
serg@serg.mylan
60875d3236 bug#14433 - archive uses wrong ref_length 2005-11-16 15:17:08 +01:00
bell@sanja.is.com.ua
a60a6b0f7f Issuing error about presence of commit/rollback statements in stored functions and triggers added to SP parsing procedure (BUG#13627) 
The crash mentioned in original bug report is already prevented by one
of previous patches (fix for bug #13343 "CREATE|etc TRIGGER|VIEW|USER
don't commit the transaction (inconsistency)"), this patch only improve
error returning.
 2005-11-16 14:09:06 +02:00
ingo@mysql.com
3df2007147 Merge mysql.com:/home/mydev/mysql-4.1-4100 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-11-16 10:23:42 +01:00
ingo@mysql.com
e66b88bb7d Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-11-16 10:10:53 +01:00
lars@mysql.com
6c4a4d18cb Fixed typo causing compile failures when not max-compiling 2005-11-16 02:44:05 +01:00
evgen@moonbone.local
7749b8d15b Merge 2005-11-16 02:08:20 +03:00
ingo@mysql.com
74781d6559 Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash 
Version for 5.0.
It fixes three problems:
1. The cause of the bug was that we did not check the table version for
 the HANDLER ... READ commands. We did not notice when a table was
 replaced by a new one. This can happen during ALTER TABLE, REPAIR
 TABLE, and OPTIMIZE TABLE (there might be more cases). I call the fix
 for this problem "the primary bug fix".
2. mysql_ha_flush() was not always called with a locked LOCK_open.
 Though the function comment clearly said it must.
 I changed the code so that the locking is done when required. I call
 the fix for this problem "the secondary fix".
3. In 5.0 (not in 4.1 or 4.0) DROP TABLE had a possible deadlock flaw in
 concur with FLUSH TABLES WITH READ LOCK. I call the fix for this
 problem "the 5.0 addendum fix".
 2005-11-15 21:57:02 +01:00
sasha@asksasha.com
cb6d69f6f4 Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947
 2005-11-15 13:38:48 -07:00
evgen@moonbone.local
3a8e7b7fb9 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/14850-bug-5.0-mysql
 2005-11-15 22:47:03 +03:00
ingo@mysql.com
6bc4636b64 Merge mysql.com:/home/mydev/mysql-4.0-4000 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-11-15 18:09:40 +01:00
ingo@mysql.com
1aa15c25c7 Merge mysql.com:/home/mydev/mysql-4.0-bug14397 
into  mysql.com:/home/mydev/mysql-4.0-4000
 2005-11-15 16:47:15 +01:00