mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
45339 commits 2793 branches 343 tags 1.5 GiB
Commit graph

45339 commits

This branch
This branch
All branches
Author SHA1 Message Date
jonas@perch.ndb.mysql.com
6f4b908b34 ndb - bug#27581 
make sure not to leave partially initialized pagerage-records
 2007-04-02 09:07:15 +02:00
jonas@perch.ndb.mysql.com
48e890be45 fix atrt mysql_install_db, make sure no extra my.cnf is read 2007-04-02 08:39:58 +02:00
jonas@perch.ndb.mysql.com
c77ffe4a26 ndb - fix bug in my.cnf config handling 
put64 for 64-bit variables
 2007-04-02 08:36:00 +02:00
ibabaev@bk-internal.mysql.com
898ec87e14 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
 2007-04-02 03:56:39 +02:00
ibabaev@bk-internal.mysql.com
8b8a61d77a Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-04-02 03:53:21 +02:00
igor@olga.mysql.com
5534f099f1 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-04-01 14:00:56 -07:00
lars/lthalmann@dl145k.mysql.com
048502086d Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-04-01 01:49:16 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
572c034485 Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-04-01 01:48:21 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
c32c54881e Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-04-01 01:46:38 +02:00
tomas@whalegate.ndb.mysql.com
fc6a077cc7 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-31 21:53:02 +02:00
lars/lthalmann@dl145k.mysql.com
579cee7f49 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
 2007-03-31 20:07:44 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
b7537e2ac4 New test case shows valgrind failure (disabling this 
new test case until the valgrind failure is fixed, 
reported in bug 27564)
 2007-03-31 19:49:05 +02:00
mats@romeo.(none)
bd86c0f459 Fix to rpl_row_create_table test. 2007-03-31 19:10:25 +02:00
svoj@mysql.com/april.(none)
8c1b109cc3 After merge fix. 2007-03-31 20:27:43 +05:00
msvensson@pilot.blaudden
a12213aa59 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-31 17:18:26 +02:00
msvensson@pilot.blaudden
d96319299b Add correct replace 2007-03-31 17:18:03 +02:00
msvensson@pilot.blaudden
706a7a8fb5 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-31 15:14:13 +02:00
msvensson@pilot.blaudden
398c24d1a1 Bug#27049 Race condition in test mysqlbinlog.test 
- Add --local-load option to avoidthat the load data file requested
   by mysqlbinlog end up in local var/tmp dir and not in system global
   tmpdir
 2007-03-31 15:07:48 +02:00
svoj@april.(none)
51710387ab Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG26138/mysql-5.1-engines
 2007-03-31 17:29:40 +05:00
lars/lthalmann@mysql.com/dl145k.mysql.com
fcc2b7ae4b GLOBAL DEBUG variable does not work 2007-03-31 13:48:33 +02:00
lars/lthalmann@dl145k.mysql.com
395b3694a8 Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-03-31 12:57:24 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
dd1ef14cfe Avoiding SESSION with debug, since it does not work in valgrind 2007-03-31 12:56:03 +02:00
lars/lthalmann@dl145h.mysql.com
2f0ecd6a14 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-03-31 12:38:20 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
cec17aa0ba Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-03-31 12:36:50 +02:00
ibabaev@bk-internal.mysql.com
466586472b Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 
into  bk-internal.mysql.com:/data0/bk/mysql-4.1-opt
 2007-03-31 09:52:18 +02:00
svoj@mysql.com/june.mysql.com
f297b5d873 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG26138/mysql-5.0-engines
 2007-03-31 12:24:28 +05:00
igor@olga.mysql.com
0c5ba6246b Fixed bug #27154: memory corruption when using row equalities in where 
conditions.
When allocating memory for KEY_FIELD/SARGABLE_PARAM structures the
function update_ref_and_keys did not take into account the fact that
a single row equality could be replaced by several simple equalities.
Fixed by adjusting the counter cond_count accordingly for each subquery
when performing substitution of a row equality for simple equalities.
 2007-03-31 00:23:03 -07:00
lars/lthalmann@mysql.com/dl145k.mysql.com
1965530b0e Test timeout 2007-03-31 09:15:19 +02:00
ibabaev@bk-internal.mysql.com
9a21d1d50a Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
 2007-03-31 05:31:35 +02:00
sergefp@pylon.mylan
0a68b63735 Merge mysql.com:/home/psergey/bk-trees/mysql-5.0-opt 
into  mysql.com:/home/psergey/mysql-5.1-merge2
 2007-03-31 03:12:33 +04:00
