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

31339 commits

This branch
This branch
All branches
Author SHA1 Message Date
ingo/mydev@chilla.local
dfaa3c78f6 Revoking patch for Bug#10952 on behalf of Brian. 2006-07-10 20:46:05 +02: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
gkodinov/kgeorge@macbook.gmz
6b84456a35 more 4.1->5.0 merge fixes for bug#14553 2006-07-10 17:45:09 +03:00
gkodinov/kgeorge@macbook.gmz
8f71e47a0d Merge macbook.gmz:/Users/kgeorge/mysql/work/B14553-4.1-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B14553-5.0-opt
 2006-07-10 16:44:05 +03:00
gkodinov/kgeorge@macbook.gmz
893e92761f Merge rakia:mysql/4.1/B14553 
into  macbook.gmz:/Users/kgeorge/mysql/work/B14553-4.1-opt
 2006-07-10 16:27:04 +03:00
gkodinov/kgeorge@mysql.com/rakia.(none)
2c9f5cc706 BUG#14553: NULL in WHERE resets LAST_INSERT_ID 
To make MySQL compatible with some ODBC applications, you can find
the AUTO_INCREMENT value for the last inserted row with the following query:
 SELECT * FROM tbl_name WHERE auto_col IS NULL.
This is done with a special code that replaces 'auto_col IS NULL' with
'auto_col = LAST_INSERT_ID'.
However this also resets the LAST_INSERT_ID to 0 as it uses it for a flag
so as to ensure that only the first SELECT ... WHERE auto_col IS NULL
after an INSERT has this special behaviour.
In order to avoid resetting the LAST_INSERT_ID a special flag is introduced
in the THD class. This flag is used to restrict the second and subsequent
SELECTs instead of LAST_INSERT_ID.
 2006-07-10 16:27:03 +03: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
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
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
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
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
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
kostja@bodhi.local
2ab1e065e4 Fix compiler warnings in sql_udf.h: ISO C++ forbids casting 
between pointer to function and pointer to object.
 2006-07-09 13:03:51 +04:00
kostja@bodhi.local
f1d949a856 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
 2006-07-08 21:45:02 +04:00
ingo/mydev@chilla.local
987abbc253 Merge chilla.local:/home/mydev/mysql-4.1-bug19835 
into  chilla.local:/home/mydev/mysql-4.1-amerge
 2006-07-08 19:27:16 +02:00
ingo/mydev@chilla.local
d341ca941f Merge chilla.local:/home/mydev/mysql-4.1-bug17877 
into  chilla.local:/home/mydev/mysql-4.1-amerge
 2006-07-08 19:26:18 +02:00
ingo/mydev@chilla.local
065cdb030a Merge chilla.local:/home/mydev/mysql-4.1-bug14400 
into  chilla.local:/home/mydev/mysql-4.1-amerge
 2006-07-08 19:25:01 +02:00
ingo/mydev@chilla.local
eaa9350c90 Merge chilla.local:/home/mydev/mysql-4.1-bug11824 
into  chilla.local:/home/mydev/mysql-4.1-amerge
 2006-07-08 19:23:55 +02:00
ingo/mydev@chilla.local
f631765a06 Merge chilla.local:/home/mydev/mysql-5.0--main 
into  chilla.local:/home/mydev/mysql-5.0-amerge
 2006-07-08 16:50:50 +02:00
kostja@bodhi.local
ff1947da1e A post-merge fix. 2006-07-08 04:07:43 +04:00
kostja@bodhi.local
a2c0cdd75b Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
 2006-07-08 02:30:07 +04:00
cmiller@zippy.(none)
8ea01fbca8 Add a more reliable "getconf" test for Linuxthreads. The later trees should already 
have a better test (and so this should be null-merged there).

ALSO!  Make it so that it accepts NPTL as a valid _equivalent_ implementation.
 2006-07-07 16:47:57 -04:00
kostja@bodhi.local
96f4c10dde Cleanups: ignore more files. 2006-07-08 00:03:43 +04:00
kostja@bodhi.local
7bf73ac3e5 Merge bodhi.local:/opt/local/work/mysql-5.0-root 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-07-07 22:09:43 +04:00
gkodinov/kgeorge@mysql.com/macbook.gmz
ece5fff44e Bug #20569 Garbage in DECIMAL results from some mathematical functions 
* portability fix: moved the macro call after the C declaration
 2006-07-07 17:27:11 +03:00
bar@mysql.com
433e7fb8db Merge mysql.com:/usr/home/bar/autopush/mysql-5.0.b10979 
into  mysql.com:/usr/home/bar/mysql-5.0-kt
 2006-07-07 17:35:02 +05:00
bar@mysql.com
ae03358bec Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0-kt
 2006-07-07 17:32:26 +05:00
bar@myoffice.izhnet.ru
eec0355de2 func_str.result, func_str.test: 
Adding test case.
item_strfunc.cc:
  bug#11728 string function LEFT, strange undocumented behaviour
  Fixing LEFT and RIGHT return NULL if the second
  argument is NULL.
 2006-07-07 17:06:30 +05:00
pekka@mysql.com/orca.ndb.mysql.com
c9bc03c3cd Merge mysql.com:/space_old/pekka/ndb/version/my41-bug20847 
into  mysql.com:/space_old/pekka/ndb/version/my50-bug20847
 2006-07-07 13:40:47 +02:00
bar@mysql.com
a8844cb22a Merge mysql.com:/usr/home/bar/mysql-4.1.b7192 
into  mysql.com:/usr/home/bar/mysql-5.0-kt
 2006-07-07 16:27:38 +05:00
bar@mysql.com
7939a200e4 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/autopush/mysql-5.0.b10979
 2006-07-07 15:51:30 +05:00
pekka@mysql.com
7ed021f926 ndb - bug#20847 : DbtupTabDesMan: add merge with left buddies 2006-07-07 10:57:22 +02:00
bar@mysql.com
2303077238 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b17647
 2006-07-07 12:17:00 +05:00
bar@mysql.com
c86acb53fa Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b10979
 2006-07-07 12:14:12 +05:00
knielsen@ymer.(none)
31ddb04105 Merge ymer.(none):/usr/local/mysql/mysql-5.0-bug19951 
into  ymer.(none):/usr/local/mysql/tmp-5.0
 2006-07-06 23:52:05 +02:00
knielsen@ymer.(none)
5ea51287d6 BUG#19951: Race conditions in test wait_timeout. 
Fix random failures in test 'wait_timeout' that depend on exact timing.

1. Force a reconnect initially if necessary, as otherwise slow startup
might have caused a connection timeout before the test can even start.

2. Explicitly disconnect the first connection to remove confusion about
which connection aborts from timeout, causing test failure.
 2006-07-06 23:49:09 +02:00
igor@olga.mysql.com
f829f210b8 Added a test case with views for bug 18243 (see also func_str.test). 2006-07-06 14:41:01 -07:00