Commit graph

44616 commits

Author SHA1 Message Date
jani@ua141d10.elisa.omakaista.fi
28c122a721 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-03-29 17:45:56 +03:00
jani@ua141d10.elisa.omakaista.fi
1c7beca65e Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-03-29 17:27:42 +03:00
jamppa@bk-internal.mysql.com
16de7d21cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2007-03-29 16:11:29 +02:00
joerg@trift-lap.fambruehe
4507c6757a Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
2007-03-29 09:41:39 +02:00
kent@mysql.com/kent-amd64.(none)
7eeae6ff13 Makefile.am:
Extended test section
  Removed duplicate EXTRA_DIST
2007-03-28 23:18:43 +02:00
kent@kent-amd64.(none)
0544355385 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-28 23:08:00 +02:00
kent@mysql.com/kent-amd64.(none)
7a2e0ee7d7 configure.in:
Don't install ndb man pages if no ndb configured
config-win.h, CMakeLists.txt, README, configure.js:
  Removed Cybozu patches
2007-03-28 23:00:50 +02:00
kent@kent-amd64.(none)
082de779b3 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-28 22:50:43 +02:00
baker@bk-internal.mysql.com
1b9c4358a8 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-03-28 22:31:10 +02:00
jani@ua141d10.elisa.omakaista.fi
3c3b0391f8 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-main
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
2007-03-28 20:46:42 +03:00
joerg@trift-lap.fambruehe
385526f768 mysys/my_thr_init.c : Avoid warnings of "unused variable" by extending a '#ifdef'. 2007-03-28 19:01:49 +02:00
jani@ua141d10.elisa.omakaista.fi
3bd0494eb9 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-03-28 18:31:49 +03:00
serg@janus.mylan
fd1d4f864e compiler warnings 2007-03-28 17:12:38 +02:00
serg@janus.mylan
52ca332600 Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0-build
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1-build
2007-03-28 15:47:48 +02:00
jamppa@bk-internal.mysql.com
9685c30214 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2007-03-28 15:34:09 +02:00
serg@janus.mylan
e5b660487b restored run-time thread lib detection 2007-03-28 15:33:29 +02:00
anozdrin/alik@alik.opbmk
cc83bb0784 Fix for BUG#25082: default database change on trigger
execution breaks replication.

When a stored routine is executed, we switch current
database to the database, in which the routine
has been created. When the stored routine finishes,
we switch back to the original database.

The problem was that if the original database does not
exist (anymore) after routine execution, we raised an error.

The fix is to report a warning, and switch to the NULL database.
2007-03-27 21:55:01 +04:00
baker@bk-internal.mysql.com
2bfa1aa3d6 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-03-27 18:44:02 +02:00
tomas@whalegate.ndb.mysql.com
c86293e41e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-27 18:12:33 +02:00
kent@mysql.com/kent-amd64.(none)
4ad479b891 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-27 17:51:30 +02:00
jani@ua141d10.elisa.omakaista.fi
e12ad391b5 Fixes for 4.1 to be as in 5.0 and above. 2007-03-27 18:51:02 +03:00
jani@ua141d10.elisa.omakaista.fi
9147ad3a8d Small fixes. 2007-03-27 18:48:05 +03:00
kent@mysql.com/kent-amd64.(none)
ef530348cd mysql.spec.sh, Makefile.am:
Don't use explicit calls to mysql-test-run in spec
2007-03-27 17:42:55 +02:00
joerg@trift-lap.fambruehe
336f03d151 Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
2007-03-27 12:06:13 +02:00
brian@zim.(none)
e661d6eeb6 Making sure thar archive is inited for info AUTO call. 2007-03-26 22:50:08 -07:00
brian@zim.(none)
9e1565e37e Merge piggy:/home/brian/mysql-5.1-arch
into  zim.(none):/home/brian/mysql/pread-archive-5.1
2007-03-26 17:31:52 -07:00
brian@zim.(none)
88719428f5 Centralized init logic for starting a scan. 2007-03-26 17:15:31 -07:00
brian@piggy.tangent.org
414da94c04 Adjusting locks for concurrency issue (not found, but suspect). 2007-03-26 16:45:17 -07:00
tomas@whalegate.ndb.mysql.com
99238e5593 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-26 21:14:28 +02:00
tomas@whalegate.ndb.mysql.com
1bae3e5726 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-26 21:13:46 +02:00
tomas@whalegate.ndb.mysql.com
71ec671d4d correction of manual merge 2007-03-26 21:10:34 +02:00
tomas@whalegate.ndb.mysql.com
2923b52e38 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-26 21:02:14 +02:00
tomas@whalegate.ndb.mysql.com
d4982247cf 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-26 20:57:10 +02:00
tomas@whalegate.ndb.mysql.com
c445baeabd correct medium int printout
correct cit printout
    correct bit store retrieve
2007-03-26 17:57:00 +02:00
tomas@whalegate.ndb.mysql.com
22c5d8ba44 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-26 14:49:24 +02:00
tomas@whalegate.ndb.mysql.com
405fb2cfb6 Bug #26986 BIT(33) for ndb is broken on solaris.
- always store lsw first in ndb
2007-03-26 14:48:52 +02:00
pekka@clam.ndb.mysql.com/clam.(none)
6ec8bb230a Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug24028
2007-03-26 12:50:40 +02:00
monty@mysql.com/narttu.mysql.fi
5475e8928b Fixed error found by valgrind in numerical date handling
Fixed comments to say MYSQL_TIME instead of old typedef TIME
2007-03-26 13:44:58 +03:00
brian@zim.(none)
68cdfea52a Merge zim.(none):/home/bk/mysql-5.1-arch
into  zim.(none):/home/brian/mysql/slap-5.1
2007-03-26 02:29:09 -07:00
brian@zim.(none)
9a2a7071be Added pre and post option to test run (allows me to adjust an engine once all of the data has been loaded).
Kinda obvious that this was going to come up ;)
2007-03-26 02:24:49 -07:00
tomas@whalegate.ndb.mysql.com
7386c736c2 remove warning 2007-03-26 10:39:11 +02:00
tomas@whalegate.ndb.mysql.com
3d076ca0e5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-26 10:11:57 +02:00
tomas@whalegate.ndb.mysql.com
128b118bf0 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-26 10:11:15 +02:00
tomas@whalegate.ndb.mysql.com
690b16be05 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-26 10:01:43 +02:00
tomas@whalegate.ndb.mysql.com
01189d9627 Bug #26900 ndb_restore printout option does not give structured data
- set sizes for data
2007-03-26 09:58:01 +02:00
jani@ua141d10.elisa.omakaista.fi
90ab0fd252 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-main
2007-03-26 10:56:33 +03:00
brian@zim.(none)
ff9da1f048 New comments, additional init for rebuild options. 2007-03-25 11:38:49 -07:00
tomas@whalegate.ndb.mysql.com
4d228c2f8f Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-25 16:44:44 +02:00
tomas@whalegate.ndb.mysql.com
cc47508432 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-25 16:44:06 +02:00
pekka@clam.(none)
5f061a7e5c Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug24028
2007-03-25 15:06:19 +02:00