evgen@moonbone.local
bd95e76bac item.cc, insert_update.result: 
After merge fix.
 2007-03-31 02:57:26 +04:00
evgen@moonbone.local
f470ac2000 Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
 2007-03-31 02:42:40 +04:00
lars/lthalmann@dl145k.mysql.com
ae6216e8cf Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-03-31 00:18:35 +02:00
lars/lthalmann@dl145j.mysql.com
f6f848b9e7 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-03-31 00:17:12 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
9c6dc8c853 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-03-31 00:15:20 +02:00
sergefp@mysql.com
dd7e39f441 BUG#26624, pushbuild fixes: Merge to 5.0 2007-03-31 00:48:31 +04:00
sergefp@mysql.com
dcb2551347 BUG#26624: high mem usage (crash) in range optimizer 
Pushbuild fixes: 
 - Make MAX_SEL_ARGS smaller (even 16K records_in_range() calls is 
   more than it makes sense to do in typical cases)
 - Don't call sel_arg->test_use_count() if we've already allocated 
   more than MAX_SEL_ARGs elements. The test will succeed but will take
   too much time for the test suite (and not provide much value).
 2007-03-31 00:29:18 +04:00
kent@mysql.com/kent-amd64.(none)
2d0da97164 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
 2007-03-30 22:26:06 +02:00
mleich@four.local.lan
5533e6e533 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  four.local.lan:/WORK/mysql-5.1-rpl/src-rpl-ddlx
 2007-03-30 20:50:14 +02:00
ibabaev@bk-internal.mysql.com
8c3525ff31 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-03-30 20:00:12 +02:00
lzhou/zhl@dev3-63.(none)
eecdb3baf1 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug24793
 2007-03-30 17:12:48 +00:00
lzhou/zhl@dev3-63.(none)
4e39f3bb18 Merge dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug24793 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug24793
 2007-03-30 16:43:39 +00:00
cbell/Chuck@mysql_cab_desk.
cc1fd3db10 This patch adds IF EXISTS to the drop of start_n_end to avoid a problem on 
some build machines during testing.
 2007-03-30 12:25:39 -04:00
cbell/Chuck@mysql_cab_desk.
5eb8096700 This patch includes modification to the rpl_events test to limit 
the SELECT in the test to only the expected rows. This helps
eliminate the possibility of spurious rows causing the test to
fail.
 2007-03-30 12:16:48 -04:00
cbell/Chuck@mysql_cab_desk.
c86d40617e Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629_kostja
 2007-03-30 11:39:45 -04:00
cbell/Chuck@mysql_cab_desk.
73ded84c0a WL#3629 - Replication of Invocation and Invoked Features 
This patch removes the SLAVESIDE_DISABLED token from the event status clause
and adds the ability to mark an event as status = SLAVESIDE_DISABLED by using
the syntax DISABLE ON SLAVE instead.

The patch also adds tests to rpl_events to check the new syntax.
 2007-03-30 11:08:19 -04:00
lzhou/zhl@dev3-63.(none)
2b2ad6d605 BUG#24793 Add SO_KEEPALIVE socket option to avoid cluster nodes keeping dead connections forever. 2007-03-30 15:01:03 +00:00
msvensson@shellback.(none)
724573f7ff Cset exclude: msvensson@shellback.(none)|ChangeSet|20070330134336|02280 2007-03-30 16:43:15 +02:00
lzhou/zhl@dev3-63.(none)
d8b5edb0bd Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug23354
 2007-03-30 14:40:49 +00:00
evgen@sunlight.local
7c42232d1d Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the 
NO_AUTO_VALUE_ON_ZERO mode.

In the NO_AUTO_VALUE_ON_ZERO mode the table->auto_increment_field_not_null
variable is used to indicate that a non-NULL value was specified by the user
for an auto_increment column. When an INSERT .. ON DUPLICATE updates the
auto_increment field this variable is set to true and stays unchanged for the
next insert operation. This makes the next inserted row sometimes wrongly have
0 as the value of the auto_increment field.

Now the fill_record() function resets the table->auto_increment_field_not_null
variable before filling the record.
The table->auto_increment_field_not_null variable is also reset by the
open_table() function for a case if we missed some auto_increment_field_not_null
handling bug.
Now the table->auto_increment_field_not_null is reset at the end of the
mysql_load() function.

Reset the table->auto_increment_field_not_null variable after each
write_row() call in the copy_data_between_tables() function.
 2007-03-30 18:13:33 +04:00