Commit graph

36397 commits

Author SHA1 Message Date
kostja@bodhi.local
77285cb650 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
2006-07-11 08:36:50 +04:00
kostja@bodhi.local
4f3636dd5a Fix yet another Windows build failure: "true" -> TRUE 2006-07-11 01:46:44 +04:00
cmiller@zippy.(none)
512d1c7ff3 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
2006-07-10 17:20:39 -04:00
mikael/pappa@dator5.(none)
65979719c7 BUG#20893: Valgrind error 2006-07-10 17:08:42 -04:00
joerg@trift2.
90d80ffd81 Merge trift2.:/M50/clone-5.0
into  trift2.:/M50/mysql-5.0
2006-07-10 22:40:57 +02:00
joerg@trift2.
cf2d51c3f7 Raise the version number. 2006-07-10 22:38:13 +02:00
cmiller@zippy.(none)
e62e730020 A patch to Bug#17667 didn't take into consideration that the vardir, which contains
the server's binlog file, might be set to a different directory.  This adds a new
"vardir" parameter, which takes the name of the directory as a value, so that the 
test_bug17667() test can find the binlog.
2006-07-10 16:38:03 -04:00
kostja@bodhi.local
171bcbf339 Fix a Windows build failure. 2006-07-10 23:58:36 +04:00
patg@govinda.patg.net
ddcb190eac Small fix to mysql-5.1-engines, from merge from BUG #19773 2006-07-10 11:57:29 -07:00
ingo/mydev@chilla.local
dfaa3c78f6 Revoking patch for Bug#10952 on behalf of Brian. 2006-07-10 20:46:05 +02:00
cmiller@zippy.(none)
9be1c70404 Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
2006-07-10 13:38:22 -04:00
aelkin/elkin@andrepl.(none)
0581033b3b Merge andrepl.(none):/home/elkin/MySQL/TEAM/BARE/5.1
into  andrepl.(none):/home/elkin/MySQL/TEAM/FIXES/5.1/20919_temp_nlog
2006-07-10 19:56:47 +03:00
guilhem@gbichot3.local
1cc3c80070 fixes after merge. Updates to test's results.
We now reset the THD members related to auto_increment+binlog in
MYSQL_LOG::write(). This is better than in THD::cleanup_after_query(),
which was not able to distinguish between SELECT myfunc1(),myfunc2()
and INSERT INTO t SELECT myfunc1(),myfunc2() from a binlogging point
of view.
Rows_log_event::exec_event() now calls lex_start() instead of
mysql_init_query() because the latter now does too much (it resets
the binlog format).
2006-07-10 18:41:03 +02:00
aelkin/elkin@andrepl.(none)
12c6d15820 Merge andrepl.(none):/net/koti/usr_rh9/home/elkin.rh9/MySQL/TEAM/BARE/5.0
into  andrepl.(none):/home/elkin/MySQL/TEAM/FIXES/5.1/20919_temp_nlog
2006-07-10 18:12:16 +03:00
guilhem@gbichot3.local
02c17dfb17 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into  gbichot3.local:/home/mysql_src/mysql-5.0
2006-07-10 17:06:19 +02:00
pekka@orca.ndb.mysql.com
4163c91d8e ndb - debug stuff in LQH 2006-07-10 15:43:47 +02:00
kostja@bodhi.local
d7f5d73fc2 Fix test results to be vardir-independent. 2006-07-10 16:22:42 +04:00
pekka@orca.ndb.mysql.com
72fa4883cf Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2
2006-07-10 14:12:02 +02:00
pekka@orca.ndb.mysql.com
a3dcbff671 Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug18781
2006-07-10 14:07:40 +02:00
pekka@orca.ndb.mysql.com
9f3b47e53c ndb - bug#18781: close a tiny window (re-commit, try to by-pass merge jam) 2006-07-10 13:59:13 +02:00
pekka@orca.ndb.mysql.com
d525409ba3 Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug18781
2006-07-10 13:54:26 +02:00
pekka@orca.ndb.mysql.com
7c83e6d201 ndb - bug#18781 : 5.0 : add NODE_START_REP from 5.1 (re-commit, try to by-pass merge jam) 2006-07-10 13:44:15 +02:00
guilhem@gbichot3.local
93ce19dfb6 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into  gbichot3.local:/home/mysql_src/mysql-5.1
2006-07-10 13:26:46 +02:00
mats@romeo.(none)
96fd6751cd Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into  romeo.(none):/home/bk/b20821-mysql-5.1-new-rpl
2006-07-10 12:54:24 +02:00
kostja@bodhi.local
f183c08476 A post-merge fix (Bug#8706 "temporary table with data directory option
fails"
2006-07-10 14:53:49 +04:00
ingo/mydev@chilla.local
69bf342a20 Merge chilla.local:/home/mydev/mysql-5.1-amerge
into  chilla.local:/home/mydev/mysql-5.1-aid
2006-07-10 12:41:07 +02:00
kostja@bodhi.local
746749ed75 Add sql_locale.cpp to our windows build scripts. 2006-07-10 14:30:17 +04:00
pekka@orca.ndb.mysql.com
023f44356f Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50
2006-07-10 12:15:34 +02:00
pekka@orca.ndb.mysql.com
bdc7a14bba ndb - bug#20847: non-debug compile fix (repeat since cannot merge 4.1->5.0) 2006-07-10 12:13:45 +02:00
aelkin/elkin@dsl-hkigw8-feb1fb00-100.dhcp.inet.fi
64d096f988 Merge dsl-hkigw8-feb1fb00-100.dhcp.inet.fi:/usr_rh9/home/elkin.rh9/MySQL/TEAM/BARE/4.1
into  dsl-hkigw8-feb1fb00-100.dhcp.inet.fi:/usr_rh9/home/elkin.rh9/MySQL/TEAM/FIXES/5.0/20919_temp_nlog
2006-07-10 13:11:29 +03:00
joerg@trift2.
4fbf8f2fc0 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into  trift2.:/M50/mysql-5.0
2006-07-10 12:08:55 +02:00
mats@romeo.(none)
7848edd065 Fixing problem where the command line for MYSQL_DUMP_SLAVE was not
set properly.
2006-07-10 12:06:30 +02:00
pekka@orca.ndb.mysql.com
4893022ea6 ndb - bug#20847: non-debug compile fix 2006-07-10 12:05:51 +02:00
joerg@trift2.
6ec62524b3 support-files/mysql.spec.sh : Fix a typing error. 2006-07-10 12:03:44 +02:00
joerg@trift2.
94ef9ca9ca Merge trift2.:/M50/clone-5.0
into  trift2.:/M50/back23-5.0
2006-07-10 11:42:45 +02:00
pekka@orca.ndb.mysql.com
7433d5ccbe Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my50
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-bug20847
2006-07-10 11:31:37 +02:00
pekka@orca.ndb.mysql.com
79cc3bed10 mysql-test/Makefile.am: fix cp of mode 444 files (re-commit) 2006-07-10 11:09:32 +02:00
pekka@orca.ndb.mysql.com
6191c7db85 Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my41
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-bug20847
2006-07-10 11:06:21 +02:00
pekka@orca.ndb.mysql.com
71aa094c68 Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my50
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-bug20847
2006-07-10 11:02:46 +02:00
pekka@orca.ndb.mysql.com
c9db5f8063 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41
2006-07-10 08:04:40 +02:00
aelkin/elkin@dsl-hkigw8-feb1fb00-100.dhcp.inet.fi
fadbdf27c3 BUG#20919 temp tables closing fails when binlog is off
closing temp tables through end_thread
had a flaw in binlog-off branch of close_temporary_tables where
next table to close was reset via table->next
 for (table= thd->temporary_tables; table; table= table->next)
which was wrong since the current table instance got destoyed at
	close_temporary(table, 1);

The fix adapts binlog-on branch method to engage the loop's internal 'next' variable which holds table->next prior table's destoying.
2006-07-10 00:26:26 +03:00
guilhem@gbichot3.local
bca3fc7800 Merge gbichot3.local:/home/mysql_src/mysql-5.1-interval-move-next-insert-id
into  gbichot3.local:/home/mysql_src/mysql-5.1
2006-07-09 22:50:02 +02:00
guilhem@gbichot3.local
17efd43b1a post-merge test/result fixes. 2006-07-09 21:39:21 +02:00
guilhem@gbichot3.local
1bfe0bdf72 Merge gbichot3.local:/home/mysql_src/mysql-5.1-new-19630
into  gbichot3.local:/home/mysql_src/mysql-5.1
2006-07-09 21:17:06 +02:00
guilhem@gbichot3.local
b397737989 fixes in test results (using # for positions in SHOW BINLOG EVENTS). 2006-07-09 21:11:52 +02:00
guilhem@gbichot3.local
f6c996f0a2 post-merge fixes 2006-07-09 19:47:54 +02:00
guilhem@gbichot3.local
57ced262da Merge gbichot3.local:/home/mysql_src/mysql-5.1-new-WL3146-handler
into  gbichot3.local:/home/mysql_src/mysql-5.1
2006-07-09 18:47:08 +02:00
guilhem@gbichot3.local
87fb4fb4a8 Manual merge of test from 5.0 (needs to be manual because the test files
were copied/split between 5.0 and 5.1).
2006-07-09 18:45:16 +02:00
guilhem@gbichot3.local
1a506b34da Merge gbichot3.local:/home/mysql_src/mysql-5.0
into  gbichot3.local:/home/mysql_src/mysql-5.1
2006-07-09 18:13:57 +02:00
guilhem@gbichot3.local
0594e1b84b WL#3146 "less locking in auto_increment":
this is a cleanup patch for our current auto_increment handling:
new names for auto_increment variables in THD, new methods to manipulate them
(see sql_class.h), some move into handler::, causing less backup/restore
work when executing substatements. 
This makes the logic hopefully clearer, less work is is needed in
mysql_insert().
By cleaning up, using different variables for different purposes (instead
of one for 3 things...), we fix those bugs, which someone may want to fix
in 5.0 too:
BUG#20339 "stored procedure using LAST_INSERT_ID() does not replicate
statement-based"
BUG#20341 "stored function inserting into one auto_increment puts bad
data in slave"
BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE"
(now if a row is updated, LAST_INSERT_ID() will return its id)
and re-fixes:
BUG#6880 "LAST_INSERT_ID() value changes during multi-row INSERT"
(already fixed differently by Ramil in 4.1)
Test of documented behaviour of mysql_insert_id() (there was no test).
The behaviour changes introduced are:
- LAST_INSERT_ID() now returns "the first autogenerated auto_increment value
successfully inserted", instead of "the first autogenerated auto_increment
value if any row was successfully inserted", see auto_increment.test.
Same for mysql_insert_id(), see mysql_client_test.c.
- LAST_INSERT_ID() returns the id of the updated row if ON DUPLICATE KEY
UPDATE, see auto_increment.test. Same for mysql_insert_id(), see
mysql_client_test.c.
- LAST_INSERT_ID() does not change if no autogenerated value was successfully 
inserted (it used to then be 0), see auto_increment.test.
- if in INSERT SELECT no autogenerated value was successfully inserted,
mysql_insert_id() now returns the id of the last inserted row (it already
did this for INSERT VALUES), see mysql_client_test.c.
- if INSERT SELECT uses LAST_INSERT_ID(X), mysql_insert_id() now returns X
(it already did this for INSERT VALUES), see mysql_client_test.c.
- NDB now behaves like other engines wrt SET INSERT_ID: with INSERT IGNORE,
the id passed in SET INSERT_ID is re-used until a row succeeds; SET INSERT_ID
influences not only the first row now.

Additionally, when unlocking a table we check that the thread is not keeping
a next_insert_id (as the table is unlocked that id is potentially out-of-date);
forgetting about this next_insert_id is done in a new
handler::ha_release_auto_increment().

Finally we prepare for engines capable of reserving finite-length intervals
of auto_increment values: we store such intervals in THD. The next step
(to be done by the replication team in 5.1) is to read those intervals from
THD and actually store them in the statement-based binary log. NDB
will be a good engine to test that.
2006-07-09 17:52:19 +02:00