mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/.bzrignore

3108 lines
84 KiB
Text
Raw Normal View History

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new into mysql.com:/home/my/mysql-5.1
2006-06-04 20:05:22 +02:00
*-t
Merge bodhi.local:/opt/local/work/tmp_merge into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
2006-07-08 00:30:07 +02:00
*.Plo
*.Po
Merge
2000-12-07 16:10:30 +01:00
*.a
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
*.bb
*.bbg
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
*.bin
Bug#24732 Executables do not include Vista manifests - Sign executables with MySQL AB security certificate.
2007-07-25 19:18:12 +02:00
*.cdf
sql_base.cc merge+insert (v.3) myrg_info.c merge+insert (v.3) myrg_extra.c merge+insert (v.3) ignore cleanup
2000-12-08 13:53:24 +01:00
*.core
Merging 4.1 to 5.0.
2004-05-26 17:04:45 +02:00
*.d
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
*.da
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
*.exe
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1
2006-06-28 19:03:46 +02:00
*.gcda
*.gcno
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
*.gcov
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
*.idb
Merge
2000-12-03 11:56:27 +01:00
*.la
Merge bodhi.local:/opt/local/work/tmp_merge into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
2006-07-08 00:30:07 +02:00
*.lai
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
*.lib
Merge
2000-12-03 11:56:27 +01:00
*.lo
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
*.map
Merge
2000-12-03 11:56:27 +01:00
*.o
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
*.obj
These bitKeeper changes will allow Windows to be used as a primary development platform.
2006-09-13 20:15:22 +02:00
*.old
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
*.pch
*.pdb
merge
2001-10-08 04:36:35 +02:00
*.reject
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
*.res
*.sbr
dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features charset2html moved from mysys to extra ignore: new files added, garbage removed
2004-11-04 22:29:00 +01:00
*.so
Cleanups: ignore more files.
2006-07-07 22:03:43 +02:00
*.so.*
Merge
2000-12-03 11:56:27 +01:00
*.spec
These bitKeeper changes will allow Windows to be used as a primary development platform.
2006-09-13 20:15:22 +02:00
*.user
*.vcproj
Merge recycle.(none):/src/bug24732/my50-bug24732 into recycle.(none):/src/bug24732/my51-bug24732
2007-04-23 21:47:26 +02:00
*.vcproj.cmake
These bitKeeper changes will allow Windows to be used as a primary development platform.
2006-09-13 20:15:22 +02:00
*/*.dir/*
Merge hundin:/my/mysql into bitch.mysql.fi:/my/mysql
2001-08-11 10:54:23 +02:00
*/*_pure_*warnings
Merge bk-internal:/home/bk/mysql-4.0 into chilla.local:/home/mydev/mysql-4.1-bug14400-monty
2006-09-19 10:17:25 +02:00
*/.deps
*/.libs/*
Merge hundin:/my/mysql into bitch.mysql.fi:/my/mysql
2001-08-11 10:54:23 +02:00
*/.pure
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix into rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix
2006-09-13 20:16:53 +02:00
*/debug/*
Merge labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvel into labbari.dsl.inet.fi:/home/my/bk/mysql-5.1-marvel
2007-07-06 12:49:15 +02:00
*/minsizerel/*
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix into rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix
2006-09-13 20:16:53 +02:00
*/release/*
Embedded Server doesn't build on Windows. - Add build configuration parameter EMBEDDED_ONLY which will configure the VS solution to produce only mysql embedded binary. - Make necessary updates to successfully compile solution.
2007-06-15 20:32:16 +02:00
*/relwithdebinfo/*
ignore stray files
2000-10-19 02:26:35 +02:00
*~
Merge
2000-12-08 14:00:48 +01:00
.*.swp
These bitKeeper changes will allow Windows to be used as a primary development platform.
2006-09-13 20:15:22 +02:00
./CMakeCache.txt
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix into rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix
2006-09-13 20:16:53 +02:00
./MySql.ncb
./MySql.sln
./MySql.suo
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
./README.build-files
These bitKeeper changes will allow Windows to be used as a primary development platform.
2006-09-13 20:15:22 +02:00
./cmakecache.txt
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-24 22:02:08 +02:00
./config.h
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
./copy_mysql_files.bat
./fix-project-files
./mysql*.ds?
./mysql.ncb
./mysql.sln
./mysql.suo
./prepare
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
2008-02-28 12:21:44 +01:00
.DS_Store
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
.defs.mk
Ignore .depend and .depend.mk
2004-04-14 13:11:30 +02:00
.depend
.depend.mk
Merge
2000-12-03 11:56:27 +01:00
.deps
.gdb_history
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2001-07-01 12:27:09 +02:00
.gdbinit
Merge
2000-12-08 17:39:37 +01:00
.libs
.o
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
.out
.snprj/*
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2001-07-01 12:27:09 +02:00
.vimrc
Changes for the BitKeeper resolve. One more notice: limiting number of queries per hour for different users has been done on 4.0.1 , but I can port it to 3.23.* This will require only certain changes, like number of columns in user table. I will also make a test case for it, after it is approved by Monty, as result file will depend on the error message text.
2001-12-26 16:42:06 +01:00
50
Merge work:/home/bk/mysql-4.0 into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-08-28 01:34:29 +02:00
=6
manual merge
2003-07-31 15:11:52 +02:00
BUILD/compile-pentium-maintainer
Merge mysql.com:/home/kostja/mysql/tmp_merge into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 21:27:06 +01:00
BitKeeper/etc/RESYNC_TREE
Merge
2000-12-08 14:00:48 +01:00
BitKeeper/etc/config
ignore stray files
2000-10-19 02:26:35 +02:00
BitKeeper/etc/csets
Merge
2000-12-03 11:56:27 +01:00
BitKeeper/etc/csets-in
BitKeeper/etc/csets-out
ignore stray files
2000-10-19 02:26:35 +02:00
BitKeeper/etc/gone
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
BitKeeper/etc/level
Merge
2000-12-03 11:56:27 +01:00
BitKeeper/etc/pushed
manual merge
2003-07-31 15:11:52 +02:00
BitKeeper/post-commit
BitKeeper/post-commit-manual
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
BitKeeper/tmp/*
BitKeeper/tmp/bkr3sAHD
BitKeeper/tmp/gone
WL#5030: Splitting mysql_priv.h - Adding include/mysql/innodb_priv.h which was missing before. - Updated .bzrignore to ignore CMake generated cruft.
2010-04-06 12:55:36 +02:00
CMakeFiles
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix into rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix
2006-09-13 20:16:53 +02:00
CMakeFiles/*
WL#5030: Splitting mysql_priv.h - Adding include/mysql/innodb_priv.h which was missing before. - Updated .bzrignore to ignore CMake generated cruft.
2010-04-06 12:55:36 +02:00
CTestTestfile.cmake
Merge
2000-12-03 11:56:27 +01:00
COPYING
COPYING.LIB
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
2001-10-17 18:40:52 +02:00
Docs/#manual.texi#
Merge
2000-12-07 16:10:30 +01:00
Docs/INSTALL-BINARY
merge with 4.1
2004-10-29 18:26:52 +02:00
Docs/Images/myaccess-odbc.txt
Docs/Images/myaccess.txt
Docs/Images/myarchitecture.txt
Docs/Images/mydll-properties.txt
Docs/Images/mydsn-example.txt
Docs/Images/mydsn-icon.txt
Docs/Images/mydsn-options.txt
Docs/Images/mydsn-setup.txt
Docs/Images/mydsn-test-fail.txt
Docs/Images/mydsn-test-success.txt
Docs/Images/mydsn-trace.txt
Docs/Images/mydsn.txt
Docs/Images/myflowchart.txt
ignore stray files
2000-10-19 02:26:35 +02:00
Docs/include.texi
Merge with 4.0.13
2003-05-19 15:35:49 +02:00
Docs/internals.html
merge with 3.23.51
2002-05-16 17:20:49 +02:00
Docs/internals.info
Merge with 4.0.13
2003-05-19 15:35:49 +02:00
Docs/internals.pdf
Docs/internals.txt
Docs/internals_toc.html
Merge jcole@work.mysql.com:/home/bk/mysql into tetra.spaceapes.com:/usr/home/jcole/bk/mysql
2000-12-06 19:33:53 +01:00
Docs/manual.aux
Docs/manual.cp
Docs/manual.cps
merge with 3.23.51
2002-05-16 17:20:49 +02:00
Docs/manual.de.log
Merge jcole@work.mysql.com:/home/bk/mysql into tetra.spaceapes.com:/usr/home/jcole/bk/mysql
2000-12-06 19:33:53 +01:00
Docs/manual.dvi
Docs/manual.fn
Docs/manual.fns
ignore stray files
2000-10-19 02:26:35 +02:00
Docs/manual.html
Merge jcole@work.mysql.com:/home/bk/mysql into tetra.spaceapes.com:/usr/home/jcole/bk/mysql
2000-12-06 19:33:53 +01:00
Docs/manual.ky
Merge
2000-12-03 11:56:27 +01:00
Docs/manual.log
ignore stray files
2000-10-19 02:26:35 +02:00
Docs/manual.pdf
Merge jcole@work.mysql.com:/home/bk/mysql into tetra.spaceapes.com:/usr/home/jcole/bk/mysql
2000-12-06 19:33:53 +01:00
Docs/manual.pg
merge
2002-04-13 14:34:39 +02:00
Docs/manual.texi.orig
Docs/manual.texi.rej
Merge jcole@work.mysql.com:/home/bk/mysql into tetra.spaceapes.com:/usr/home/jcole/bk/mysql
2000-12-06 19:33:53 +01:00
Docs/manual.toc
Docs/manual.tp
Merge
2000-12-03 11:56:27 +01:00
Docs/manual.txt
Merge jcole@work.mysql.com:/home/bk/mysql into tetra.spaceapes.com:/usr/home/jcole/bk/mysql
2000-12-06 19:33:53 +01:00
Docs/manual.vr
Docs/manual_a4.ps
Docs/manual_letter.ps
Merge
2000-12-03 11:56:27 +01:00
Docs/manual_toc.html
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
Docs/my_sys.doc
Merge
2000-12-03 11:56:27 +01:00
Docs/mysql.info
merge with 3.23.51
2002-05-16 17:20:49 +02:00
Docs/mysql.xml
Docs/safe-mysql.xml
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2001-10-19 16:46:51 +02:00
Docs/tex.fmt
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
2001-10-17 18:40:52 +02:00
Docs/texi2dvi.out
merged
2004-08-20 00:52:43 +02:00
EXCEPTIONS-CLIENT
Merge
2000-12-03 11:56:27 +01:00
INSTALL-SOURCE
Merged 4.1 -> 5.0
2003-12-05 13:11:50 +01:00
INSTALL-WIN-SOURCE
Merge
2001-05-18 18:49:30 +02:00
Logs/*
Merge
2000-12-03 11:56:27 +01:00
MIRRORS
Makefile
Makefile.in
Makefile.in'
PENDING/*
Merge jcole@work.mysql.com:/home/bk/mysql into tetra.spaceapes.com:/usr/home/jcole/bk/mysql
2000-12-06 19:33:53 +01:00
TAGS
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-07 15:38:05 +02:00
VC++Files/client/mysql_amd64.dsp
merged
2004-11-20 18:36:41 +01:00
ac_available_languages_fragment
merged
2005-03-09 14:09:06 +01:00
acinclude.m4
Merge
2000-12-03 11:56:27 +01:00
aclocal.m4
Merge with 4.1
2004-12-22 12:54:39 +01:00
analyse.test
dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features charset2html moved from mysys to extra ignore: new files added, garbage removed
2004-11-04 22:29:00 +01:00
autom4te-2.53.cache/*
Merge with 3.23
2002-12-05 02:52:53 +01:00
autom4te-2.53.cache/output.0
autom4te-2.53.cache/requests
autom4te-2.53.cache/traces.0
Merge mysql.com:/home/nick/mysql/repository/mysql-4.1 into mysql.com:/home/nick/mysql/mysql-4.1
2002-10-31 07:58:52 +01:00
autom4te.cache/*
Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.0-build
2002-11-18 11:41:29 +01:00
autom4te.cache/output.0
autom4te.cache/requests
autom4te.cache/traces.0
Merge mysql.com:/opt/local/work/mysql-4.1-root into mysql.com:/opt/local/work/mysql-5.0-root
2006-01-18 13:15:09 +01:00
bdb/*.ds?
bdb/*.vcproj
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
bdb/README
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
bdb/btree/btree_auto.c
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
bdb/build_unix/*
bdb/build_vxworks/db.h
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
bdb/build_vxworks/db_int.h
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
bdb/build_win32/db.h
Merge
2001-05-18 18:49:30 +02:00
bdb/build_win32/db_archive.dsp
bdb/build_win32/db_checkpoint.dsp
Merge with 4.0
2002-11-21 14:56:48 +01:00
bdb/build_win32/db_config.h
bdb/build_win32/db_cxx.h
Merge
2001-05-18 18:49:30 +02:00
bdb/build_win32/db_deadlock.dsp
bdb/build_win32/db_dll.dsp
bdb/build_win32/db_dump.dsp
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
bdb/build_win32/db_int.h
Merge
2001-05-18 18:49:30 +02:00
bdb/build_win32/db_java.dsp
bdb/build_win32/db_load.dsp
Merge with 4.0
2002-11-21 14:56:48 +01:00
bdb/build_win32/db_perf.dsp
Merge
2001-05-18 18:49:30 +02:00
bdb/build_win32/db_printlog.dsp
bdb/build_win32/db_recover.dsp
bdb/build_win32/db_stat.dsp
bdb/build_win32/db_static.dsp
bdb/build_win32/db_tcl.dsp
Merge with 4.0
2002-11-21 14:56:48 +01:00
bdb/build_win32/db_test.dsp
Merge
2001-05-18 18:49:30 +02:00
bdb/build_win32/db_upgrade.dsp
bdb/build_win32/db_verify.dsp
bdb/build_win32/ex_access.dsp
bdb/build_win32/ex_btrec.dsp
bdb/build_win32/ex_env.dsp
bdb/build_win32/ex_lock.dsp
bdb/build_win32/ex_mpool.dsp
bdb/build_win32/ex_tpcb.dsp
bdb/build_win32/excxx_access.dsp
bdb/build_win32/excxx_btrec.dsp
bdb/build_win32/excxx_env.dsp
bdb/build_win32/excxx_lock.dsp
bdb/build_win32/excxx_mpool.dsp
bdb/build_win32/excxx_tpcb.dsp
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
bdb/build_win32/include.tcl
Merge with 4.0
2002-11-21 14:56:48 +01:00
bdb/build_win32/libdb.def
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
bdb/build_win32/libdb.rc
bdb/db/crdel_auto.c
bdb/db/db_auto.c
Merge with 4.0
2002-11-21 14:56:48 +01:00
bdb/dbinc_auto/*.*
bdb/dbreg/dbreg_auto.c
dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features charset2html moved from mysys to extra ignore: new files added, garbage removed
2004-11-04 22:29:00 +01:00
bdb/dist/autom4te-2.53.cache/*
Merge with 3.23
2002-12-05 02:52:53 +01:00
bdb/dist/autom4te-2.53.cache/output.0
bdb/dist/autom4te-2.53.cache/requests
bdb/dist/autom4te-2.53.cache/traces.0
Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.0-build
2002-11-18 11:41:29 +01:00
bdb/dist/autom4te.cache/*
bdb/dist/autom4te.cache/output.0
bdb/dist/autom4te.cache/requests
bdb/dist/autom4te.cache/traces.0
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
bdb/dist/config.hin
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
bdb/dist/configure
Merge mysql.com:/home/my/mysql-5.0 into mysql.com:/home/my/mysql-5.1
2006-11-29 22:07:15 +01:00
bdb/dist/db.h
bdb/dist/db_config.h
bdb/dist/db_cxx.h
bdb/dist/db_int.h
bdb/dist/include.tcl
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
bdb/dist/tags
Merge
2001-05-18 18:49:30 +02:00
bdb/dist/template/db_server_proc
bdb/dist/template/gen_client_ret
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
bdb/dist/template/rec_btree
bdb/dist/template/rec_crdel
bdb/dist/template/rec_db
Merge with 4.0
2002-11-21 14:56:48 +01:00
bdb/dist/template/rec_dbreg
bdb/dist/template/rec_fileops
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
bdb/dist/template/rec_hash
bdb/dist/template/rec_log
bdb/dist/template/rec_qam
bdb/dist/template/rec_txn
Merge with 4.0
2002-11-21 14:56:48 +01:00
bdb/examples_c/ex_apprec/ex_apprec_auto.c
bdb/examples_c/ex_apprec/ex_apprec_auto.h
bdb/examples_c/ex_apprec/ex_apprec_template
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
bdb/examples_java
Merge with 4.0
2002-11-21 14:56:48 +01:00
bdb/fileops/fileops_auto.c
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
bdb/hash/hash_auto.c
bdb/include/btree_auto.h
merge with 3.23.44
2001-11-04 15:14:09 +01:00
bdb/include/btree_ext.h
bdb/include/clib_ext.h
bdb/include/common_ext.h
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
bdb/include/crdel_auto.h
bdb/include/db_auto.h
merge with 3.23.44
2001-11-04 15:14:09 +01:00
bdb/include/db_ext.h
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
bdb/include/db_server.h
merge with 3.23.44
2001-11-04 15:14:09 +01:00
bdb/include/env_ext.h
Merge
2001-05-18 18:49:30 +02:00
bdb/include/gen_client_ext.h
bdb/include/gen_server_ext.h
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
bdb/include/hash_auto.h
merge with 3.23.44
2001-11-04 15:14:09 +01:00
bdb/include/hash_ext.h
bdb/include/lock_ext.h
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
bdb/include/log_auto.h
merge with 3.23.44
2001-11-04 15:14:09 +01:00
bdb/include/log_ext.h
bdb/include/mp_ext.h
bdb/include/mutex_ext.h
bdb/include/os_ext.h
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
bdb/include/qam_auto.h
merge with 3.23.44
2001-11-04 15:14:09 +01:00
bdb/include/qam_ext.h
Merge hundin:/my/mysql into bitch.mysql.fi:/my/mysql
2001-08-11 10:54:23 +02:00
bdb/include/rpc_client_ext.h
Merge work:/home/bk/mysql-4.0 into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-06-01 19:06:28 +02:00
bdb/include/rpc_server_ext.h
merge with 3.23.44
2001-11-04 15:14:09 +01:00
bdb/include/tcl_ext.h
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
bdb/include/txn_auto.h
merge with 3.23.44
2001-11-04 15:14:09 +01:00
bdb/include/txn_ext.h
bdb/include/xa_ext.h
Merge with 4.0
2002-11-21 14:56:48 +01:00
bdb/java/src/com/sleepycat/db/Db.java
bdb/java/src/com/sleepycat/db/DbBtreeStat.java
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
bdb/java/src/com/sleepycat/db/DbConstants.java
Merge with 4.0
2002-11-21 14:56:48 +01:00
bdb/java/src/com/sleepycat/db/DbHashStat.java
bdb/java/src/com/sleepycat/db/DbLockStat.java
bdb/java/src/com/sleepycat/db/DbLogStat.java
bdb/java/src/com/sleepycat/db/DbMpoolFStat.java
bdb/java/src/com/sleepycat/db/DbQueueStat.java
bdb/java/src/com/sleepycat/db/DbRepStat.java
bdb/java/src/com/sleepycat/db/DbTxnStat.java
bdb/libdb_java/java_stat_auto.c
bdb/libdb_java/java_stat_auto.h
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
bdb/log/log_auto.c
bdb/qam/qam_auto.c
bdb/rpc_client/db_server_clnt.c
bdb/rpc_client/gen_client.c
Merge with 4.0
2002-11-21 14:56:48 +01:00
bdb/rpc_server/c/db_server_proc.c
bdb/rpc_server/c/db_server_proc.sed
bdb/rpc_server/c/db_server_svc.c
bdb/rpc_server/c/db_server_xdr.c
bdb/rpc_server/c/gen_db_server.c
Merge
2001-05-18 18:49:30 +02:00
bdb/rpc_server/db_server.x
bdb/rpc_server/db_server_proc.sed
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
bdb/rpc_server/db_server_svc.c
bdb/rpc_server/db_server_xdr.c
bdb/rpc_server/gen_db_server.c
Merge with 4.0
2002-11-21 14:56:48 +01:00
bdb/test/TESTS
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
bdb/test/include.tcl
Merge
2001-05-18 18:49:30 +02:00
bdb/test/logtrack.list
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
bdb/txn/txn_auto.c
Merge
2001-05-18 18:49:30 +02:00
binary/*
Merge with 3.23
2002-12-05 02:52:53 +01:00
bkpull.log
dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features charset2html moved from mysys to extra ignore: new files added, garbage removed
2004-11-04 22:29:00 +01:00
bkpull.log*
Merge with 4.0.6
2002-12-05 18:38:42 +01:00
bkpull.log.2
bkpull.log.3
bkpull.log.4
bkpull.log.5
bkpull.log.6
bkpush.log
dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features charset2html moved from mysys to extra ignore: new files added, garbage removed
2004-11-04 22:29:00 +01:00
bkpush.log*
Merge with 3.23
2002-12-05 02:52:53 +01:00
build.log
manual merge
2003-07-31 15:11:52 +02:00
build_tags.sh
Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0 into arthur.local:/home/my/mysql-5.0
2006-06-05 11:19:53 +02:00
client/#mysql.cc#
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
client/*.ds?
client/*.vcproj
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
client/.deps/base64.Po
client/.deps/completion_hash.Po
client/.deps/dummy.Po
client/.deps/mf_tempdir.Po
client/.deps/my_bit.Po
client/.deps/my_bitmap.Po
client/.deps/my_getsystime.Po
client/.deps/my_new.Po
client/.deps/my_user.Po
client/.deps/my_vle.Po
client/.deps/mysql.Po
client/.deps/mysql_upgrade.Po
client/.deps/mysqladmin.Po
client/.deps/mysqlbinlog.Po
client/.deps/mysqlcheck.Po
client/.deps/mysqldump.Po
client/.deps/mysqlimport.Po
client/.deps/mysqlshow.Po
client/.deps/mysqlslap.Po
client/.deps/mysqltest.Po
client/.deps/readline.Po
client/.deps/sql_string.Po
Merge bodhi.local:/opt/local/work/tmp_merge into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
2006-07-08 00:30:07 +02:00
client/.libs -prune
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
client/.libs/lt-mysql
client/.libs/lt-mysqladmin
client/.libs/lt-mysqlbinlog
client/.libs/lt-mysqlcheck
client/.libs/lt-mysqldump
client/.libs/lt-mysqlimport
client/.libs/lt-mysqlshow
client/.libs/lt-mysqlslap
client/.libs/lt-mysqltest
client/.libs/mysql
client/.libs/mysql_upgrade
client/.libs/mysqladmin
client/.libs/mysqlbinlog
client/.libs/mysqlcheck
client/.libs/mysqldump
client/.libs/mysqlimport
client/.libs/mysqlshow
client/.libs/mysqlslap
client/.libs/mysqltest
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
client/completion_hash.cpp
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-09 13:34:03 +01:00
client/decimal.c
Merge
2000-12-03 11:56:27 +01:00
client/insert_test
Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508 into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-11 09:34:02 +02:00
client/link_sources
merged
2001-08-10 03:16:15 +02:00
client/log_event.cc
client/log_event.h
Merge romeo.(none):/home/bkroot/mysql-5.1-rpl into romeo.(none):/home/bk/merge-mysql-5.1
2007-04-20 10:46:58 +02:00
client/log_event_old.cc
client/log_event_old.h
merged
2001-08-10 03:16:15 +02:00
client/mf_iocache.c
client/mf_iocache.cc
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-09 13:34:03 +01:00
client/my_decimal.cc
client/my_decimal.h
Merge BUG#15110 from 5.0 into 5.1. Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110 into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 17:09:27 +01:00
client/my_user.c
Merge
2000-12-03 11:56:27 +01:00
client/mysql
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
client/mysql.cpp
Merge mysql.com:/home/jimw/my/mysql-5.0-clean into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-30 22:27:38 +02:00
client/mysql_upgrade
Merge
2000-12-03 11:56:27 +01:00
client/mysqladmin
Merge with 4.1
2004-12-22 12:54:39 +01:00
client/mysqladmin.c
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
client/mysqladmin.cpp
merged
2001-08-10 03:16:15 +02:00
client/mysqlbinlog
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
client/mysqlbinlog.cpp
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
client/mysqlcheck
Merge
2000-12-03 11:56:27 +01:00
client/mysqldump
client/mysqlimport
merge
2001-10-08 04:36:35 +02:00
client/mysqlmanager-pwgen
merged
2001-09-19 22:39:11 +02:00
client/mysqlmanagerc
Merge
2000-12-03 11:56:27 +01:00
client/mysqlshow
Merge BUG#15110 from 5.0 into 5.1. Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110 into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 17:09:27 +01:00
client/mysqlslap
Merge
2000-12-03 11:56:27 +01:00
client/mysqltest
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-07 15:38:05 +02:00
client/mysqltestmanager-pwgen
client/mysqltestmanagerc
merged
2001-08-10 03:16:15 +02:00
client/mysys_priv.h
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
client/readline.cpp
Merge trift2.:/MySQL/M51/mysql-5.1 into trift2.:/MySQL/M51/push-5.1
2007-04-07 20:30:26 +02:00
client/rpl_constants.h
Merge romeo.(none):/home/bkroot/mysql-5.1-rpl into romeo.(none):/home/bk/merge-mysql-5.1
2007-04-20 10:46:58 +02:00
client/rpl_record_old.cc
client/rpl_record_old.h
Bug#31455 mysqlbinlog don't print user readable info about RBR events Implementing -v command line parameter to mysqlbinlog to decode and print row events. mysql-test/include/mysqlbinlog_row_engine.inc mysql-test/r/mysqlbinlog_row.result mysql-test/r/mysqlbinlog_row_big.result mysql-test/r/mysqlbinlog_row_innodb.result mysql-test/r/mysqlbinlog_row_myisam.result mysql-test/r/mysqlbinlog_row_trans.result mysql-test/t/mysqlbinlog_row.test mysql-test/t/mysqlbinlog_row_big.test mysql-test/t/mysqlbinlog_row_innodb.test mysql-test/t/mysqlbinlog_row_myisam.test mysql-test/t/mysqlbinlog_row_trans.test Adding tests client/Makefile.am Adding new files to symlink client/mysqlbinlog.cc Adding -v option sql/log_event.cc Impelentations of the new methods sql/log_event.h Declaration of the new methods and member sql/mysql_priv.h Adding new function prototype sql/rpl_tblmap.cc Adding pre-processor conditions sql/rpl_tblmap.h Adding pre-processor conditions sql/rpl_utility.h Adding pre-processor conditions sql/sql_base.cc Adding reset_table_id_sequence() function. sql/sql_repl.cc Resetting table_id on "RESET MASTER" .bzrignore Ignoring new symlinked files
2008-08-20 16:06:31 +02:00
client/rpl_tblmap.h
client/rpl_tblmap.cc
client/rpl_utility.h
WL#5151: Conversion between different types when replicating Row-based replication requires the types of columns on the master and slave to be approximately the same (some safe conversions between strings are allowed), but does not allow safe conversions between fields of similar types such as TINYINT and INT. This patch implement type conversions between similar fields on the master and slave. The conversions are controlled using a new variable SLAVE_TYPE_CONVERSIONS of type SET('ALL_LOSSY','ALL_NON_LOSSY'). Non-lossy conversions are any conversions that do not run the risk of losing any information, while lossy conversions can potentially truncate the value. The column definitions are checked to decide if the conversion is acceptable. If neither conversion is enabled, it is required that the definitions of the columns are identical on master and slave. Conversion is done by creating an internal conversion table, unpacking the master data into it, and then copy the data to the real table on the slave.
2009-12-14 12:04:55 +01:00
client/rpl_utility.cc
Merge
2000-12-03 11:56:27 +01:00
client/select_test
WL#5030: Split and remove mysql_priv.h This patch: - Moves all definitions from the mysql_priv.h file into header files for the component where the variable is defined - Creates header files if the component lacks one - Eliminates all include directives from mysql_priv.h - Eliminates all circular include cycles - Rename time.cc to sql_time.cc - Rename mysql_priv.h to sql_priv.h
2010-03-31 16:05:33 +02:00
client/sql_const.h
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
client/sql_string.cpp
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.cursor
2003-04-28 11:29:22 +02:00
client/ssl_test
Merge
2000-12-03 11:56:27 +01:00
client/thimble
client/thread_test
Merge shakedown.(none):/home/jpipes/dev/mysql-5.0-maint into shakedown.(none):/home/jpipes/dev/mysql-5.1-new-maint2
2006-11-27 20:46:48 +01:00
client/tmp.diff
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
client_debug/*
client_release/*
Merge with 4.0.13
2003-05-19 15:35:49 +02:00
client_test
Merge recycle.(none):/src/bug24732/my50-bug24732 into recycle.(none):/src/bug24732/my51-bug24732
2007-04-23 21:47:26 +02:00
cmake_install.cmake
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
cmd-line-utils/libedit/.deps/chared.Po
cmd-line-utils/libedit/.deps/common.Po
cmd-line-utils/libedit/.deps/el.Po
cmd-line-utils/libedit/.deps/emacs.Po
cmd-line-utils/libedit/.deps/fcns.Po
cmd-line-utils/libedit/.deps/fgetln.Po
cmd-line-utils/libedit/.deps/help.Po
cmd-line-utils/libedit/.deps/hist.Po
cmd-line-utils/libedit/.deps/history.Po
cmd-line-utils/libedit/.deps/key.Po
cmd-line-utils/libedit/.deps/map.Po
cmd-line-utils/libedit/.deps/parse.Po
cmd-line-utils/libedit/.deps/prompt.Po
cmd-line-utils/libedit/.deps/read.Po
cmd-line-utils/libedit/.deps/readline.Po
cmd-line-utils/libedit/.deps/refresh.Po
cmd-line-utils/libedit/.deps/search.Po
cmd-line-utils/libedit/.deps/sig.Po
cmd-line-utils/libedit/.deps/strlcat.Po
cmd-line-utils/libedit/.deps/strlcpy.Po
cmd-line-utils/libedit/.deps/term.Po
cmd-line-utils/libedit/.deps/tokenizer.Po
cmd-line-utils/libedit/.deps/tty.Po
cmd-line-utils/libedit/.deps/unvis.Po
cmd-line-utils/libedit/.deps/vi.Po
cmd-line-utils/libedit/.deps/vis.Po
merge
2003-02-10 17:01:29 +01:00
cmd-line-utils/libedit/common.h
Merge 4.1 -> 5.0.
2004-04-07 19:07:44 +02:00
cmd-line-utils/libedit/makelist
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
cmd-line-utils/readline/.deps/bind.Po
cmd-line-utils/readline/.deps/callback.Po
cmd-line-utils/readline/.deps/compat.Po
cmd-line-utils/readline/.deps/complete.Po
cmd-line-utils/readline/.deps/display.Po
cmd-line-utils/readline/.deps/funmap.Po
cmd-line-utils/readline/.deps/histexpand.Po
cmd-line-utils/readline/.deps/histfile.Po
cmd-line-utils/readline/.deps/history.Po
cmd-line-utils/readline/.deps/histsearch.Po
cmd-line-utils/readline/.deps/input.Po
cmd-line-utils/readline/.deps/isearch.Po
cmd-line-utils/readline/.deps/keymaps.Po
cmd-line-utils/readline/.deps/kill.Po
cmd-line-utils/readline/.deps/macro.Po
cmd-line-utils/readline/.deps/mbutil.Po
cmd-line-utils/readline/.deps/misc.Po
cmd-line-utils/readline/.deps/nls.Po
cmd-line-utils/readline/.deps/parens.Po
cmd-line-utils/readline/.deps/readline.Po
cmd-line-utils/readline/.deps/rltty.Po
cmd-line-utils/readline/.deps/savestring.Po
cmd-line-utils/readline/.deps/search.Po
cmd-line-utils/readline/.deps/shell.Po
cmd-line-utils/readline/.deps/signals.Po
cmd-line-utils/readline/.deps/terminal.Po
cmd-line-utils/readline/.deps/text.Po
cmd-line-utils/readline/.deps/tilde.Po
cmd-line-utils/readline/.deps/undo.Po
cmd-line-utils/readline/.deps/util.Po
cmd-line-utils/readline/.deps/vi_mode.Po
cmd-line-utils/readline/.deps/xmalloc.Po
merge
2003-02-10 17:01:29 +01:00
comon.h
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
comp_err/*.ds?
comp_err/*.vcproj
Merge xiphis.org:/home/antony/work2/mysql-5.1 into xiphis.org:/home/antony/work2/wl3201-post-review.2
2006-05-02 07:45:31 +02:00
compile
Merge
2000-12-03 11:56:27 +01:00
config.cache
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-07 15:38:05 +02:00
config.guess
Merge
2000-12-03 11:56:27 +01:00
config.h
config.h.in
config.log
config.status
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-07 15:38:05 +02:00
config.sub
Merge
2000-12-03 11:56:27 +01:00
configure
Merge mysql.com:/home/nick/mysql/repository/mysql-4.1 into mysql.com:/home/nick/mysql/mysql-4.1
2002-10-31 07:58:52 +01:00
configure.lineno
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
contrib/*.ds?
contrib/*.vcproj
Merge
2000-12-03 11:56:27 +01:00
core
dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features charset2html moved from mysys to extra ignore: new files added, garbage removed
2004-11-04 22:29:00 +01:00
core.*
Merge with 3.23
2002-12-05 02:52:53 +01:00
core.2430
Merge gleb.loc:/home/uchum/work/bk/5.0-opt into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-09-06 16:15:31 +02:00
cscope.in.out
cscope.out
cscope.po.out
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
db-*.*.*
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
dbug/*.ds?
dbug/*.vcproj
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
dbug/.deps/dbug.Po
dbug/.deps/dbug_analyze.Po
dbug/.deps/factorial.Po
dbug/.deps/my_main.Po
dbug/.deps/sanity.Po
dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features charset2html moved from mysys to extra ignore: new files added, garbage removed
2004-11-04 22:29:00 +01:00
dbug/dbug_analyze
dbug/example*.r
dbug/factorial
dbug/factorial.r
dbug/main.r
dbug/output*.r
dbug/user.ps
sql_base.cc merge+insert (v.3) myrg_info.c merge+insert (v.3) myrg_extra.c merge+insert (v.3) ignore cleanup
2000-12-08 13:53:24 +01:00
dbug/user.t
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-05-24 12:24:36 +02:00
debian/control
debian/defs.mk
merged
2002-11-09 19:27:28 +01:00
depcomp
merge
2003-02-10 17:01:29 +01:00
emacs.h
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
examples/*.ds?
examples/*.vcproj
examples/udf_example/udf_example.def
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
extra/.deps/charset2html.Po
extra/.deps/comp_err.Po
extra/.deps/innochecksum.Po
extra/.deps/my_print_defaults.Po
extra/.deps/mysql_waitpid.Po
extra/.deps/perror.Po
extra/.deps/replace.Po
extra/.deps/resolve_stack_dump.Po
extra/.deps/resolveip.Po
dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features charset2html moved from mysys to extra ignore: new files added, garbage removed
2004-11-04 22:29:00 +01:00
extra/charset2html
Merge
2000-12-03 11:56:27 +01:00
extra/comp_err
Merge with 4.1
2004-12-22 12:54:39 +01:00
extra/created_include_files
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 into hundin.mysql.fi:/home/jan/new/mysql-5.0
2005-07-20 12:47:05 +02:00
extra/innochecksum
Merge
2000-12-03 11:56:27 +01:00
extra/my_print_defaults
Merge work:/home/bk/mysql-4.0 into mysql.sashanet.com:/reiser-data/mysql-4.0-stable
2001-12-25 18:44:31 +01:00
extra/mysql_install
Merge with 4.1.3-beta
2004-07-07 10:29:39 +02:00
extra/mysql_tzinfo_to_sql
Merge with 4.0.9
2003-01-18 02:13:37 +01:00
extra/mysql_waitpid
Merge
2005-01-13 18:14:10 +01:00
extra/mysqld_ername.h
Merge with 4.1
2004-12-22 12:54:39 +01:00
extra/mysqld_error.h
Merge
2000-12-03 11:56:27 +01:00
extra/perror
extra/replace
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
extra/resolve_stack_dump
Merge
2000-12-03 11:56:27 +01:00
extra/resolveip
Merge with 4.1
2004-12-22 12:54:39 +01:00
extra/sql_state.h
Merge with 4.1.3-beta
2004-07-07 10:29:39 +02:00
extra/tztime.cc
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
extra/yassl/src/.deps/buffer.Plo
extra/yassl/src/.deps/cert_wrapper.Plo
extra/yassl/src/.deps/crypto_wrapper.Plo
extra/yassl/src/.deps/handshake.Plo
extra/yassl/src/.deps/lock.Plo
extra/yassl/src/.deps/log.Plo
extra/yassl/src/.deps/socket_wrapper.Plo
extra/yassl/src/.deps/ssl.Plo
extra/yassl/src/.deps/template_instnt.Plo
extra/yassl/src/.deps/timer.Plo
extra/yassl/src/.deps/yassl_error.Plo
extra/yassl/src/.deps/yassl_imp.Plo
extra/yassl/src/.deps/yassl_int.Plo
extra/yassl/taocrypt/benchmark/.deps/benchmark-benchmark.Po
Merge mysql.com:/home/jimw/my/mysql-5.0-clean into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-30 22:27:38 +02:00
extra/yassl/taocrypt/benchmark/benchmark
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aes.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aestables.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-algebra.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-arc4.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-asn.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-bftables.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-blowfish.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-coding.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-des.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dh.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dsa.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-file.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-hash.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-integer.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md2.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md4.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md5.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-misc.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-random.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-ripemd.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-rsa.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-sha.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-template_instnt.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-tftables.Plo
extra/yassl/taocrypt/src/.deps/libtaocrypt_la-twofish.Plo
extra/yassl/taocrypt/test/.deps/test-test.Po
Merge mysql.com:/home/jimw/my/mysql-5.0-clean into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-30 22:27:38 +02:00
extra/yassl/taocrypt/test/test
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
extra/yassl/testsuite/.deps/testsuite-client.Po
extra/yassl/testsuite/.deps/testsuite-echoclient.Po
extra/yassl/testsuite/.deps/testsuite-echoserver.Po
extra/yassl/testsuite/.deps/testsuite-server.Po
extra/yassl/testsuite/.deps/testsuite-test.Po
extra/yassl/testsuite/.deps/testsuite-testsuite.Po
Merge mysql.com:/home/jimw/my/mysql-5.0-clean into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-30 22:27:38 +02:00
extra/yassl/testsuite/testsuite
merge
2003-02-10 17:01:29 +01:00
fcns.c
fcns.h
dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features charset2html moved from mysys to extra ignore: new files added, garbage removed
2004-11-04 22:29:00 +01:00
gdbinit
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
gmon.out
Merge with 4.0.16
2003-10-07 14:42:26 +02:00
hardcopy.0
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
heap/*.ds?
heap/*.vcproj
Merge
2000-12-03 11:56:27 +01:00
heap/hp_test1
heap/hp_test2
merged
2004-11-20 18:36:41 +01:00
help
merge
2003-02-10 17:01:29 +01:00
help.c
help.h
Merge labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvel into labbari.dsl.inet.fi:/home/my/bk/mysql-5.1-marvel
2007-07-06 12:49:15 +02:00
include/abi_check
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 21:05:35 +02:00
include/check_abi
Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508 into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-11 09:34:02 +02:00
include/link_sources
Merge
2000-12-03 11:56:27 +01:00
include/my_config.h
include/my_global.h
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 21:05:35 +02:00
include/mysql_h.ic
Merge
2000-12-03 11:56:27 +01:00
include/mysql_version.h
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-09 13:34:03 +01:00
include/mysqld_ername.h
include/mysqld_error.h
merged
2006-03-06 23:20:19 +01:00
include/openssl
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
include/readline
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 into mysql.r18.ru:/usr/home/ram/work/4.1.latest
2003-05-30 20:09:34 +02:00
include/readline/*.h
merge
2003-02-10 17:01:29 +01:00
include/readline/readline.h
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-09 13:34:03 +01:00
include/sql_state.h
Merge hundin:/my/mysql into bitch.mysql.fi:/my/mysql
2001-08-11 10:54:23 +02:00
include/widec.h
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
innobase/*.ds?
innobase/*.vcproj
dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features charset2html moved from mysys to extra ignore: new files added, garbage removed
2004-11-04 22:29:00 +01:00
innobase/autom4te-2.53.cache/*
Merge with 3.23
2002-12-05 02:52:53 +01:00
innobase/autom4te-2.53.cache/output.0
innobase/autom4te-2.53.cache/requests
innobase/autom4te-2.53.cache/traces.0
Merge mysql.com:/home/nick/mysql/repository/mysql-4.1 into mysql.com:/home/nick/mysql/mysql-4.1
2002-10-31 07:58:52 +01:00
innobase/autom4te.cache/*
Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.0-build
2002-11-18 11:41:29 +01:00
innobase/autom4te.cache/output.0
innobase/autom4te.cache/requests
innobase/autom4te.cache/traces.0
Merge mysql.com:/home/nick/mysql/repository/mysql-4.1 into mysql.com:/home/nick/mysql/mysql-4.1
2002-10-31 07:58:52 +01:00
innobase/configure.lineno
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2001-08-12 15:11:43 +02:00
innobase/conftest.s1
innobase/conftest.subs
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
innobase/ib_config.h
innobase/ib_config.h.in
Merge mysql.com:/home/my/mysql-4.1 into mysql.com:/home/my/mysql-5.0
2005-07-28 16:09:54 +02:00
innobase/mkinstalldirs
Merge mysql.com:/home/nick/mysql/repository/mysql-4.1 into mysql.com:/home/nick/mysql/mysql-4.1
2002-10-31 07:58:52 +01:00
innobase/stamp-h1
Merge with 4.0.13
2003-05-19 15:35:49 +02:00
insert_test
Hand-resolved auto merge
2004-04-07 14:56:24 +02:00
install
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-07 15:38:05 +02:00
install-sh
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
isam/*.ds?
isam/*.vcproj
Merge
2000-12-03 11:56:27 +01:00
isam/isamchk
isam/isamlog
isam/pack_isam
isam/test1
isam/test2
isam/test3
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
isamchk/*.ds?
isamchk/*.vcproj
Merge BUG#15110 from 5.0 into 5.1. Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110 into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 17:09:27 +01:00
item_xmlfunc.cc
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
lib_debug/*
lib_release/*
Merge
2000-12-03 11:56:27 +01:00
libmysql/*.c
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
libmysql/*.ds?
libmysql/*.vcproj
update to ease the patch process
2006-07-13 16:24:55 +02:00
libmysql/.deps/array.Plo
libmysql/.deps/bchange.Plo
libmysql/.deps/bcmp.Plo
libmysql/.deps/bmove.Plo
libmysql/.deps/bmove_upp.Plo
libmysql/.deps/charset-def.Plo
libmysql/.deps/charset.Plo
libmysql/.deps/client.Plo
libmysql/.deps/conf_to_src.Po
libmysql/.deps/ctype-big5.Plo
libmysql/.deps/ctype-bin.Plo
libmysql/.deps/ctype-cp932.Plo
libmysql/.deps/ctype-czech.Plo
libmysql/.deps/ctype-euc_kr.Plo
libmysql/.deps/ctype-eucjpms.Plo
libmysql/.deps/ctype-extra.Plo
libmysql/.deps/ctype-gb2312.Plo
libmysql/.deps/ctype-gbk.Plo
libmysql/.deps/ctype-latin1.Plo
libmysql/.deps/ctype-mb.Plo
libmysql/.deps/ctype-simple.Plo
libmysql/.deps/ctype-sjis.Plo
libmysql/.deps/ctype-tis620.Plo
libmysql/.deps/ctype-uca.Plo
libmysql/.deps/ctype-ucs2.Plo
libmysql/.deps/ctype-ujis.Plo
libmysql/.deps/ctype-utf8.Plo
libmysql/.deps/ctype-win1250ch.Plo
libmysql/.deps/ctype.Plo
libmysql/.deps/dbug.Plo
libmysql/.deps/default.Plo
libmysql/.deps/default_modify.Plo
libmysql/.deps/errmsg.Plo
libmysql/.deps/errors.Plo
libmysql/.deps/get_password.Plo
libmysql/.deps/hash.Plo
libmysql/.deps/int2str.Plo
libmysql/.deps/is_prefix.Plo
libmysql/.deps/libmysql.Plo
libmysql/.deps/list.Plo
libmysql/.deps/llstr.Plo
libmysql/.deps/longlong2str.Plo
libmysql/.deps/manager.Plo
libmysql/.deps/md5.Plo
libmysql/.deps/mf_cache.Plo
libmysql/.deps/mf_dirname.Plo
libmysql/.deps/mf_fn_ext.Plo
libmysql/.deps/mf_format.Plo
libmysql/.deps/mf_iocache.Plo
libmysql/.deps/mf_iocache2.Plo
libmysql/.deps/mf_loadpath.Plo
libmysql/.deps/mf_pack.Plo
libmysql/.deps/mf_path.Plo
libmysql/.deps/mf_tempfile.Plo
libmysql/.deps/mf_unixpath.Plo
libmysql/.deps/mf_wcomp.Plo
libmysql/.deps/mulalloc.Plo
libmysql/.deps/my_alloc.Plo
libmysql/.deps/my_chsize.Plo
libmysql/.deps/my_compress.Plo
libmysql/.deps/my_create.Plo
libmysql/.deps/my_delete.Plo
libmysql/.deps/my_div.Plo
libmysql/.deps/my_error.Plo
libmysql/.deps/my_file.Plo
libmysql/.deps/my_fopen.Plo
libmysql/.deps/my_fstream.Plo
libmysql/.deps/my_gethostbyname.Plo
libmysql/.deps/my_getopt.Plo
libmysql/.deps/my_getwd.Plo
libmysql/.deps/my_init.Plo
libmysql/.deps/my_lib.Plo
libmysql/.deps/my_malloc.Plo
libmysql/.deps/my_messnc.Plo
libmysql/.deps/my_net.Plo
libmysql/.deps/my_once.Plo
libmysql/.deps/my_open.Plo
libmysql/.deps/my_port.Plo
libmysql/.deps/my_pread.Plo
libmysql/.deps/my_pthread.Plo
libmysql/.deps/my_read.Plo
libmysql/.deps/my_realloc.Plo
libmysql/.deps/my_rename.Plo
libmysql/.deps/my_seek.Plo
libmysql/.deps/my_sleep.Plo
libmysql/.deps/my_static.Plo
libmysql/.deps/my_strtoll10.Plo
libmysql/.deps/my_symlink.Plo
libmysql/.deps/my_thr_init.Plo
libmysql/.deps/my_time.Plo
libmysql/.deps/my_vsnprintf.Plo
libmysql/.deps/my_write.Plo
libmysql/.deps/net.Plo
libmysql/.deps/pack.Plo
libmysql/.deps/password.Plo
libmysql/.deps/safemalloc.Plo
libmysql/.deps/sha1.Plo
libmysql/.deps/str2int.Plo
libmysql/.deps/str_alloc.Plo
libmysql/.deps/strcend.Plo
libmysql/.deps/strcont.Plo
libmysql/.deps/strend.Plo
libmysql/.deps/strfill.Plo
libmysql/.deps/string.Plo
libmysql/.deps/strinstr.Plo
libmysql/.deps/strmake.Plo
libmysql/.deps/strmov.Plo
libmysql/.deps/strnlen.Plo
libmysql/.deps/strnmov.Plo
libmysql/.deps/strtod.Plo
libmysql/.deps/strtoll.Plo
libmysql/.deps/strtoull.Plo
libmysql/.deps/strxmov.Plo
libmysql/.deps/strxnmov.Plo
libmysql/.deps/thr_mutex.Plo
libmysql/.deps/typelib.Plo
libmysql/.deps/vio.Plo
libmysql/.deps/viosocket.Plo
libmysql/.deps/viossl.Plo
libmysql/.deps/viosslfactories.Plo
libmysql/.deps/xml.Plo
libmysql/.libs/libmysqlclient.lai
libmysql/.libs/libmysqlclient.so.15
libmysql/.libs/libmysqlclient.so.15.0.0
Merge
2000-12-03 11:56:27 +01:00
libmysql/conf_to_src
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
libmysql/debug/libmysql.exp
Merge mysql.com:/opt/local/work/mysql-4.1-root into mysql.com:/opt/local/work/mysql-5.0-root
2006-01-18 13:15:09 +01:00
libmysql/libmysql.ver
Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508 into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-11 09:34:02 +02:00
libmysql/link_sources
Merge
2000-12-03 11:56:27 +01:00
libmysql/my_static.h
Merge with 4.1.3-beta
2004-07-07 10:29:39 +02:00
libmysql/my_time.c
Merge
2000-12-03 11:56:27 +01:00
libmysql/mysys_priv.h
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-08-13 21:15:14 +02:00
libmysql/net.c
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
libmysql/release/libmysql.exp
merge with 4.0.15
2003-08-29 12:44:35 +02:00
libmysql/vio_priv.h
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
libmysql/viosocket.o.6WmSJk
sql_base.cc merge+insert (v.3) myrg_info.c merge+insert (v.3) myrg_extra.c merge+insert (v.3) ignore cleanup
2000-12-08 13:53:24 +01:00
libmysql_r/*.c
update to ease the patch process
2006-07-13 16:24:55 +02:00
libmysql_r/.deps/array.Plo
libmysql_r/.deps/bchange.Plo
libmysql_r/.deps/bcmp.Plo
libmysql_r/.deps/bmove.Plo
libmysql_r/.deps/bmove_upp.Plo
libmysql_r/.deps/charset-def.Plo
libmysql_r/.deps/charset.Plo
libmysql_r/.deps/client.Plo
libmysql_r/.deps/conf_to_src.Po
libmysql_r/.deps/ctype-big5.Plo
libmysql_r/.deps/ctype-bin.Plo
libmysql_r/.deps/ctype-cp932.Plo
libmysql_r/.deps/ctype-czech.Plo
libmysql_r/.deps/ctype-euc_kr.Plo
libmysql_r/.deps/ctype-eucjpms.Plo
libmysql_r/.deps/ctype-extra.Plo
libmysql_r/.deps/ctype-gb2312.Plo
libmysql_r/.deps/ctype-gbk.Plo
libmysql_r/.deps/ctype-latin1.Plo
libmysql_r/.deps/ctype-mb.Plo
libmysql_r/.deps/ctype-simple.Plo
libmysql_r/.deps/ctype-sjis.Plo
libmysql_r/.deps/ctype-tis620.Plo
libmysql_r/.deps/ctype-uca.Plo
libmysql_r/.deps/ctype-ucs2.Plo
libmysql_r/.deps/ctype-ujis.Plo
libmysql_r/.deps/ctype-utf8.Plo
libmysql_r/.deps/ctype-win1250ch.Plo
libmysql_r/.deps/ctype.Plo
libmysql_r/.deps/dbug.Plo
libmysql_r/.deps/default.Plo
libmysql_r/.deps/default_modify.Plo
libmysql_r/.deps/errmsg.Plo
libmysql_r/.deps/errors.Plo
libmysql_r/.deps/get_password.Plo
libmysql_r/.deps/hash.Plo
libmysql_r/.deps/int2str.Plo
libmysql_r/.deps/is_prefix.Plo
libmysql_r/.deps/libmysql.Plo
libmysql_r/.deps/list.Plo
libmysql_r/.deps/llstr.Plo
libmysql_r/.deps/longlong2str.Plo
libmysql_r/.deps/manager.Plo
libmysql_r/.deps/md5.Plo
libmysql_r/.deps/mf_cache.Plo
libmysql_r/.deps/mf_dirname.Plo
libmysql_r/.deps/mf_fn_ext.Plo
libmysql_r/.deps/mf_format.Plo
libmysql_r/.deps/mf_iocache.Plo
libmysql_r/.deps/mf_iocache2.Plo
libmysql_r/.deps/mf_loadpath.Plo
libmysql_r/.deps/mf_pack.Plo
libmysql_r/.deps/mf_path.Plo
libmysql_r/.deps/mf_tempfile.Plo
libmysql_r/.deps/mf_unixpath.Plo
libmysql_r/.deps/mf_wcomp.Plo
libmysql_r/.deps/mulalloc.Plo
libmysql_r/.deps/my_alloc.Plo
libmysql_r/.deps/my_chsize.Plo
libmysql_r/.deps/my_compress.Plo
libmysql_r/.deps/my_create.Plo
libmysql_r/.deps/my_delete.Plo
libmysql_r/.deps/my_div.Plo
libmysql_r/.deps/my_error.Plo
libmysql_r/.deps/my_file.Plo
libmysql_r/.deps/my_fopen.Plo
libmysql_r/.deps/my_fstream.Plo
libmysql_r/.deps/my_gethostbyname.Plo
libmysql_r/.deps/my_getopt.Plo
libmysql_r/.deps/my_getwd.Plo
libmysql_r/.deps/my_init.Plo
libmysql_r/.deps/my_lib.Plo
libmysql_r/.deps/my_malloc.Plo
libmysql_r/.deps/my_messnc.Plo
libmysql_r/.deps/my_net.Plo
libmysql_r/.deps/my_once.Plo
libmysql_r/.deps/my_open.Plo
libmysql_r/.deps/my_port.Plo
libmysql_r/.deps/my_pread.Plo
libmysql_r/.deps/my_pthread.Plo
libmysql_r/.deps/my_read.Plo
libmysql_r/.deps/my_realloc.Plo
libmysql_r/.deps/my_rename.Plo
libmysql_r/.deps/my_seek.Plo
libmysql_r/.deps/my_sleep.Plo
libmysql_r/.deps/my_static.Plo
libmysql_r/.deps/my_strtoll10.Plo
libmysql_r/.deps/my_symlink.Plo
libmysql_r/.deps/my_thr_init.Plo
libmysql_r/.deps/my_time.Plo
libmysql_r/.deps/my_vsnprintf.Plo
libmysql_r/.deps/my_write.Plo
libmysql_r/.deps/net.Plo
libmysql_r/.deps/pack.Plo
libmysql_r/.deps/password.Plo
libmysql_r/.deps/safemalloc.Plo
libmysql_r/.deps/sha1.Plo
libmysql_r/.deps/str2int.Plo
libmysql_r/.deps/str_alloc.Plo
libmysql_r/.deps/strcend.Plo
libmysql_r/.deps/strcont.Plo
libmysql_r/.deps/strend.Plo
libmysql_r/.deps/strfill.Plo
libmysql_r/.deps/string.Plo
libmysql_r/.deps/strinstr.Plo
libmysql_r/.deps/strmake.Plo
libmysql_r/.deps/strmov.Plo
libmysql_r/.deps/strnlen.Plo
libmysql_r/.deps/strnmov.Plo
libmysql_r/.deps/strtod.Plo
libmysql_r/.deps/strtoll.Plo
libmysql_r/.deps/strtoull.Plo
libmysql_r/.deps/strxmov.Plo
libmysql_r/.deps/strxnmov.Plo
libmysql_r/.deps/thr_mutex.Plo
libmysql_r/.deps/typelib.Plo
libmysql_r/.deps/vio.Plo
libmysql_r/.deps/viosocket.Plo
libmysql_r/.deps/viossl.Plo
libmysql_r/.deps/viosslfactories.Plo
libmysql_r/.deps/xml.Plo
libmysql_r/.libs/libmysqlclient_r.lai
libmysql_r/.libs/libmysqlclient_r.so.15
libmysql_r/.libs/libmysqlclient_r.so.15.0.0
pointer casts -> int4store() added error code to master failed connect message
2000-11-28 07:08:46 +01:00
libmysql_r/acconfig.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-11-05 16:36:34 +01:00
libmysql_r/client_settings.h
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
libmysql_r/conf_to_src
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-11-05 16:36:34 +01:00
libmysql_r/link_sources
pointer casts -> int4store() added error code to master failed connect message
2000-11-28 07:08:46 +01:00
libmysql_r/my_static.h
Merge
2000-12-08 17:39:37 +01:00
libmysql_r/mysys_priv.h
merge with 4.0.15
2003-08-29 12:44:35 +02:00
libmysql_r/vio_priv.h
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
libmysqld/*.ds?
libmysqld/*.vcproj
update to ease the patch process
2006-07-13 16:24:55 +02:00
libmysqld/.deps/client.Po
libmysqld/.deps/derror.Po
libmysqld/.deps/discover.Po
libmysqld/.deps/emb_qcache.Po
libmysqld/.deps/errmsg.Po
libmysqld/.deps/event_data_objects.Po
libmysqld/.deps/event_db_repository.Po
libmysqld/.deps/event_queue.Po
libmysqld/.deps/event_scheduler.Po
libmysqld/.deps/events.Po
libmysqld/.deps/field.Po
libmysqld/.deps/field_conv.Po
libmysqld/.deps/filesort.Po
libmysqld/.deps/get_password.Po
libmysqld/.deps/gstream.Po
libmysqld/.deps/ha_berkeley.Po
libmysqld/.deps/ha_federated.Po
libmysqld/.deps/ha_heap.Po
libmysqld/.deps/ha_innodb.Po
libmysqld/.deps/ha_myisam.Po
libmysqld/.deps/ha_myisammrg.Po
libmysqld/.deps/ha_ndbcluster.Po
libmysqld/.deps/ha_ndbcluster_binlog.Po
libmysqld/.deps/ha_partition.Po
libmysqld/.deps/handler.Po
libmysqld/.deps/hash_filo.Po
libmysqld/.deps/hostname.Po
libmysqld/.deps/init.Po
libmysqld/.deps/item.Po
libmysqld/.deps/item_buff.Po
libmysqld/.deps/item_cmpfunc.Po
libmysqld/.deps/item_create.Po
libmysqld/.deps/item_func.Po
libmysqld/.deps/item_geofunc.Po
libmysqld/.deps/item_row.Po
libmysqld/.deps/item_strfunc.Po
libmysqld/.deps/item_subselect.Po
libmysqld/.deps/item_sum.Po
libmysqld/.deps/item_timefunc.Po
libmysqld/.deps/item_uniq.Po
libmysqld/.deps/item_xmlfunc.Po
libmysqld/.deps/key.Po
libmysqld/.deps/lib_sql.Po
libmysqld/.deps/libmysql.Po
libmysqld/.deps/libmysqld.Po
libmysqld/.deps/lock.Po
libmysqld/.deps/log.Po
libmysqld/.deps/log_event.Po
libmysqld/.deps/my_decimal.Po
libmysqld/.deps/my_time.Po
libmysqld/.deps/my_user.Po
libmysqld/.deps/net_serv.Po
libmysqld/.deps/opt_range.Po
libmysqld/.deps/opt_sum.Po
libmysqld/.deps/pack.Po
libmysqld/.deps/parse_file.Po
libmysqld/.deps/partition_info.Po
libmysqld/.deps/password.Po
libmysqld/.deps/procedure.Po
libmysqld/.deps/protocol.Po
libmysqld/.deps/records.Po
libmysqld/.deps/rpl_filter.Po
libmysqld/.deps/rpl_injector.Po
libmysqld/.deps/set_var.Po
libmysqld/.deps/sp.Po
libmysqld/.deps/sp_cache.Po
libmysqld/.deps/sp_head.Po
libmysqld/.deps/sp_pcontext.Po
libmysqld/.deps/sp_rcontext.Po
libmysqld/.deps/spatial.Po
libmysqld/.deps/sql_acl.Po
libmysqld/.deps/sql_analyse.Po
libmysqld/.deps/sql_base.Po
libmysqld/.deps/sql_builtin.Po
libmysqld/.deps/sql_cache.Po
libmysqld/.deps/sql_class.Po
libmysqld/.deps/sql_crypt.Po
libmysqld/.deps/sql_cursor.Po
libmysqld/.deps/sql_db.Po
libmysqld/.deps/sql_delete.Po
Bug#42643: InnoDB does not support replication of TRUNCATE TABLE The problem was that TRUNCATE TABLE didn't take a exclusive lock on a table if it resorted to truncating via delete of all rows in the table. Specifically for InnoDB tables, this could break proper isolation as InnoDB ends up aborting some granted locks when truncating a table. The solution is to take a exclusive metadata lock before TRUNCATE TABLE can proceed. This guarantees that no other transaction is using the table. Incompatible change: Truncate via delete no longer fails if sql_safe_updates is activated (this was a undocumented side effect).
2010-05-25 22:01:38 +02:00
libmysqld/.deps/sql_truncate.Po
Extract reload_acl_and_cache() and flush_tables_with_read_lock() into an own implementation file.
2010-08-13 11:51:48 +02:00
libmysqld/.deps/sql_reload.Po
Bug#42643: InnoDB does not support replication of TRUNCATE TABLE The problem was that TRUNCATE TABLE didn't take a exclusive lock on a table if it resorted to truncating via delete of all rows in the table. Specifically for InnoDB tables, this could break proper isolation as InnoDB ends up aborting some granted locks when truncating a table. The solution is to take a exclusive metadata lock before TRUNCATE TABLE can proceed. This guarantees that no other transaction is using the table. Incompatible change: Truncate via delete no longer fails if sql_safe_updates is activated (this was a undocumented side effect).
2010-05-25 22:01:38 +02:00
libmysqld/.deps/datadict.Po
update to ease the patch process
2006-07-13 16:24:55 +02:00
libmysqld/.deps/sql_derived.Po
libmysqld/.deps/sql_do.Po
libmysqld/.deps/sql_error.Po
libmysqld/.deps/sql_handler.Po
libmysqld/.deps/sql_help.Po
libmysqld/.deps/sql_insert.Po
libmysqld/.deps/sql_lex.Po
libmysqld/.deps/sql_list.Po
libmysqld/.deps/sql_load.Po
libmysqld/.deps/sql_manager.Po
libmysqld/.deps/sql_map.Po
libmysqld/.deps/sql_parse.Po
libmysqld/.deps/sql_partition.Po
libmysqld/.deps/sql_plugin.Po
libmysqld/.deps/sql_prepare.Po
libmysqld/.deps/sql_rename.Po
libmysqld/.deps/sql_select.Po
libmysqld/.deps/sql_show.Po
libmysqld/.deps/sql_state.Po
libmysqld/.deps/sql_string.Po
libmysqld/.deps/sql_table.Po
libmysqld/.deps/sql_tablespace.Po
libmysqld/.deps/sql_test.Po
libmysqld/.deps/sql_trigger.Po
libmysqld/.deps/sql_udf.Po
libmysqld/.deps/sql_union.Po
libmysqld/.deps/sql_update.Po
libmysqld/.deps/sql_view.Po
libmysqld/.deps/sql_yacc.Po
libmysqld/.deps/stacktrace.Po
libmysqld/.deps/strfunc.Po
libmysqld/.deps/table.Po
libmysqld/.deps/thr_malloc.Po
libmysqld/.deps/time.Po
libmysqld/.deps/tztime.Po
libmysqld/.deps/uniques.Po
libmysqld/.deps/unireg.Po
Merge work:/home/bk/mysql-4.0 into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-06-01 19:06:28 +02:00
libmysqld/backup_dir
manual merge
2003-07-31 15:11:52 +02:00
libmysqld/client.c
libmysqld/client_settings.h
Embedded Server doesn't build on Windows. - Add build configuration parameter EMBEDDED_ONLY which will configure the VS solution to produce only mysql embedded binary. - Make necessary updates to successfully compile solution.
2007-06-15 20:32:16 +02:00
libmysqld/cmake_dummy.c
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/convert.cc
libmysqld/derror.cc
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
libmysqld/discover.cc
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
libmysqld/emb_qcache.cpp
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/errmsg.c
Merge BUG#15110 from 5.0 into 5.1. Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110 into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 17:09:27 +01:00
libmysqld/event.cc
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
libmysqld/event_data_objects.cc
libmysqld/event_db_repository.cc
Merge BUG#15110 from 5.0 into 5.1. Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110 into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 17:09:27 +01:00
libmysqld/event_executor.cc
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
libmysqld/event_queue.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new into mysql.com:/home/my/mysql-5.1
2006-06-04 20:05:22 +02:00
libmysqld/event_scheduler.cc
Merge BUG#15110 from 5.0 into 5.1. Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110 into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 17:09:27 +01:00
libmysqld/event_timed.cc
manual merge
2006-06-20 17:14:36 +02:00
libmysqld/events.cc
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
libmysqld/examples/.deps/completion_hash.Po
libmysqld/examples/.deps/mysql.Po
libmysqld/examples/.deps/mysql_client_test.Po
libmysqld/examples/.deps/mysqltest.Po
libmysqld/examples/.deps/readline.Po
Merging 4.1 to 5.0.
2004-05-26 17:04:45 +02:00
libmysqld/examples/client_test.c
Merge with 4.1 (Includes merge of arena code in 4.1 and 5.0)
2004-09-06 14:14:10 +02:00
libmysqld/examples/client_test.cc
merged
2001-09-19 22:39:11 +02:00
libmysqld/examples/completion_hash.cc
libmysqld/examples/completion_hash.h
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2001-10-19 16:46:51 +02:00
libmysqld/examples/link_sources
merged
2001-09-19 22:39:11 +02:00
libmysqld/examples/my_readline.h
libmysqld/examples/mysql
libmysqld/examples/mysql.cc
merged
2005-01-25 21:11:04 +01:00
libmysqld/examples/mysql_client_test.c
libmysqld/examples/mysql_client_test_embedded
merged
2001-09-19 22:39:11 +02:00
libmysqld/examples/mysqltest
libmysqld/examples/mysqltest.c
merged
2005-01-25 21:11:04 +01:00
libmysqld/examples/mysqltest_embedded
merged
2001-09-19 22:39:11 +02:00
libmysqld/examples/readline.cc
libmysqld/examples/sql_string.cc
libmysqld/examples/sql_string.h
merge
2001-10-08 04:36:35 +02:00
libmysqld/examples/test-gdbinit
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/field.cc
libmysqld/field_conv.cc
libmysqld/filesort.cc
libmysqld/get_password.c
merge
2002-04-13 14:34:39 +02:00
libmysqld/gstream.cc
Merge with 4.1
2004-12-06 10:38:56 +01:00
libmysqld/ha_archive.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/ha_berkeley.cc
Merge mysql.com:/home/my/mysql-5.0 into mysql.com:/home/my/mysql-5.1
2005-11-24 01:56:12 +01:00
libmysqld/ha_blackhole.cc
Merge with 4.1
2004-12-06 10:38:56 +01:00
libmysqld/ha_example.cc
Merge
2005-01-24 22:48:48 +01:00
libmysqld/ha_federated.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/ha_heap.cc
Merge work:/home/bk/mysql-4.0 into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-08-28 01:34:29 +02:00
libmysqld/ha_innobase.cc
Ugly merge! But I am not done yet - there are a number of things I need to fix before I can push
2002-01-20 06:46:25 +01:00
libmysqld/ha_innodb.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/ha_isam.cc
libmysqld/ha_isammrg.cc
libmysqld/ha_myisam.cc
libmysqld/ha_myisammrg.cc
Add generated files to ignore list
2005-11-08 01:39:20 +01:00
libmysqld/ha_ndbcluster.cc
Merge BUG#15110 from 5.0 into 5.1. Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110 into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 17:09:27 +01:00
libmysqld/ha_ndbcluster_binlog.cc
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-05-24 12:24:36 +02:00
libmysqld/ha_ndbcluster_cond.cc
Remove some files that should not have been added with BDB upgrade, and update ignore file after move of storage engines to storage/.
2005-09-23 00:53:18 +02:00
libmysqld/ha_partition.cc
Merge with 4.1
2004-12-06 10:38:56 +01:00
libmysqld/ha_tina.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/handler.cc
Add generated files to ignore list
2005-11-08 01:39:20 +01:00
libmysqld/handlerton.cc
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2001-07-01 12:27:09 +02:00
libmysqld/hash_filo.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/hostname.cc
libmysqld/init.cc
libmysqld/item.cc
libmysqld/item_buff.cc
libmysqld/item_cmpfunc.cc
libmysqld/item_create.cc
libmysqld/item_func.cc
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 into mysql.r18.ru:/usr/home/ram/work/4.1.latest
2003-05-30 20:09:34 +02:00
libmysqld/item_geofunc.cc
Merge with 4.0.6
2002-12-05 18:38:42 +01:00
libmysqld/item_row.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/item_strfunc.cc
Merge bk-internal:/home/bk/mysql-4.1/ into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-17 17:07:14 +01:00
libmysqld/item_subselect.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/item_sum.cc
libmysqld/item_timefunc.cc
libmysqld/item_uniq.cc
libmysqld/key.cc
Bug#29903 The CMake build method does not produce the embedded library. - Changes to correct and test Windows embedded build.
2007-08-03 20:43:12 +02:00
libmysqld/lex_hash.h
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
libmysqld/lib_sql.cpp
manual merge
2003-07-31 15:11:52 +02:00
libmysqld/libmysql.c
Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508 into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-11 09:34:02 +02:00
libmysqld/link_sources
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/lock.cc
libmysqld/log.cc
libmysqld/log_event.cc
Merge romeo.(none):/home/bkroot/mysql-5.1-rpl into romeo.(none):/home/bk/merge-mysql-5.1
2007-04-20 10:46:58 +02:00
libmysqld/log_event_old.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/md5.c
Bug#29903 The CMake build method does not produce the embedded library. - Changes to correct and test Windows embedded build.
2007-08-03 20:43:12 +02:00
libmysqld/message.h
libmysqld/message.rc
merge with 3.23.44
2001-11-04 15:14:09 +01:00
libmysqld/mf_iocache.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/mini_client.cc
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-09 13:34:03 +01:00
libmysqld/my_decimal.cc
Merge with 4.1.3-beta
2004-07-07 10:29:39 +02:00
libmysqld/my_time.c
Merge BUG#15110 from 5.0 into 5.1. Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110 into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 17:09:27 +01:00
libmysqld/my_user.c
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/net_pkg.cc
libmysqld/net_serv.cc
libmysqld/opt_ft.cc
libmysqld/opt_range.cc
libmysqld/opt_sum.cc
manual merge
2003-07-31 15:11:52 +02:00
libmysqld/pack.c
Post-merge post-merge fix (new error codes for fparser).
2004-05-14 16:10:31 +02:00
libmysqld/parse_file.cc
merged
2006-03-06 23:20:19 +01:00
libmysqld/partition_info.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/password.c
libmysqld/procedure.cc
Merge with 4.0.9
2003-01-18 02:13:37 +01:00
libmysqld/protocol.cc
Merge 4.1 to 5.0
2003-12-01 16:14:40 +01:00
libmysqld/protocol_cursor.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/records.cc
Merge work:/home/bk/mysql-4.0 into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2001-10-12 17:47:13 +02:00
libmysqld/repl_failsafe.cc
Remove some files that should not have been added with BDB upgrade, and update ignore file after move of storage engines to storage/.
2005-09-23 00:53:18 +02:00
libmysqld/rpl_filter.cc
update .bzrignore to ignore libmysqld/rpl_handler.cc link
2009-10-28 15:46:11 +01:00
libmysqld/rpl_handler.cc
Merge BUG#15110 from 5.0 into 5.1. Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110 into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 17:09:27 +01:00
libmysqld/rpl_injector.cc
Merge romeo.(none):/home/bkroot/mysql-5.1-rpl into romeo.(none):/home/bk/merge-mysql-5.1
2007-04-20 10:46:58 +02:00
libmysqld/rpl_record.cc
libmysqld/rpl_record_old.cc
WL#5151: Conversion between different types when replicating Row-based replication requires the types of columns on the master and slave to be approximately the same (some safe conversions between strings are allowed), but does not allow safe conversions between fields of similar types such as TINYINT and INT. This patch implement type conversions between similar fields on the master and slave. The conversions are controlled using a new variable SLAVE_TYPE_CONVERSIONS of type SET('ALL_LOSSY','ALL_NON_LOSSY'). Non-lossy conversions are any conversions that do not run the risk of losing any information, while lossy conversions can potentially truncate the value. The column definitions are checked to decide if the conversion is acceptable. If neither conversion is enabled, it is required that the definitions of the columns are identical on master and slave. Conversion is done by creating an internal conversion table, unpacking the master data into it, and then copy the data to the real table on the slave.
2009-12-14 12:04:55 +01:00
libmysqld/rpl_utility.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-11-05 16:36:34 +01:00
libmysqld/scheduler.cc
merge with 3.23
2002-08-24 01:10:49 +02:00
libmysqld/set_var.cc
Backport of: ChangeSet@1.2703, 2007-12-07 09:35:28-05:00, cmiller@zippy.cornsilk.net +40 -0 Bug#13174: SHA2 function Patch contributed from Bill Karwin, paper unnumbered CLA in Seattle Implement SHA2 functions. Chad added code to make it work with YaSSL. Also, he removed the (probable) bug of embedded server never using SSL-dependent functions. (libmysqld/Makefile.am didn't read ANY autoconf defs.) Function specification: SHA2( string cleartext, integer hash_length ) -> string hash, or NULL where hash_length is one of 224, 256, 384, or 512. If either is NULL or a length is unsupported, then the result is NULL. The resulting string is always the length of the hash_length parameter or is NULL. Include the canonical hash examples from the NIST in the test results. --- Polish and address concerns of reviewers.
2010-04-13 17:04:45 +02:00
libmysqld/sha2.cc
Merge work:/home/bk/mysql-4.0 into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-06-01 19:06:28 +02:00
libmysqld/simple-test
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/slave.cc
Merged 4.1 to 5.0.
2003-04-29 12:06:04 +02:00
libmysqld/sp.cc
Merge 4.1 into 5.0
2003-08-26 11:51:09 +02:00
libmysqld/sp_cache.cc
Merged 4.1 to 5.0.
2003-04-29 12:06:04 +02:00
libmysqld/sp_head.cc
libmysqld/sp_pcontext.cc
Merge 4.1 to 5.0
2003-12-01 16:14:40 +01:00
libmysqld/sp_rcontext.cc
merge
2002-04-13 14:34:39 +02:00
libmysqld/spatial.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/sql_acl.cc
libmysqld/sql_analyse.cc
libmysqld/sql_base.cc
Merge xiphis.org:/home/antony/work2/mysql-5.1 into xiphis.org:/home/antony/work2/wl3201-post-review.2
2006-05-02 07:45:31 +02:00
libmysqld/sql_builtin.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/sql_cache.cc
libmysqld/sql_class.cc
Merge work:/home/bk/mysql-4.0 into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-06-01 19:06:28 +02:00
libmysqld/sql_command
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-11-05 16:36:34 +01:00
libmysqld/sql_connect.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/sql_crypt.cc
Merge mysqldev@production.mysql.com:my/mysql-5.0-release into mysql.com:/opt/local/work/mysql-5.0-root
2005-09-22 22:46:59 +02:00
libmysqld/sql_cursor.cc
libmysqld/sql_cursor.h
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/sql_db.cc
libmysqld/sql_delete.cc
Bug#42643: InnoDB does not support replication of TRUNCATE TABLE The problem was that TRUNCATE TABLE didn't take a exclusive lock on a table if it resorted to truncating via delete of all rows in the table. Specifically for InnoDB tables, this could break proper isolation as InnoDB ends up aborting some granted locks when truncating a table. The solution is to take a exclusive metadata lock before TRUNCATE TABLE can proceed. This guarantees that no other transaction is using the table. Incompatible change: Truncate via delete no longer fails if sql_safe_updates is activated (this was a undocumented side effect).
2010-05-25 22:01:38 +02:00
libmysqld/sql_truncate.cc
Extract reload_acl_and_cache() and flush_tables_with_read_lock() into an own implementation file.
2010-08-13 11:51:48 +02:00
libmysqld/sql_reload.cc
Bug#42643: InnoDB does not support replication of TRUNCATE TABLE The problem was that TRUNCATE TABLE didn't take a exclusive lock on a table if it resorted to truncating via delete of all rows in the table. Specifically for InnoDB tables, this could break proper isolation as InnoDB ends up aborting some granted locks when truncating a table. The solution is to take a exclusive metadata lock before TRUNCATE TABLE can proceed. This guarantees that no other transaction is using the table. Incompatible change: Truncate via delete no longer fails if sql_safe_updates is activated (this was a undocumented side effect).
2010-05-25 22:01:38 +02:00
libmysqld/datadict.cc
Merge bk-internal:/home/bk/mysql-4.1/ into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-17 17:07:14 +01:00
libmysqld/sql_derived.cc
Merge
2001-12-21 14:38:06 +01:00
libmysqld/sql_do.cc
dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features charset2html moved from mysys to extra ignore: new files added, garbage removed
2004-11-04 22:29:00 +01:00
libmysqld/sql_error.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/sql_handler.cc
Merge mysql.com:/home/nick/mysql/repository/mysql-4.1 into mysql.com:/home/nick/mysql/mysql-4.1
2002-10-31 07:58:52 +01:00
libmysqld/sql_help.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/sql_insert.cc
libmysqld/sql_lex.cc
libmysqld/sql_list.cc
libmysqld/sql_load.cc
Merge bodhi.local:/opt/local/work/tmp_merge into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
2006-07-08 00:30:07 +02:00
libmysqld/sql_locale.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/sql_manager.cc
libmysqld/sql_map.cc
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-08-13 21:15:14 +02:00
libmysqld/sql_olap.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/sql_parse.cc
Remove some files that should not have been added with BDB upgrade, and update ignore file after move of storage engines to storage/.
2005-09-23 00:53:18 +02:00
libmysqld/sql_partition.cc
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
libmysqld/sql_plugin.cc
dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features charset2html moved from mysys to extra ignore: new files added, garbage removed
2004-11-04 22:29:00 +01:00
libmysqld/sql_prepare.cc
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
2008-02-28 12:21:44 +01:00
libmysqld/sql_profile.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/sql_rename.cc
libmysqld/sql_repl.cc
libmysqld/sql_select.cc
Merge 5.1-main -> 5.1-runtime, added ignore entry for missing symbolic link
2007-01-03 01:49:05 +01:00
libmysqld/sql_servers.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/sql_show.cc
merge with public tree
2003-06-04 23:12:45 +02:00
libmysqld/sql_state.c
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/sql_string.cc
libmysqld/sql_table.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-11-05 16:36:34 +01:00
libmysqld/sql_tablespace.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/sql_test.cc
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 into sanja.is.com.ua:/home/bell/mysql/bk/work-show-5.0
2004-09-10 12:11:33 +02:00
libmysqld/sql_trigger.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/sql_udf.cc
merged
2001-08-10 03:16:15 +02:00
libmysqld/sql_union.cc
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2001-07-01 12:27:09 +02:00
libmysqld/sql_unions.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/sql_update.cc
Merge with 4.1 (Includes merge of arena code in 4.1 and 5.0)
2004-09-06 14:14:10 +02:00
libmysqld/sql_view.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/sql_yacc.cc
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
libmysqld/sql_yacc.cpp
libmysqld/sql_yacc.h
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2001-07-01 12:27:09 +02:00
libmysqld/stacktrace.c
Merge
2003-11-03 21:48:03 +01:00
libmysqld/strfunc.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/table.cc
libmysqld/thr_malloc.cc
WL#5030: Split and remove mysql_priv.h This patch: - Moves all definitions from the mysql_priv.h file into header files for the component where the variable is defined - Creates header files if the component lacks one - Eliminates all include directives from mysql_priv.h - Eliminates all circular include cycles - Rename time.cc to sql_time.cc - Rename mysql_priv.h to sql_priv.h
2010-03-31 16:05:33 +02:00
libmysqld/sql_time.cc
merge
2004-06-21 09:24:40 +02:00
libmysqld/tztime.cc
Various changes to get libmysqld in sync with latest sources.
2001-06-05 00:34:04 +02:00
libmysqld/uniques.cc
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
libmysqld/unireg.cc
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
libmysqltest/*.ds?
libmysqltest/*.vcproj
libmysqltest/mytest.c
Merge
2000-12-03 11:56:27 +01:00
libtool
linked_client_sources
linked_include_sources
pointer casts -> int4store() added error code to master failed connect message
2000-11-28 07:08:46 +01:00
linked_libmysql_r_sources
Merge
2000-12-03 11:56:27 +01:00
linked_libmysql_sources
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
linked_libmysqld_sources
Merge
2001-09-17 04:10:50 +02:00
linked_libmysqldex_sources
Merge
2000-12-03 11:56:27 +01:00
linked_server_sources
Merge work:/home/bk/mysql-4.0 into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-08-28 01:34:29 +02:00
linked_tools_sources
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2001-07-01 12:27:09 +02:00
locked
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-07 15:38:05 +02:00
ltmain.sh
merge 3.23 -> 4.0, 2003/02/06
2004-02-06 13:23:41 +01:00
man/*.1
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
merge/*.ds?
merge/*.vcproj
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-07 15:38:05 +02:00
missing
merge with 3.23.51
2002-05-16 17:20:49 +02:00
mit-pthreads/config.flags
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-08-13 21:15:14 +02:00
mit-pthreads/include/bits
mit-pthreads/include/pthread/machdep.h
mit-pthreads/include/pthread/posix.h
mit-pthreads/include/sys
mit-pthreads/machdep.c
mit-pthreads/pg++
mit-pthreads/pgcc
merge with 3.23.51
2002-05-16 17:20:49 +02:00
mit-pthreads/syscall.S
Merge mysql.com:/home/my/mysql-4.1 into mysql.com:/home/my/mysql-5.0
2005-07-28 16:09:54 +02:00
mkinstalldirs
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
my_print_defaults/*.ds?
my_print_defaults/*.vcproj
myisam/*.ds?
myisam/*.vcproj
merged
2001-10-09 16:01:06 +02:00
myisam/FT1.MYD
myisam/FT1.MYI
sql_base.cc merge+insert (v.3) myrg_info.c merge+insert (v.3) myrg_extra.c merge+insert (v.3) ignore cleanup
2000-12-08 13:53:24 +01:00
myisam/ft_dump
Merge
2000-12-03 11:56:27 +01:00
myisam/ft_eval
myisam/ft_test1
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.cursor
2003-04-28 11:29:22 +02:00
myisam/ftbench/data
myisam/ftbench/t
myisam/ftbench/var/*
Merge
2000-12-03 11:56:27 +01:00
myisam/mi_test1
myisam/mi_test2
myisam/mi_test3
myisam/mi_test_all
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-08-13 21:15:14 +02:00
myisam/myisam.log
merge 3.23 -> 4.0, 2003/02/06
2004-02-06 13:23:41 +01:00
myisam/myisam_ftdump
Merge
2000-12-03 11:56:27 +01:00
myisam/myisamchk
myisam/myisamlog
myisam/myisampack
Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 into gw.udmsearch.izhnet.ru:/usr/home/bar/mysql-4.1
2002-02-22 12:30:28 +01:00
myisam/rt_test
Merge mysql.com:/home/nick/mysql/repository/mysql-4.1 into mysql.com:/home/nick/mysql/mysql-4.1
2002-10-31 07:58:52 +01:00
myisam/rt_test.MYD
myisam/rt_test.MYI
Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 into gw.udmsearch.izhnet.ru:/usr/home/bar/mysql-4.1
2002-02-22 12:30:28 +01:00
myisam/sp_test
merged
2001-07-07 23:17:25 +02:00
myisam/test1.MYD
myisam/test1.MYI
merge with 3.23
2002-08-24 01:10:49 +02:00
myisam/test2.MYD
myisam/test2.MYI
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
myisam_ftdump/*.ds?
myisam_ftdump/*.vcproj
myisamchk/*.ds?
myisamchk/*.vcproj
myisamlog/*.ds?
myisamlog/*.vcproj
myisammrg/*.ds?
myisammrg/*.vcproj
myisampack/*.ds?
myisampack/*.vcproj
merge with 3.23.51
2002-05-16 17:20:49 +02:00
mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
mysql-4.0.2-alpha.tar.gz
Merge with 4.1
2004-12-22 12:54:39 +01:00
mysql-4.1.8-win-src.zip
merge
2004-12-09 02:22:28 +01:00
mysql-5.0.2-alpha.tar.gz
merge with 3.23.51
2002-05-16 17:20:49 +02:00
mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
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
mysql-test/*.ds?
mysql-test/*.vcproj
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
2008-02-28 12:21:44 +01:00
mysql-test/.DS_Store
mysql-test/funcs_1.log
mysql-test/funcs_1.tar
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
mysql-test/gmon.out
mysql-test/install_test_db
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
2008-02-28 12:21:44 +01:00
mysql-test/lib/My/SafeProcess/my_safe_process
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166
2007-02-28 15:04:20 +01:00
mysql-test/lib/init_db.sql
Merge magare.gmz:/home/kgeorge/mysql/work/B36011-take2-5.0-bugteam into magare.gmz:/home/kgeorge/mysql/work/B36011-5.1-bugteam
2008-05-16 18:03:50 +02:00
mysql-test/linux_sys_vars.inc
mysql-test/load_sysvars.inc
Merge shellback.(none):/home/msvensson/mysql/mtr/my41-mtr into shellback.(none):/home/msvensson/mysql/mtr/my50-mtr
2006-09-01 10:25:50 +02:00
mysql-test/mtr
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
mysql-test/mysql-test-run
Bug#40446 - mysql-test-run --gcov is broken Some variable values were missing and perl constructs failed. Initialized the variables and refactored the gcov functions.
2009-02-27 12:20:53 +01:00
mysql-test/mysql-test-gcov.err
mysql-test/mysql-test-gcov.msg
Merge bk-internal:/home/bk/mysql-5.1-maint into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-18 11:34:07 +02:00
mysql-test/mysql-test-run-shell
merged
2005-01-06 18:32:16 +01:00
mysql-test/mysql-test-run.log
Merge with 4.1 to get new thd->mem_root handling
2004-11-08 16:53:32 +01:00
mysql-test/mysql_test_run_new
merge
2004-06-21 09:24:40 +02:00
mysql-test/ndb/ndbcluster
Merge trift2.:/MySQL/M51/mysql-5.1 into trift2.:/MySQL/M51/push-5.1
2007-02-09 12:08:41 +01:00
mysql-test/partitions.log
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
mysql-test/r/*.err
Merge mysql.com:/home/jimw/my/mysql-5.0-clean into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-30 22:27:38 +02:00
mysql-test/r/*.log
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
mysql-test/r/*.out
sql_base.cc merge+insert (v.3) myrg_info.c merge+insert (v.3) myrg_extra.c merge+insert (v.3) ignore cleanup
2000-12-08 13:53:24 +01:00
mysql-test/r/*.reject
merged
2005-01-06 18:32:16 +01:00
mysql-test/r/alter_table.err
mysql-test/r/archive.err
Merge zim.(none):/home/ian/workspace/mysql-5.0 into zim.(none):/home/ian/workspace/mysql-5.1-new Updated bug message in disabled file -Brian
2006-03-28 05:48:44 +02:00
mysql-test/r/backup.log
merged
2005-01-06 18:32:16 +01:00
mysql-test/r/bdb-alter-table-1.err
mysql-test/r/bdb-alter-table-2.err
mysql-test/r/bdb-crash.err
mysql-test/r/bdb-deadlock.err
mysql-test/r/bdb.err
Merge zim.(none):/home/ian/workspace/mysql-5.0 into zim.(none):/home/ian/workspace/mysql-5.1-new Updated bug message in disabled file -Brian
2006-03-28 05:48:44 +02:00
mysql-test/r/bdb.log
merged
2005-01-06 18:32:16 +01:00
mysql-test/r/bdb_cache.err
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 21:05:35 +02:00
mysql-test/r/blackhole.log
merged
2005-01-06 18:32:16 +01:00
mysql-test/r/client_test.err
mysql-test/r/csv.err
mysql-test/r/ctype_ucs.err
mysql-test/r/derived.err
Merge zim.(none):/home/ian/workspace/mysql-5.0 into zim.(none):/home/ian/workspace/mysql-5.1-new Updated bug message in disabled file -Brian
2006-03-28 05:48:44 +02:00
mysql-test/r/events.log
mysql-test/r/events_bugs.log
mysql-test/r/events_logs_tests.log
merged
2005-01-06 18:32:16 +01:00
mysql-test/r/exampledb.err
mysql-test/r/func_encrypt.err
Merge zim.(none):/home/ian/workspace/mysql-5.0 into zim.(none):/home/ian/workspace/mysql-5.1-new Updated bug message in disabled file -Brian
2006-03-28 05:48:44 +02:00
mysql-test/r/im_client_port.log
Merge rurik.mysql.com:/home/igor/mysql-5.0 into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2003-12-08 20:26:34 +01:00
mysql-test/r/index_merge_load.result
merged
2005-01-06 18:32:16 +01:00
mysql-test/r/isam.err
mysql-test/r/lowercase_table2.err
Merge magare.gmz:/home/kgeorge/mysql/work/B36011-take2-5.0-bugteam into magare.gmz:/home/kgeorge/mysql/work/B36011-5.1-bugteam
2008-05-16 18:03:50 +02:00
mysql-test/r/max_allowed_packet_func.result
merged
2005-01-06 18:32:16 +01:00
mysql-test/r/multi_update.err
mysql-test/r/mysql_protocols.err
mysql-test/r/mysqlbinlog.err
mysql-test/r/mysqlbinlog2.err
mysql-test/r/mysqldump.err
mysql-test/r/mysqltest.err
Merge zim.(none):/home/ian/workspace/mysql-5.0 into zim.(none):/home/ian/workspace/mysql-5.1-new Updated bug message in disabled file -Brian
2006-03-28 05:48:44 +02:00
mysql-test/r/mysqltest.log
merged
2005-01-06 18:32:16 +01:00
mysql-test/r/ndb_alter_table.err
mysql-test/r/ndb_autodiscover.err
mysql-test/r/ndb_autodiscover2.err
mysql-test/r/ndb_basic.err
mysql-test/r/ndb_blob.err
mysql-test/r/ndb_cache.err
mysql-test/r/ndb_charset.err
mysql-test/r/ndb_index.err
mysql-test/r/ndb_index_ordered.err
mysql-test/r/ndb_index_unique.err
mysql-test/r/ndb_insert.err
mysql-test/r/ndb_limit.err
mysql-test/r/ndb_lock.err
mysql-test/r/ndb_minmax.err
mysql-test/r/ndb_replace.err
mysql-test/r/ndb_subquery.err
mysql-test/r/ndb_transaction.err
mysql-test/r/ndb_truncate.err
mysql-test/r/ndb_types.err
mysql-test/r/ndb_update.err
mysql-test/r/openssl_1.err
mysql-test/r/ps_1general.err
mysql-test/r/ps_6bdb.err
mysql-test/r/ps_7ndb.err
mysql-test/r/query_cache.err
mysql-test/r/query_cache_merge.err
mysql-test/r/raid.err
mysql-test/r/repair.err
mysql-test/r/replace.err
mysql-test/r/rpl000001.err
merge with 3.23.51
2002-05-16 17:20:49 +02:00
mysql-test/r/rpl000001.eval
Ugly merge! But I am not done yet - there are a number of things I need to fix before I can push
2002-01-20 06:46:25 +01:00
mysql-test/r/rpl000002.eval
mysql-test/r/rpl000014.eval
merged
2005-01-06 18:32:16 +01:00
mysql-test/r/rpl000015.err
Ugly merge! But I am not done yet - there are a number of things I need to fix before I can push
2002-01-20 06:46:25 +01:00
mysql-test/r/rpl000015.eval
mysql-test/r/rpl000016.eval
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2001-07-01 12:27:09 +02:00
mysql-test/r/rpl_log.eval
Ugly merge! But I am not done yet - there are a number of things I need to fix before I can push
2002-01-20 06:46:25 +01:00
mysql-test/r/slave-running.eval
mysql-test/r/slave-stopped.eval
Merge zim.(none):/home/ian/workspace/mysql-5.0 into zim.(none):/home/ian/workspace/mysql-5.1-new Updated bug message in disabled file -Brian
2006-03-28 05:48:44 +02:00
mysql-test/r/symlink.log
mysql-test/r/system_mysql_db.log
Merge shakedown.(none):/home/jpipes/dev/mysql-5.0-maint into shakedown.(none):/home/jpipes/dev/mysql-5.1-new-maint2
2006-11-27 20:46:48 +01:00
mysql-test/r/tmp.result
Merge zim.(none):/home/ian/workspace/mysql-5.0 into zim.(none):/home/ian/workspace/mysql-5.1-new Updated bug message in disabled file -Brian
2006-03-28 05:48:44 +02:00
mysql-test/r/udf.log
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
2008-02-28 12:21:44 +01:00
mysql-test/reg.log
Merge trift2.:/MySQL/M51/mysql-5.1 into trift2.:/MySQL/M51/push-5.1
2007-02-09 12:08:41 +01:00
mysql-test/rpl.log
Merge
2000-12-03 11:56:27 +01:00
mysql-test/share/mysql
Added automatically created SSL certificates from mysql-test/std_data to ignore list.
2003-09-03 10:19:30 +02:00
mysql-test/std_data/*.pem
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
2008-02-28 12:21:44 +01:00
mysql-test/suite/funcs_1.tar.gz
mysql-test/suite/funcs_1.tar.zip
Merge trift2.:/MySQL/M51/mysql-5.1 into trift2.:/MySQL/M51/push-5.1
2007-02-09 12:08:41 +01:00
mysql-test/suite/funcs_1/r/innodb_trig_03e.warnings
mysql-test/suite/funcs_1/r/innodb_views.warnings
mysql-test/suite/funcs_1/r/memory_trig_03e.warnings
mysql-test/suite/funcs_1/r/memory_views.warnings
mysql-test/suite/funcs_1/r/myisam_trig_03e.warnings
mysql-test/suite/funcs_1/r/myisam_views.warnings
mysql-test/suite/funcs_1/r/ndb_trig_03e.warnings
mysql-test/suite/funcs_1/r/ndb_views.warnings
Merge trift2.:/MySQL/M51/mysql-5.1 into trift2.:/MySQL/M51/push-5.1
2007-04-07 20:30:26 +02:00
mysql-test/suite/partitions/r/dif
Merge trift2.:/MySQL/M51/mysql-5.1 into trift2.:/MySQL/M51/push-5.1
2007-02-09 12:08:41 +01:00
mysql-test/suite/partitions/r/diff
Merge trift2.:/MySQL/M51/mysql-5.1 into trift2.:/MySQL/M51/push-5.1
2007-04-07 20:30:26 +02:00
mysql-test/suite/partitions/r/partition.result
Merge trift2.:/MySQL/M51/mysql-5.1 into trift2.:/MySQL/M51/push-5.1
2007-02-09 12:08:41 +01:00
mysql-test/suite/partitions/r/partition_bit_ndb.warnings
mysql-test/suite/partitions/r/partition_special_innodb.warnings
mysql-test/suite/partitions/r/partition_special_myisam.warnings
Merge trift2.:/MySQL/M51/mysql-5.1 into trift2.:/MySQL/M51/push-5.1
2007-04-07 20:30:26 +02:00
mysql-test/suite/partitions/r/partition_t55.out
mysql-test/suite/partitions/r/partition_t55.refout
mysql-test/suite/partitions/t/partition.test
Merge rurik.mysql.com:/home/igor/mysql-5.0 into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2003-12-08 20:26:34 +01:00
mysql-test/t/index_merge.load
Merge shakedown.(none):/home/jpipes/dev/mysql-5.0-maint into shakedown.(none):/home/jpipes/dev/mysql-5.1-new-maint2
2006-11-27 20:46:48 +01:00
mysql-test/t/tmp.test
Merge mysql.com:/home/my/mysql-4.1 into mysql.com:/home/my/mysql-5.0
2005-07-28 16:09:54 +02:00
mysql-test/var
sql_base.cc merge+insert (v.3) myrg_info.c merge+insert (v.3) myrg_extra.c merge+insert (v.3) ignore cleanup
2000-12-08 13:53:24 +01:00
mysql-test/var/*
Merge magare.gmz:/home/kgeorge/mysql/work/B36011-take2-5.0-bugteam into magare.gmz:/home/kgeorge/mysql/work/B36011-5.1-bugteam
2008-05-16 18:03:50 +02:00
mysql-test/windows_sys_vars.inc
merged
2001-08-10 03:16:15 +02:00
mysql.kdevprj
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
mysql.proj
WL#5030: Split and remove mysql_priv.h This patch: - Moves all definitions from the mysql_priv.h file into header files for the component where the variable is defined - Creates header files if the component lacks one - Eliminates all include directives from mysql_priv.h - Eliminates all circular include cycles - Rename time.cc to sql_time.cc - Rename mysql_priv.h to sql_priv.h
2010-03-31 16:05:33 +02:00
sql_priv.h
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
mysqlbinlog/*.ds?
mysqlbinlog/*.vcproj
mysqlcheck/*.ds?
mysqlcheck/*.vcproj
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
mysqld.S
mysqld.sym
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
mysqldemb/*.ds?
mysqldemb/*.vcproj
mysqlserver/*.ds?
mysqlserver/*.vcproj
Merge work:/home/bk/mysql-4.0 into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-11-04 00:55:39 +01:00
mysys/#mf_iocache.c#
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
mysys/*.ds?
mysys/*.vcproj
update to ease the patch process
2006-07-13 16:24:55 +02:00
mysys/.deps/array.Po
mysys/.deps/base64.Po
mysys/.deps/charset-def.Po
mysys/.deps/charset.Po
mysys/.deps/checksum.Po
mysys/.deps/default.Po
mysys/.deps/default_modify.Po
mysys/.deps/errors.Po
mysys/.deps/hash.Po
mysys/.deps/list.Po
mysys/.deps/md5.Po
mysys/.deps/mf_brkhant.Po
mysys/.deps/mf_cache.Po
mysys/.deps/mf_dirname.Po
mysys/.deps/mf_fn_ext.Po
mysys/.deps/mf_format.Po
mysys/.deps/mf_getdate.Po
mysys/.deps/mf_iocache.Po
mysys/.deps/mf_iocache2.Po
mysys/.deps/mf_keycache.Po
mysys/.deps/mf_keycaches.Po
mysys/.deps/mf_loadpath.Po
mysys/.deps/mf_pack.Po
mysys/.deps/mf_path.Po
mysys/.deps/mf_qsort.Po
mysys/.deps/mf_qsort2.Po
mysys/.deps/mf_radix.Po
mysys/.deps/mf_same.Po
mysys/.deps/mf_sort.Po
mysys/.deps/mf_strip.Po
mysys/.deps/mf_tempdir.Po
mysys/.deps/mf_tempfile.Po
mysys/.deps/mf_unixpath.Po
mysys/.deps/mf_wcomp.Po
mysys/.deps/mf_wfile.Po
mysys/.deps/mulalloc.Po
mysys/.deps/my_access.Po
mysys/.deps/my_aes.Po
mysys/.deps/my_alarm.Po
mysys/.deps/my_alloc.Po
mysys/.deps/my_append.Po
mysys/.deps/my_atomic.Po
mysys/.deps/my_bit.Po
mysys/.deps/my_bitmap.Po
mysys/.deps/my_chsize.Po
mysys/.deps/my_clock.Po
mysys/.deps/my_compress.Po
mysys/.deps/my_copy.Po
mysys/.deps/my_crc32.Po
mysys/.deps/my_create.Po
mysys/.deps/my_delete.Po
mysys/.deps/my_div.Po
mysys/.deps/my_dup.Po
mysys/.deps/my_error.Po
mysys/.deps/my_file.Po
mysys/.deps/my_fopen.Po
mysys/.deps/my_fstream.Po
mysys/.deps/my_gethostbyname.Po
mysys/.deps/my_gethwaddr.Po
mysys/.deps/my_getncpus.Po
mysys/.deps/my_getopt.Po
mysys/.deps/my_getsystime.Po
mysys/.deps/my_getwd.Po
mysys/.deps/my_handler.Po
mysys/.deps/my_init.Po
mysys/.deps/my_largepage.Po
mysys/.deps/my_lib.Po
mysys/.deps/my_libwrap.Po
mysys/.deps/my_lock.Po
mysys/.deps/my_lockmem.Po
mysys/.deps/my_lread.Po
mysys/.deps/my_lwrite.Po
mysys/.deps/my_malloc.Po
mysys/.deps/my_memmem.Po
mysys/.deps/my_messnc.Po
mysys/.deps/my_mkdir.Po
mysys/.deps/my_mmap.Po
mysys/.deps/my_net.Po
mysys/.deps/my_netware.Po
mysys/.deps/my_new.Po
mysys/.deps/my_once.Po
mysys/.deps/my_open.Po
mysys/.deps/my_port.Po
mysys/.deps/my_pread.Po
mysys/.deps/my_pthread.Po
mysys/.deps/my_quick.Po
mysys/.deps/my_read.Po
mysys/.deps/my_realloc.Po
mysys/.deps/my_redel.Po
mysys/.deps/my_rename.Po
mysys/.deps/my_seek.Po
mysys/.deps/my_semaphore.Po
mysys/.deps/my_sleep.Po
mysys/.deps/my_static.Po
mysys/.deps/my_symlink.Po
mysys/.deps/my_symlink2.Po
mysys/.deps/my_sync.Po
mysys/.deps/my_thr_init.Po
mysys/.deps/my_vle.Po
mysys/.deps/my_windac.Po
mysys/.deps/my_write.Po
mysys/.deps/ptr_cmp.Po
mysys/.deps/queues.Po
mysys/.deps/rijndael.Po
mysys/.deps/safemalloc.Po
mysys/.deps/sha1.Po
mysys/.deps/string.Po
mysys/.deps/thr_alarm.Po
mysys/.deps/thr_lock.Po
mysys/.deps/thr_mutex.Po
mysys/.deps/thr_rwlock.Po
mysys/.deps/tree.Po
mysys/.deps/trie.Po
mysys/.deps/typelib.Po
Merge with 4.0.3 Some simple optimzations, more comments and indentation changes. Add ` around database in 'use database' in binary log. Moved max_error_count and max_warning_count to variables struct. Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls. Changed string functions to use character set of first string argument as default return characterset (Each string function can change the above assumption if needed)
2002-08-30 11:40:40 +02:00
mysys/charset2html
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-08-13 21:15:14 +02:00
mysys/getopt.c
mysys/getopt1.c
manual merge
2003-07-31 15:11:52 +02:00
mysys/main.cc
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
mysys/my_new.cpp
mysys/raid.cpp
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-08-13 21:15:14 +02:00
mysys/ste5KbMa
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new into mysql.com:/home/my/mysql-5.1
2006-06-04 20:05:22 +02:00
mysys/test_atomic
mysys/test_bitmap
Merge
2000-12-03 11:56:27 +01:00
mysys/test_charset
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
mysys/test_dir
Merge 4.1 -> 5.0.
2004-04-07 19:07:44 +02:00
mysys/test_gethwaddr
Merge work:/home/bk/mysql-4.0 into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-11-04 00:55:39 +01:00
mysys/test_io_cache
Merge
2000-12-03 11:56:27 +01:00
mysys/test_thr_alarm
mysys/test_thr_lock
merge with 3.23.51
2002-05-16 17:20:49 +02:00
mysys/test_vsnprintf
Merge
2000-12-03 11:56:27 +01:00
mysys/testhash
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
ndb/bin/DbAsyncGenerator
ndb/bin/DbCreate
ndb/bin/acid
ndb/bin/async-lmc-bench-l-p10.sh
ndb/bin/async-lmc-bench-l.sh
ndb/bin/async-lmc-bench-p10.sh
ndb/bin/async-lmc-bench.sh
ndb/bin/atrt
ndb/bin/atrt-analyze-result.sh
ndb/bin/atrt-clear-result.sh
ndb/bin/atrt-gather-result.sh
ndb/bin/atrt-setup.sh
ndb/bin/bankCreator
ndb/bin/bankMakeGL
ndb/bin/bankSumAccounts
ndb/bin/bankTimer
ndb/bin/bankTransactionMaker
ndb/bin/bankValidateAllGLs
ndb/bin/basicTransporterTest
ndb/bin/benchronja
ndb/bin/bulk_copy
ndb/bin/copy_tab
ndb/bin/create_all_tabs
ndb/bin/create_index
ndb/bin/create_tab
ndb/bin/delete_all
ndb/bin/desc
ndb/bin/drop_all_tabs
ndb/bin/drop_index
ndb/bin/drop_tab
ndb/bin/flexAsynch
ndb/bin/flexBench
ndb/bin/flexHammer
ndb/bin/flexScan
ndb/bin/flexTT
ndb/bin/hugoCalculator
ndb/bin/hugoFill
ndb/bin/hugoLoad
ndb/bin/hugoLockRecords
ndb/bin/hugoPkDelete
ndb/bin/hugoPkRead
ndb/bin/hugoPkReadRecord
ndb/bin/hugoPkUpdate
ndb/bin/hugoScanRead
ndb/bin/hugoScanUpdate
ndb/bin/index
ndb/bin/index2
ndb/bin/initronja
ndb/bin/interpreterInTup
ndb/bin/list_tables
ndb/bin/make-config.sh
ndb/bin/mgmtclient
ndb/bin/mgmtsrvr
ndb/bin/mkconfig
ndb/bin/ndb
ndb/bin/ndb_cpcc
ndb/bin/ndb_cpcd
ndb/bin/ndb_rep
ndb/bin/ndbsql
ndb/bin/newton_basic
ndb/bin/newton_br
ndb/bin/newton_pb
ndb/bin/newton_perf
ndb/bin/perfTransporterTest
ndb/bin/printConfig
ndb/bin/printSchemafile
ndb/bin/printSysfile
ndb/bin/redoLogFileReader
ndb/bin/restart
ndb/bin/restarter
ndb/bin/restarter2
ndb/bin/restarts
ndb/bin/restore
ndb/bin/select_all
ndb/bin/select_count
ndb/bin/telco
ndb/bin/testBackup
ndb/bin/testBank
ndb/bin/testBasic
ndb/bin/testBasicAsynch
ndb/bin/testCopy
ndb/bin/testDataBuffers
ndb/bin/testDict
ndb/bin/testGrep
ndb/bin/testGrepVerify
ndb/bin/testIndex
ndb/bin/testInterpreter
ndb/bin/testKernelDataBuffer
ndb/bin/testLongSig
ndb/bin/testMgm
ndb/bin/testMgmapi
ndb/bin/testNdbApi
ndb/bin/testNodeRestart
ndb/bin/testOIBasic
ndb/bin/testOdbcDriver
ndb/bin/testOperations
ndb/bin/testRestartGci
ndb/bin/testScan
ndb/bin/testScanInterpreter
ndb/bin/testSimplePropertiesSection
ndb/bin/testSystemRestart
ndb/bin/testTimeout
ndb/bin/testTransactions
ndb/bin/test_cpcd
ndb/bin/test_event
ndb/bin/verify_index
ndb/bin/waiter
Merging 4.1 to 5.0.
2004-05-26 17:04:45 +02:00
ndb/config/autom4te.cache/*
ndb/config/config.mk
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
ndb/examples/ndbapi_example1/ndbapi_example1
ndb/examples/ndbapi_example2/ndbapi_example2
ndb/examples/ndbapi_example3/ndbapi_example3
ndb/examples/ndbapi_example5/ndbapi_example5
ndb/examples/select_all/select_all
Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY
2005-01-03 22:04:52 +01:00
ndb/include/ndb_global.h
Merge with 4.1
2005-01-15 13:09:45 +01:00
ndb/include/ndb_types.h
Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY
2005-01-03 22:04:52 +01:00
ndb/include/ndb_version.h
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
ndb/lib/libMGM_API.so
ndb/lib/libNDB_API.so
ndb/lib/libNDB_ODBC.so
ndb/lib/libNEWTON_API.so
ndb/lib/libNEWTON_BASICTEST_COMMON.so
ndb/lib/libREP_API.so
ndb/lib/libndbclient.so
ndb/lib/libndbclient_extra.so
Merge mysql.com:/home/jonas/src/mysql-4.1 into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 11:48:46 +01:00
ndb/src/common/debugger/libtrace.dsp
ndb/src/common/debugger/signaldata/libsignaldataprint.dsp
ndb/src/common/logger/liblogger.dsp
ndb/src/common/mgmcommon/libmgmsrvcommon.dsp
Merging 4.1 to 5.0.
2004-05-26 17:04:45 +02:00
ndb/src/common/mgmcommon/printConfig/*.d
Merge mysql.com:/home/jonas/src/mysql-4.1 into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 11:48:46 +01:00
ndb/src/common/portlib/libportlib.dsp
ndb/src/common/transporter/libtransporter.dsp
ndb/src/common/util/libgeneral.dsp
Merge bodhi.local:/opt/local/work/tmp_merge into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-12 19:06:51 +02:00
ndb/src/common/util/testBitmask.cpp
merged
2004-08-20 00:52:43 +02:00
ndb/src/cw/cpcd/ndb_cpcd
Merge mysql.com:/home/my/mysql-4.1 into mysql.com:/home/my/mysql-5.0
2005-07-28 16:09:54 +02:00
ndb/src/dummy.cpp
Merge mysql.com:/home/jonas/src/mysql-4.1 into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 11:48:46 +01:00
ndb/src/kernel/blocks/backup/libbackup.dsp
merged
2004-08-20 00:52:43 +02:00
ndb/src/kernel/blocks/backup/restore/ndb_restore
Merge mysql.com:/home/jonas/src/mysql-4.1 into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 11:48:46 +01:00
ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp
ndb/src/kernel/blocks/dbacc/libdbacc.dsp
ndb/src/kernel/blocks/dbdict/libdbdict.dsp
ndb/src/kernel/blocks/dbdih/libdbdih.dsp
ndb/src/kernel/blocks/dblqh/libdblqh.dsp
ndb/src/kernel/blocks/dbtc/libdbtc.dsp
ndb/src/kernel/blocks/dbtup/libdbtup.dsp
ndb/src/kernel/blocks/dbtux/libdbtux.dsp
ndb/src/kernel/blocks/dbutil/libdbutil.dsp
ndb/src/kernel/blocks/grep/libgrep.dsp
ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp
ndb/src/kernel/blocks/ndbfs/libndbfs.dsp
ndb/src/kernel/blocks/qmgr/libqmgr.dsp
ndb/src/kernel/blocks/suma/libsuma.dsp
ndb/src/kernel/blocks/trix/libtrix.dsp
ndb/src/kernel/error/liberror.dsp
merged
2004-08-20 00:52:43 +02:00
ndb/src/kernel/ndbd
Merge mysql.com:/home/jonas/src/mysql-4.1 into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 11:48:46 +01:00
ndb/src/kernel/ndbd.dsp
ndb/src/kernel/vm/libkernel.dsp
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
2007-01-19 23:30:41 +01:00
ndb/src/libndb.ver
Merge mysql.com:/home/jonas/src/mysql-4.1 into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 11:48:46 +01:00
ndb/src/libndbclient.dsp
ndb/src/mgmapi/libmgmapi.dsp
ndb/src/mgmclient/libndbmgmclient.dsp
merged
2004-08-20 00:52:43 +02:00
ndb/src/mgmclient/ndb_mgm
Merge mysql.com:/home/jonas/src/mysql-4.1 into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 11:48:46 +01:00
ndb/src/mgmclient/ndb_mgm.dsp
Merging 4.1 to 5.0.
2004-05-26 17:04:45 +02:00
ndb/src/mgmclient/test_cpcd/*.d
merged
2004-08-20 00:52:43 +02:00
ndb/src/mgmsrv/ndb_mgmd
Merge mysql.com:/home/jonas/src/mysql-4.1 into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 11:48:46 +01:00
ndb/src/mgmsrv/ndb_mgmd.dsp
ndb/src/ndbapi/libndbapi.dsp
merged
2004-08-20 00:52:43 +02:00
ndb/test/ndbapi/bank/bankCreator
ndb/test/ndbapi/bank/bankMakeGL
ndb/test/ndbapi/bank/bankSumAccounts
ndb/test/ndbapi/bank/bankTimer
ndb/test/ndbapi/bank/bankTransactionMaker
ndb/test/ndbapi/bank/bankValidateAllGLs
ndb/test/ndbapi/bank/testBank
ndb/test/ndbapi/create_all_tabs
ndb/test/ndbapi/create_tab
ndb/test/ndbapi/drop_all_tabs
ndb/test/ndbapi/flexAsynch
ndb/test/ndbapi/flexBench
Merge mysql.com:/home/jonas/src/mysql-4.1 into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 11:48:46 +01:00
ndb/test/ndbapi/flexBench.dsp
merged
2004-08-20 00:52:43 +02:00
ndb/test/ndbapi/flexHammer
ndb/test/ndbapi/flexTT
ndb/test/ndbapi/testBackup
ndb/test/ndbapi/testBasic
Merge mysql.com:/home/jonas/src/mysql-4.1 into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 11:48:46 +01:00
ndb/test/ndbapi/testBasic.dsp
merged
2004-08-20 00:52:43 +02:00
ndb/test/ndbapi/testBasicAsynch
ndb/test/ndbapi/testBlobs
Merge mysql.com:/home/jonas/src/mysql-4.1 into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 11:48:46 +01:00
ndb/test/ndbapi/testBlobs.dsp
merged
2004-08-20 00:52:43 +02:00
ndb/test/ndbapi/testDataBuffers
ndb/test/ndbapi/testDeadlock
ndb/test/ndbapi/testDict
ndb/test/ndbapi/testIndex
ndb/test/ndbapi/testMgm
ndb/test/ndbapi/testNdbApi
ndb/test/ndbapi/testNodeRestart
ndb/test/ndbapi/testOIBasic
ndb/test/ndbapi/testOperations
ndb/test/ndbapi/testRestartGci
Merge eel.(none):/home/jonas/src/mysql-4.1 into eel.(none):/home/jonas/src/mysql-5.0
2005-09-09 12:54:03 +02:00
ndb/test/ndbapi/testSRBank
merged
2004-08-20 00:52:43 +02:00
ndb/test/ndbapi/testScan
Merge mysql.com:/home/jonas/src/mysql-4.1 into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 11:48:46 +01:00
ndb/test/ndbapi/testScan.dsp
merged
2004-08-20 00:52:43 +02:00
ndb/test/ndbapi/testScanInterpreter
ndb/test/ndbapi/testScanPerf
ndb/test/ndbapi/testSystemRestart
ndb/test/ndbapi/testTimeout
ndb/test/ndbapi/testTransactions
ndb/test/ndbapi/test_event
ndb/test/run-test/atrt
Merge mysql.com:/home/jonas/src/mysql-4.1 into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 11:48:46 +01:00
ndb/test/src/libNDBT.dsp
merged
2004-08-20 00:52:43 +02:00
ndb/test/tools/copy_tab
ndb/test/tools/create_index
ndb/test/tools/hugoCalculator
ndb/test/tools/hugoFill
ndb/test/tools/hugoLoad
ndb/test/tools/hugoLockRecords
ndb/test/tools/hugoPkDelete
ndb/test/tools/hugoPkRead
ndb/test/tools/hugoPkReadRecord
ndb/test/tools/hugoPkUpdate
ndb/test/tools/hugoScanRead
ndb/test/tools/hugoScanUpdate
ndb/test/tools/ndb_cpcc
ndb/test/tools/restart
ndb/test/tools/verify_index
Merge mysql.com:/home/my/mysql-4.1 into mysql.com:/home/my/mysql-5.0
2005-07-28 16:09:54 +02:00
ndb/tools/ndb_config
merged
2004-08-20 00:52:43 +02:00
ndb/tools/ndb_delete_all
Merge mysql.com:/home/jonas/src/mysql-4.1 into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 11:48:46 +01:00
ndb/tools/ndb_delete_all.dsp
merged
2004-08-20 00:52:43 +02:00
ndb/tools/ndb_desc
Merge mysql.com:/home/jonas/src/mysql-4.1 into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 11:48:46 +01:00
ndb/tools/ndb_desc.dsp
merged
2004-08-20 00:52:43 +02:00
ndb/tools/ndb_drop_index
Merge mysql.com:/home/jonas/src/mysql-4.1 into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 11:48:46 +01:00
ndb/tools/ndb_drop_index.dsp
merged
2004-08-20 00:52:43 +02:00
ndb/tools/ndb_drop_table
Merge mysql.com:/home/jonas/src/mysql-4.1 into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 11:48:46 +01:00
ndb/tools/ndb_drop_table.dsp
merged
2004-11-20 18:36:41 +01:00
ndb/tools/ndb_restore
merged
2004-08-20 00:52:43 +02:00
ndb/tools/ndb_select_all
Merge mysql.com:/home/jonas/src/mysql-4.1 into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 11:48:46 +01:00
ndb/tools/ndb_select_all.dsp
merged
2004-08-20 00:52:43 +02:00
ndb/tools/ndb_select_count
Merge mysql.com:/home/jonas/src/mysql-4.1 into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 11:48:46 +01:00
ndb/tools/ndb_select_count.dsp
merged
2004-08-20 00:52:43 +02:00
ndb/tools/ndb_show_tables
Merge mysql.com:/home/jonas/src/mysql-4.1 into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 11:48:46 +01:00
ndb/tools/ndb_show_tables.dsp
Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)
2004-11-12 03:58:57 +01:00
ndb/tools/ndb_test_platform
merged
2004-08-20 00:52:43 +02:00
ndb/tools/ndb_waiter
Merge mysql.com:/home/jonas/src/mysql-4.1 into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 11:48:46 +01:00
ndb/tools/ndb_waiter.dsp
merged
2004-11-20 18:36:41 +01:00
ndbcluster-1186
ndbcluster-1186/SCCS
ndbcluster-1186/config.ini
ndbcluster-1186/ndb_1.pid
ndbcluster-1186/ndb_1_out.log
ndbcluster-1186/ndb_1_signal.log
ndbcluster-1186/ndb_2.pid
ndbcluster-1186/ndb_2_out.log
ndbcluster-1186/ndb_2_signal.log
ndbcluster-1186/ndb_3.pid
ndbcluster-1186/ndb_3_cluster.log
ndbcluster-1186/ndb_3_out.log
ndbcluster-1186/ndbcluster.pid
update to ease the patch process
2006-07-13 16:24:55 +02:00
netware/.deps/libmysqlmain.Po
netware/.deps/my_manage.Po
netware/.deps/mysql_install_db.Po
netware/.deps/mysql_test_run.Po
netware/.deps/mysqld_safe.Po
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-19 11:15:59 +01:00
netware/init_db.sql
Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware_libmysql_imp into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-28 10:39:55 +02:00
netware/libmysql.imp
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-19 11:15:59 +01:00
netware/test_db.sql
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
pack_isam/*.ds?
perror/*.ds?
perror/*.vcproj
update to ease the patch process
2006-07-13 16:24:55 +02:00
plugin/fulltext/.deps/mypluglib_la-plugin_example.Plo
plugin/fulltext/.libs/mypluglib.lai
plugin/fulltext/.libs/mypluglib.so.0
plugin/fulltext/.libs/mypluglib.so.0.0.0
pstack/.deps/bucomm.Po
pstack/.deps/debug.Po
pstack/.deps/filemode.Po
pstack/.deps/ieee.Po
pstack/.deps/linuxthreads.Po
pstack/.deps/pstack.Po
pstack/.deps/rddbg.Po
pstack/.deps/stabs.Po
Merge with 3.23
2002-12-05 02:52:53 +01:00
pull.log
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
regex/*.ds?
regex/*.vcproj
update to ease the patch process
2006-07-13 16:24:55 +02:00
regex/.deps/debug.Po
regex/.deps/main.Po
regex/.deps/regcomp.Po
regex/.deps/regerror.Po
regex/.deps/regexec.Po
regex/.deps/regfree.Po
regex/.deps/reginit.Po
regex/.deps/split.Po
Merge
2000-12-03 11:56:27 +01:00
regex/re
repl-tests/test-repl-ts/repl-timestamp.master.reject
repl-tests/test-repl/foo-dump-slave.master.
repl-tests/test-repl/sum-wlen-slave.master.
repl-tests/test-repl/sum-wlen-slave.master.re
repl-tests/test-repl/sum-wlen-slave.master.reje
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
replace/*.ds?
replace/*.vcproj
Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-18 13:22:32 +02:00
scripts/comp_sql
Merge mysql.com:/home/nick/mysql/repository/mysql-4.1 into mysql.com:/home/nick/mysql/mysql-4.1
2002-10-31 07:58:52 +01:00
scripts/fill_func_tables
scripts/fill_func_tables.sql
Merge with 4.0.11
2003-02-26 00:03:47 +01:00
scripts/fill_help_tables
scripts/fill_help_tables.sql
Merge
2000-12-03 11:56:27 +01:00
scripts/make_binary_distribution
merge with 4.0 to get fix for SET enum_system_variable=NULL
2003-10-14 15:34:09 +02:00
scripts/make_sharedlib_distribution
merge with 4.0
2004-02-22 08:50:59 +01:00
scripts/make_win_binary_distribution
Merge work:/home/bk/mysql-4.1 into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2003-03-01 14:18:55 +01:00
scripts/make_win_src_distribution
Merge hh-nb.hhunger:/work/merge/mysql-5.0-32496 into hh-nb.hhunger:/work/merge/mysql-5.1-32496
2007-11-26 22:19:39 +01:00
scripts/make_win_src_distribution_old
Merge
2000-12-03 11:56:27 +01:00
scripts/msql2mysql
scripts/mysql_config
scripts/mysql_convert_table_format
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 into mysql.r18.ru:/usr/home/ram/work/4.1.latest
2003-05-30 20:09:34 +02:00
scripts/mysql_create_system_tables
merge
2001-10-08 04:36:35 +02:00
scripts/mysql_explain_log
Merge
2000-12-03 11:56:27 +01:00
scripts/mysql_find_rows
Merge
2001-12-21 14:38:06 +01:00
scripts/mysql_fix_extensions
Merge
2000-12-03 11:56:27 +01:00
scripts/mysql_fix_privilege_tables
Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166 into pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
2007-02-26 14:25:59 +01:00
scripts/mysql_fix_privilege_tables.sql
Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-18 13:22:32 +02:00
scripts/mysql_fix_privilege_tables_sql.c
Merge
2000-12-03 11:56:27 +01:00
scripts/mysql_install_db
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-08-13 21:15:14 +02:00
scripts/mysql_secure_installation
Merge
2000-12-03 11:56:27 +01:00
scripts/mysql_setpermission
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-08-13 21:15:14 +02:00
scripts/mysql_tableinfo
Merge mysql.com:/home/jimw/my/mysql-5.0-clean into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-17 19:59:47 +01:00
scripts/mysql_upgrade
Merge bodhi.local:/opt/local/work/tmp_merge into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
2006-07-13 20:09:36 +02:00
scripts/mysql_upgrade_shell
Merge
2000-12-03 11:56:27 +01:00
scripts/mysql_zap
scripts/mysqlaccess
scripts/mysqlbug
sql_base.cc merge+insert (v.3) myrg_info.c merge+insert (v.3) myrg_extra.c merge+insert (v.3) ignore cleanup
2000-12-08 13:53:24 +01:00
scripts/mysqld_multi
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2001-07-01 12:27:09 +02:00
scripts/mysqld_safe
Merge
2000-12-03 11:56:27 +01:00
scripts/mysqldumpslow
scripts/mysqlhotcopy
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-07 15:38:05 +02:00
scripts/mysqlhotcopy.sh.rej
Merge
2000-12-03 11:56:27 +01:00
scripts/safe_mysqld
Merge with 4.0.13
2003-05-19 15:35:49 +02:00
select_test
update to ease the patch process
2006-07-13 16:24:55 +02:00
server-tools/instance-manager/.deps/buffer.Po
server-tools/instance-manager/.deps/command.Po
server-tools/instance-manager/.deps/commands.Po
server-tools/instance-manager/.deps/guardian.Po
server-tools/instance-manager/.deps/instance.Po
server-tools/instance-manager/.deps/instance_map.Po
server-tools/instance-manager/.deps/instance_options.Po
server-tools/instance-manager/.deps/liboptions_la-options.Plo
server-tools/instance-manager/.deps/liboptions_la-priv.Plo
server-tools/instance-manager/.deps/listener.Po
server-tools/instance-manager/.deps/log.Po
server-tools/instance-manager/.deps/manager.Po
server-tools/instance-manager/.deps/messages.Po
server-tools/instance-manager/.deps/mysql_connection.Po
server-tools/instance-manager/.deps/mysqlmanager.Po
server-tools/instance-manager/.deps/net_serv.Po
server-tools/instance-manager/.deps/parse.Po
server-tools/instance-manager/.deps/parse_output.Po
server-tools/instance-manager/.deps/protocol.Po
server-tools/instance-manager/.deps/thread_registry.Po
server-tools/instance-manager/.deps/user_management_commands.Po
server-tools/instance-manager/.deps/user_map.Po
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
server-tools/instance-manager/buffer.cpp
merge
2004-12-09 02:22:28 +01:00
server-tools/instance-manager/client.c
server-tools/instance-manager/client_settings.h
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
server-tools/instance-manager/command.cpp
server-tools/instance-manager/commands.cpp
merge
2004-12-09 02:22:28 +01:00
server-tools/instance-manager/errmsg.c
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
server-tools/instance-manager/guardian.cpp
server-tools/instance-manager/instance.cpp
server-tools/instance-manager/instance_map.cpp
server-tools/instance-manager/instance_options.cpp
server-tools/instance-manager/listener.cpp
server-tools/instance-manager/log.cpp
server-tools/instance-manager/manager.cpp
server-tools/instance-manager/messages.cpp
server-tools/instance-manager/mysql_connection.cpp
Merge bk-internal:/home/bk/mysql-5.0/ into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-10-18 14:09:41 +02:00
server-tools/instance-manager/mysqlmanager
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
server-tools/instance-manager/mysqlmanager.cpp
Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0 into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
2006-07-03 17:35:58 +02:00
server-tools/instance-manager/net_serv.cc
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
server-tools/instance-manager/options.cpp
server-tools/instance-manager/parse.cpp
server-tools/instance-manager/parse_output.cpp
server-tools/instance-manager/priv.cpp
server-tools/instance-manager/protocol.cpp
merge
2004-12-09 02:22:28 +01:00
server-tools/instance-manager/thr_alarm.c
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
server-tools/instance-manager/thread_registry.cpp
server-tools/instance-manager/user_map.cpp
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686
Merged with 3.23, needs further fix-up
2001-05-10 23:06:35 +02:00
sql-bench/bench-count-distinct
Merge
2000-12-03 11:56:27 +01:00
sql-bench/bench-init.pl
sql-bench/compare-results
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
2001-06-11 14:07:43 +02:00
sql-bench/compare-results-all
Merge
2000-12-03 11:56:27 +01:00
sql-bench/copy-db
sql-bench/crash-me
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
2001-06-11 14:07:43 +02:00
sql-bench/gif/*
sql-bench/graph-compare-results
merge with 3.23
2002-08-24 01:10:49 +02:00
sql-bench/innotest1
sql-bench/innotest1a
sql-bench/innotest1b
sql-bench/innotest2
sql-bench/innotest2a
sql-bench/innotest2b
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
sql-bench/output/*
Merge
2000-12-03 11:56:27 +01:00
sql-bench/run-all-tests
sql-bench/server-cfg
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
2001-06-11 14:07:43 +02:00
sql-bench/template.html
Merge
2000-12-07 16:10:30 +01:00
sql-bench/test-ATIS
Merge
2000-12-03 11:56:27 +01:00
sql-bench/test-alter-table
sql-bench/test-big-tables
sql-bench/test-connect
sql-bench/test-create
sql-bench/test-insert
sql-bench/test-select
Merge
2001-12-21 14:38:06 +01:00
sql-bench/test-transactions
Merge
2000-12-03 11:56:27 +01:00
sql-bench/test-wisconsin
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
sql/*.cpp
sql/*.ds?
sql/*.vcproj
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
sql/.deps/client.Po
sql/.deps/derror.Po
sql/.deps/des_key_file.Po
sql/.deps/discover.Po
sql/.deps/event_data_objects.Po
sql/.deps/event_db_repository.Po
sql/.deps/event_queue.Po
sql/.deps/event_scheduler.Po
sql/.deps/events.Po
sql/.deps/field.Po
sql/.deps/field_conv.Po
sql/.deps/filesort.Po
sql/.deps/gen_lex_hash.Po
sql/.deps/gstream.Po
sql/.deps/ha_berkeley.Po
sql/.deps/ha_federated.Po
sql/.deps/ha_heap.Po
sql/.deps/ha_innodb.Po
sql/.deps/ha_myisam.Po
sql/.deps/ha_myisammrg.Po
sql/.deps/ha_ndbcluster.Po
sql/.deps/ha_ndbcluster_binlog.Po
sql/.deps/ha_partition.Po
sql/.deps/handler.Po
sql/.deps/hash_filo.Po
sql/.deps/hostname.Po
sql/.deps/init.Po
sql/.deps/item.Po
sql/.deps/item_buff.Po
sql/.deps/item_cmpfunc.Po
sql/.deps/item_create.Po
sql/.deps/item_func.Po
sql/.deps/item_geofunc.Po
sql/.deps/item_row.Po
sql/.deps/item_strfunc.Po
sql/.deps/item_subselect.Po
sql/.deps/item_sum.Po
sql/.deps/item_timefunc.Po
sql/.deps/item_uniq.Po
sql/.deps/item_xmlfunc.Po
sql/.deps/key.Po
sql/.deps/lock.Po
sql/.deps/log.Po
sql/.deps/log_event.Po
sql/.deps/mf_iocache.Po
sql/.deps/mini_client_errors.Po
sql/.deps/my_decimal.Po
sql/.deps/my_lock.Po
sql/.deps/my_time.Po
sql/.deps/my_user.Po
sql/.deps/mysql_tzinfo_to_sql.Po
sql/.deps/mysqld.Po
sql/.deps/net_serv.Po
sql/.deps/opt_range.Po
sql/.deps/opt_sum.Po
sql/.deps/pack.Po
sql/.deps/parse_file.Po
sql/.deps/partition_info.Po
sql/.deps/password.Po
sql/.deps/procedure.Po
sql/.deps/protocol.Po
sql/.deps/records.Po
sql/.deps/repl_failsafe.Po
sql/.deps/rpl_filter.Po
sql/.deps/rpl_injector.Po
sql/.deps/rpl_tblmap.Po
sql/.deps/set_var.Po
sql/.deps/slave.Po
sql/.deps/sp.Po
sql/.deps/sp_cache.Po
sql/.deps/sp_head.Po
sql/.deps/sp_pcontext.Po
sql/.deps/sp_rcontext.Po
sql/.deps/spatial.Po
sql/.deps/sql_acl.Po
sql/.deps/sql_analyse.Po
sql/.deps/sql_base.Po
sql/.deps/sql_binlog.Po
sql/.deps/sql_builtin.Po
sql/.deps/sql_cache.Po
sql/.deps/sql_class.Po
sql/.deps/sql_client.Po
sql/.deps/sql_crypt.Po
sql/.deps/sql_cursor.Po
sql/.deps/sql_db.Po
sql/.deps/sql_delete.Po
Bug#42643: InnoDB does not support replication of TRUNCATE TABLE The problem was that TRUNCATE TABLE didn't take a exclusive lock on a table if it resorted to truncating via delete of all rows in the table. Specifically for InnoDB tables, this could break proper isolation as InnoDB ends up aborting some granted locks when truncating a table. The solution is to take a exclusive metadata lock before TRUNCATE TABLE can proceed. This guarantees that no other transaction is using the table. Incompatible change: Truncate via delete no longer fails if sql_safe_updates is activated (this was a undocumented side effect).
2010-05-25 22:01:38 +02:00
sql/.deps/sql_truncate.Po
Extract reload_acl_and_cache() and flush_tables_with_read_lock() into an own implementation file.
2010-08-13 11:51:48 +02:00
sql/.deps/sql_reload.Po
Bug#42643: InnoDB does not support replication of TRUNCATE TABLE The problem was that TRUNCATE TABLE didn't take a exclusive lock on a table if it resorted to truncating via delete of all rows in the table. Specifically for InnoDB tables, this could break proper isolation as InnoDB ends up aborting some granted locks when truncating a table. The solution is to take a exclusive metadata lock before TRUNCATE TABLE can proceed. This guarantees that no other transaction is using the table. Incompatible change: Truncate via delete no longer fails if sql_safe_updates is activated (this was a undocumented side effect).
2010-05-25 22:01:38 +02:00
sql/.deps/datadict.Po
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
sql/.deps/sql_derived.Po
sql/.deps/sql_do.Po
sql/.deps/sql_error.Po
sql/.deps/sql_handler.Po
sql/.deps/sql_help.Po
sql/.deps/sql_insert.Po
sql/.deps/sql_lex.Po
sql/.deps/sql_list.Po
sql/.deps/sql_load.Po
sql/.deps/sql_manager.Po
sql/.deps/sql_map.Po
sql/.deps/sql_olap.Po
sql/.deps/sql_parse.Po
sql/.deps/sql_partition.Po
sql/.deps/sql_plugin.Po
sql/.deps/sql_prepare.Po
sql/.deps/sql_rename.Po
sql/.deps/sql_repl.Po
sql/.deps/sql_select.Po
sql/.deps/sql_show.Po
sql/.deps/sql_state.Po
sql/.deps/sql_string.Po
sql/.deps/sql_table.Po
sql/.deps/sql_tablespace.Po
sql/.deps/sql_test.Po
sql/.deps/sql_trigger.Po
sql/.deps/sql_udf.Po
sql/.deps/sql_union.Po
sql/.deps/sql_update.Po
sql/.deps/sql_view.Po
sql/.deps/sql_yacc.Po
sql/.deps/stacktrace.Po
sql/.deps/strfunc.Po
sql/.deps/table.Po
sql/.deps/thr_malloc.Po
sql/.deps/time.Po
sql/.deps/tztime.Po
sql/.deps/udf_example.Plo
sql/.deps/uniques.Po
sql/.deps/unireg.Po
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
sql/.gdbinit
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
sql/.libs/udf_example.lai
sql/.libs/udf_example.so.0
sql/.libs/udf_example.so.0.0.0
merge with public tree
2003-06-04 23:12:45 +02:00
sql/client.c
Add doxygen files to .bzrignore
2008-07-24 16:44:41 +02:00
sql/Doxyfile
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint-gca into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
2006-08-24 00:29:44 +02:00
sql/f.c
Merge
2000-12-03 11:56:27 +01:00
sql/gen_lex_hash
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
sql/gmon.out
Add generated files to ignore list
2005-11-08 01:39:20 +01:00
sql/handlerton.cc
Add doxygen files to .bzrignore
2008-07-24 16:44:41 +02:00
sql/html
sql/latex
Merge
2000-12-03 11:56:27 +01:00
sql/lex_hash.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-11-05 16:36:34 +01:00
sql/link_sources
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
sql/max/*
sql/message.h
sql/message.mc
sql/message.rc
Merge
2000-12-03 11:56:27 +01:00
sql/mini_client_errors.c
Merge with 4.1.3-beta
2004-07-07 10:29:39 +02:00
sql/my_time.c
Merge BUG#15110 from 5.0 into 5.1. Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110 into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 17:09:27 +01:00
sql/my_user.c
merge
2004-06-21 09:24:40 +02:00
sql/mysql_tzinfo_to_sql
Merge with 4.1.3-beta
2004-07-07 10:29:39 +02:00
sql/mysql_tzinfo_to_sql.cc
sql/mysql_tzinfo_to_sql_tztime.cc
Merge
2000-12-03 11:56:27 +01:00
sql/mysqlbinlog
sql/mysqld
Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0
2001-09-19 01:14:27 +02:00
sql/mysqld-purecov
sql/mysqld-purify
sql/mysqld-quantify
Changes for the BitKeeper resolve. One more notice: limiting number of queries per hour for different users has been done on 4.0.1 , but I can port it to 3.23.* This will require only certain changes, like number of columns in user table. I will also make a test case for it, after it is approved by Monty, as result file will depend on the error message text.
2001-12-26 16:42:06 +01:00
sql/new.cc
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.cursor
2003-04-28 11:29:22 +02:00
sql/pack.c
Merge with 4.0.6
2002-12-05 18:38:42 +01:00
sql/safe_to_cache_query.txt
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
sql/share/*.sys
sql/share/charsets/gmon.out
Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0 into arthur.local:/home/my/mysql-5.0
2006-06-05 11:19:53 +02:00
sql/share/fixerrmsg.pl
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
2001-04-10 10:33:37 +02:00
sql/share/gmon.out
Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0 into arthur.local:/home/my/mysql-5.0
2006-06-05 11:19:53 +02:00
sql/share/iso639-2.txt
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2001-07-01 12:27:09 +02:00
sql/share/mysql
Merge
2000-12-07 16:10:30 +01:00
sql/share/norwegian-ny/errmsg.sys
Merge
2000-12-08 17:39:37 +01:00
sql/share/norwegian/errmsg.sys
Merge xiphis.org:/home/antony/work2/mysql-5.1 into xiphis.org:/home/antony/work2/wl3201-post-review.2
2006-05-02 07:45:31 +02:00
sql/sql_builtin.cc
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2001-08-12 15:11:43 +02:00
sql/sql_select.cc.orig
Merge
2000-12-03 11:56:27 +01:00
sql/sql_yacc.cc
sql/sql_yacc.h
Merge with 4.0.6
2002-12-05 18:38:42 +01:00
sql/sql_yacc.output
merge
2002-04-13 14:34:39 +02:00
sql/sql_yacc.yy.orig
merge
2004-06-21 09:24:40 +02:00
sql/test_time
merged
2003-10-15 12:25:44 +02:00
sql/udf_example.so
Merge mysql.com:/home/nick/mysql/repository/mysql-4.1 into mysql.com:/home/nick/mysql/mysql-4.1
2002-10-31 07:58:52 +01:00
sql_error.cc
sql_prepare.cc
Merge
2000-12-03 11:56:27 +01:00
stamp-h
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-08-13 21:15:14 +02:00
stamp-h.in
Merge mysql.com:/home/nick/mysql/repository/mysql-4.1 into mysql.com:/home/nick/mysql/mysql-4.1
2002-10-31 07:58:52 +01:00
stamp-h1
Merge on pull
2004-11-03 12:01:38 +01:00
stamp-h1.in
merge
2003-02-10 17:01:29 +01:00
stamp-h2
Merge on pull
2004-11-03 12:01:38 +01:00
stamp-h2.in
merge
2003-02-10 17:01:29 +01:00
stamp-h3
stamp-h4
manual merge
2003-07-31 15:11:52 +02:00
start_mysqld.sh
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
storage/archive/.deps/archive_test-archive_test.Po
storage/archive/.deps/archive_test-azio.Po
storage/archive/.deps/ha_archive_la-azio.Plo
storage/archive/.deps/ha_archive_la-ha_archive.Plo
storage/archive/.deps/libarchive_a-azio.Po
storage/archive/.deps/libarchive_a-ha_archive.Po
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1
2007-01-29 00:57:07 +01:00
storage/archive/archive_reader
Merge BUG#15110 from 5.0 into 5.1. Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110 into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 17:09:27 +01:00
storage/archive/archive_test
storage/bdb/*.ds?
storage/bdb/*.vcproj
Merge
2005-10-06 10:54:07 +02:00
storage/bdb/README
storage/bdb/btree/btree_auto.c
storage/bdb/btree/btree_autop.c
storage/bdb/build_unix/*
storage/bdb/build_vxworks/BerkeleyDB20.wpj
storage/bdb/build_vxworks/BerkeleyDB20small.wpj
storage/bdb/build_vxworks/BerkeleyDB22.wpj
storage/bdb/build_vxworks/BerkeleyDB22small.wpj
storage/bdb/build_vxworks/db.h
storage/bdb/build_vxworks/db_config.h
storage/bdb/build_vxworks/db_config_small.h
storage/bdb/build_vxworks/db_deadlock/db_deadlock20.wpj
storage/bdb/build_vxworks/db_deadlock/db_deadlock22.wpj
storage/bdb/build_vxworks/db_int.h
storage/bdb/build_vxworks/dbdemo/dbdemo.c
storage/bdb/build_vxworks/dbdemo/dbdemo20.wpj
storage/bdb/build_vxworks/dbdemo/dbdemo22.wpj
storage/bdb/build_win32/*.dsp
storage/bdb/build_win32/*.h
Merge BUG#15110 from 5.0 into 5.1. Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110 into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 17:09:27 +01:00
storage/bdb/build_win32/db.h
storage/bdb/build_win32/db_archive.dsp
storage/bdb/build_win32/db_checkpoint.dsp
storage/bdb/build_win32/db_config.h
storage/bdb/build_win32/db_cxx.h
storage/bdb/build_win32/db_deadlock.dsp
storage/bdb/build_win32/db_dll.dsp
storage/bdb/build_win32/db_dump.dsp
storage/bdb/build_win32/db_int.h
storage/bdb/build_win32/db_java.dsp
storage/bdb/build_win32/db_load.dsp
storage/bdb/build_win32/db_perf.dsp
storage/bdb/build_win32/db_printlog.dsp
storage/bdb/build_win32/db_recover.dsp
storage/bdb/build_win32/db_stat.dsp
storage/bdb/build_win32/db_static.dsp
storage/bdb/build_win32/db_tcl.dsp
storage/bdb/build_win32/db_test.dsp
storage/bdb/build_win32/db_upgrade.dsp
storage/bdb/build_win32/db_verify.dsp
storage/bdb/build_win32/ex_access.dsp
storage/bdb/build_win32/ex_btrec.dsp
storage/bdb/build_win32/ex_env.dsp
storage/bdb/build_win32/ex_lock.dsp
storage/bdb/build_win32/ex_mpool.dsp
storage/bdb/build_win32/ex_tpcb.dsp
storage/bdb/build_win32/excxx_access.dsp
storage/bdb/build_win32/excxx_btrec.dsp
storage/bdb/build_win32/excxx_env.dsp
storage/bdb/build_win32/excxx_lock.dsp
storage/bdb/build_win32/excxx_mpool.dsp
storage/bdb/build_win32/excxx_tpcb.dsp
Merge
2005-10-06 10:54:07 +02:00
storage/bdb/build_win32/include.tcl
storage/bdb/build_win32/libdb.def
storage/bdb/build_win32/libdb.rc
storage/bdb/build_win64/*.dsp
storage/bdb/build_win64/*.dsw
storage/bdb/build_win64/*.h
storage/bdb/db/crdel_auto.c
storage/bdb/db/crdel_autop.c
storage/bdb/db/db_auto.c
storage/bdb/db/db_autop.c
storage/bdb/dbinc_auto/*.*
storage/bdb/dbreg/dbreg_auto.c
storage/bdb/dbreg/dbreg_autop.c
storage/bdb/dist/autom4te-2.53.cache/*
storage/bdb/dist/autom4te-2.53.cache/output.0
storage/bdb/dist/autom4te-2.53.cache/requests
storage/bdb/dist/autom4te-2.53.cache/traces.0
storage/bdb/dist/autom4te.cache/*
storage/bdb/dist/autom4te.cache/output.0
storage/bdb/dist/autom4te.cache/requests
storage/bdb/dist/autom4te.cache/traces.0
storage/bdb/dist/config.hin
storage/bdb/dist/configure
storage/bdb/dist/tags
storage/bdb/dist/template/db_server_proc
storage/bdb/dist/template/gen_client_ret
storage/bdb/dist/template/rec_btree
storage/bdb/dist/template/rec_crdel
storage/bdb/dist/template/rec_db
storage/bdb/dist/template/rec_dbreg
storage/bdb/dist/template/rec_fileops
storage/bdb/dist/template/rec_hash
storage/bdb/dist/template/rec_log
storage/bdb/dist/template/rec_qam
storage/bdb/dist/template/rec_txn
storage/bdb/examples_c/ex_apprec/ex_apprec_auto.c
storage/bdb/examples_c/ex_apprec/ex_apprec_auto.h
storage/bdb/examples_c/ex_apprec/ex_apprec_template
storage/bdb/examples_java
storage/bdb/fileops/fileops_auto.c
storage/bdb/fileops/fileops_autop.c
storage/bdb/hash/hash_auto.c
storage/bdb/hash/hash_autop.c
storage/bdb/include/btree_auto.h
storage/bdb/include/btree_ext.h
storage/bdb/include/clib_ext.h
storage/bdb/include/common_ext.h
storage/bdb/include/crdel_auto.h
storage/bdb/include/db_auto.h
storage/bdb/include/db_ext.h
storage/bdb/include/db_server.h
storage/bdb/include/env_ext.h
storage/bdb/include/gen_client_ext.h
storage/bdb/include/gen_server_ext.h
storage/bdb/include/hash_auto.h
storage/bdb/include/hash_ext.h
storage/bdb/include/lock_ext.h
storage/bdb/include/log_auto.h
storage/bdb/include/log_ext.h
storage/bdb/include/mp_ext.h
storage/bdb/include/mutex_ext.h
storage/bdb/include/os_ext.h
storage/bdb/include/qam_auto.h
storage/bdb/include/qam_ext.h
storage/bdb/include/rpc_client_ext.h
storage/bdb/include/rpc_server_ext.h
storage/bdb/include/tcl_ext.h
storage/bdb/include/txn_auto.h
storage/bdb/include/txn_ext.h
storage/bdb/include/xa_ext.h
storage/bdb/java/src/com/sleepycat/db/Db.java
storage/bdb/java/src/com/sleepycat/db/DbBtreeStat.java
storage/bdb/java/src/com/sleepycat/db/DbConstants.java
storage/bdb/java/src/com/sleepycat/db/DbHashStat.java
storage/bdb/java/src/com/sleepycat/db/DbLockStat.java
storage/bdb/java/src/com/sleepycat/db/DbLogStat.java
storage/bdb/java/src/com/sleepycat/db/DbMpoolFStat.java
storage/bdb/java/src/com/sleepycat/db/DbQueueStat.java
storage/bdb/java/src/com/sleepycat/db/DbRepStat.java
storage/bdb/java/src/com/sleepycat/db/DbTxnStat.java
storage/bdb/libdb_java/java_stat_auto.c
storage/bdb/libdb_java/java_stat_auto.h
storage/bdb/libdb_java/java_util.i
storage/bdb/log/log_auto.c
storage/bdb/qam/qam_auto.c
storage/bdb/qam/qam_autop.c
storage/bdb/rep/rep_auto.c
storage/bdb/rep/rep_autop.c
storage/bdb/rpc_client/db_server_clnt.c
storage/bdb/rpc_client/gen_client.c
storage/bdb/rpc_server/c/db_server_proc.c
storage/bdb/rpc_server/c/db_server_proc.sed
storage/bdb/rpc_server/c/db_server_svc.c
storage/bdb/rpc_server/c/db_server_xdr.c
storage/bdb/rpc_server/c/gen_db_server.c
storage/bdb/rpc_server/db_server.x
storage/bdb/rpc_server/db_server_proc.sed
storage/bdb/rpc_server/db_server_svc.c
storage/bdb/rpc_server/db_server_xdr.c
storage/bdb/rpc_server/gen_db_server.c
storage/bdb/test/TESTS
storage/bdb/test/include.tcl
storage/bdb/test/logtrack.list
storage/bdb/txn/txn_auto.c
storage/bdb/txn/txn_autop.c
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
storage/blackhole/.deps/ha_blackhole_la-ha_blackhole.Plo
storage/blackhole/.deps/libblackhole_a-ha_blackhole.Po
storage/csv/.deps/ha_csv_la-ha_tina.Plo
storage/csv/.deps/libcsv_a-ha_tina.Po
storage/example/.deps/ha_example_la-ha_example.Plo
storage/example/.deps/libexample_a-ha_example.Po
storage/heap/.deps/_check.Po
storage/heap/.deps/_rectest.Po
storage/heap/.deps/hp_block.Po
storage/heap/.deps/hp_clear.Po
storage/heap/.deps/hp_close.Po
storage/heap/.deps/hp_create.Po
storage/heap/.deps/hp_delete.Po
storage/heap/.deps/hp_extra.Po
storage/heap/.deps/hp_hash.Po
storage/heap/.deps/hp_info.Po
storage/heap/.deps/hp_open.Po
storage/heap/.deps/hp_panic.Po
storage/heap/.deps/hp_rename.Po
storage/heap/.deps/hp_rfirst.Po
storage/heap/.deps/hp_rkey.Po
storage/heap/.deps/hp_rlast.Po
storage/heap/.deps/hp_rnext.Po
storage/heap/.deps/hp_rprev.Po
storage/heap/.deps/hp_rrnd.Po
storage/heap/.deps/hp_rsame.Po
storage/heap/.deps/hp_scan.Po
storage/heap/.deps/hp_static.Po
storage/heap/.deps/hp_test1.Po
storage/heap/.deps/hp_test2.Po
storage/heap/.deps/hp_update.Po
storage/heap/.deps/hp_write.Po
Merge
2005-10-06 10:54:07 +02:00
storage/heap/hp_test1
storage/heap/hp_test2
storage/innobase/autom4te-2.53.cache/*
storage/innobase/autom4te-2.53.cache/output.0
storage/innobase/autom4te-2.53.cache/requests
storage/innobase/autom4te-2.53.cache/traces.0
storage/innobase/autom4te.cache/*
storage/innobase/autom4te.cache/output.0
storage/innobase/autom4te.cache/requests
storage/innobase/autom4te.cache/traces.0
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
storage/innobase/btr/.deps/btr0btr.Po
storage/innobase/btr/.deps/btr0cur.Po
storage/innobase/btr/.deps/btr0pcur.Po
storage/innobase/btr/.deps/btr0sea.Po
storage/innobase/buf/.deps/buf0buf.Po
storage/innobase/buf/.deps/buf0flu.Po
storage/innobase/buf/.deps/buf0lru.Po
storage/innobase/buf/.deps/buf0rea.Po
Merge
2005-10-06 10:54:07 +02:00
storage/innobase/configure.lineno
storage/innobase/conftest.s1
storage/innobase/conftest.subs
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
storage/innobase/data/.deps/data0data.Po
storage/innobase/data/.deps/data0type.Po
storage/innobase/dict/.deps/dict0boot.Po
storage/innobase/dict/.deps/dict0crea.Po
storage/innobase/dict/.deps/dict0dict.Po
storage/innobase/dict/.deps/dict0load.Po
storage/innobase/dict/.deps/dict0mem.Po
storage/innobase/dyn/.deps/dyn0dyn.Po
storage/innobase/eval/.deps/eval0eval.Po
storage/innobase/eval/.deps/eval0proc.Po
storage/innobase/fil/.deps/fil0fil.Po
storage/innobase/fsp/.deps/fsp0fsp.Po
storage/innobase/fut/.deps/fut0fut.Po
storage/innobase/fut/.deps/fut0lst.Po
storage/innobase/ha/.deps/ha0ha.Po
storage/innobase/ha/.deps/hash0hash.Po
Merge
2005-10-06 10:54:07 +02:00
storage/innobase/ib_config.h
storage/innobase/ib_config.h.in
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
storage/innobase/ibuf/.deps/ibuf0ibuf.Po
storage/innobase/lock/.deps/lock0lock.Po
storage/innobase/log/.deps/log0log.Po
storage/innobase/log/.deps/log0recv.Po
storage/innobase/mach/.deps/mach0data.Po
storage/innobase/mem/.deps/mem0mem.Po
storage/innobase/mem/.deps/mem0pool.Po
Merge
2005-10-06 10:54:07 +02:00
storage/innobase/mkinstalldirs
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
storage/innobase/mtr/.deps/mtr0log.Po
storage/innobase/mtr/.deps/mtr0mtr.Po
storage/innobase/os/.deps/os0file.Po
storage/innobase/os/.deps/os0proc.Po
storage/innobase/os/.deps/os0sync.Po
storage/innobase/os/.deps/os0thread.Po
storage/innobase/page/.deps/page0cur.Po
storage/innobase/page/.deps/page0page.Po
storage/innobase/pars/.deps/lexyy.Po
storage/innobase/pars/.deps/pars0grm.Po
storage/innobase/pars/.deps/pars0opt.Po
storage/innobase/pars/.deps/pars0pars.Po
storage/innobase/pars/.deps/pars0sym.Po
storage/innobase/que/.deps/que0que.Po
storage/innobase/read/.deps/read0read.Po
storage/innobase/rem/.deps/rem0cmp.Po
storage/innobase/rem/.deps/rem0rec.Po
storage/innobase/row/.deps/row0ins.Po
storage/innobase/row/.deps/row0mysql.Po
storage/innobase/row/.deps/row0purge.Po
storage/innobase/row/.deps/row0row.Po
storage/innobase/row/.deps/row0sel.Po
storage/innobase/row/.deps/row0uins.Po
storage/innobase/row/.deps/row0umod.Po
storage/innobase/row/.deps/row0undo.Po
storage/innobase/row/.deps/row0upd.Po
storage/innobase/row/.deps/row0vers.Po
storage/innobase/srv/.deps/srv0que.Po
storage/innobase/srv/.deps/srv0srv.Po
storage/innobase/srv/.deps/srv0start.Po
Merge
2005-10-06 10:54:07 +02:00
storage/innobase/stamp-h1
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
storage/innobase/sync/.deps/sync0arr.Po
storage/innobase/sync/.deps/sync0rw.Po
storage/innobase/sync/.deps/sync0sync.Po
storage/innobase/thr/.deps/thr0loc.Po
storage/innobase/trx/.deps/trx0purge.Po
storage/innobase/trx/.deps/trx0rec.Po
storage/innobase/trx/.deps/trx0roll.Po
storage/innobase/trx/.deps/trx0rseg.Po
storage/innobase/trx/.deps/trx0sys.Po
storage/innobase/trx/.deps/trx0trx.Po
storage/innobase/trx/.deps/trx0undo.Po
storage/innobase/usr/.deps/usr0sess.Po
storage/innobase/ut/.deps/ut0byte.Po
storage/innobase/ut/.deps/ut0dbg.Po
storage/innobase/ut/.deps/ut0list.Po
storage/innobase/ut/.deps/ut0mem.Po
storage/innobase/ut/.deps/ut0rnd.Po
storage/innobase/ut/.deps/ut0ut.Po
storage/innobase/ut/.deps/ut0vec.Po
storage/innobase/ut/.deps/ut0wqueue.Po
storage/myisam/.deps/ft_boolean_search.Po
storage/myisam/.deps/ft_nlq_search.Po
storage/myisam/.deps/ft_parser.Po
storage/myisam/.deps/ft_static.Po
storage/myisam/.deps/ft_stopwords.Po
storage/myisam/.deps/ft_update.Po
storage/myisam/.deps/mi_cache.Po
storage/myisam/.deps/mi_changed.Po
storage/myisam/.deps/mi_check.Po
storage/myisam/.deps/mi_checksum.Po
storage/myisam/.deps/mi_close.Po
storage/myisam/.deps/mi_create.Po
storage/myisam/.deps/mi_dbug.Po
storage/myisam/.deps/mi_delete.Po
storage/myisam/.deps/mi_delete_all.Po
storage/myisam/.deps/mi_delete_table.Po
storage/myisam/.deps/mi_dynrec.Po
storage/myisam/.deps/mi_extra.Po
storage/myisam/.deps/mi_info.Po
storage/myisam/.deps/mi_key.Po
storage/myisam/.deps/mi_keycache.Po
storage/myisam/.deps/mi_locking.Po
storage/myisam/.deps/mi_log.Po
storage/myisam/.deps/mi_open.Po
storage/myisam/.deps/mi_packrec.Po
storage/myisam/.deps/mi_page.Po
storage/myisam/.deps/mi_panic.Po
storage/myisam/.deps/mi_preload.Po
storage/myisam/.deps/mi_range.Po
storage/myisam/.deps/mi_rename.Po
storage/myisam/.deps/mi_rfirst.Po
storage/myisam/.deps/mi_rkey.Po
storage/myisam/.deps/mi_rlast.Po
storage/myisam/.deps/mi_rnext.Po
storage/myisam/.deps/mi_rnext_same.Po
storage/myisam/.deps/mi_rprev.Po
storage/myisam/.deps/mi_rrnd.Po
storage/myisam/.deps/mi_rsame.Po
storage/myisam/.deps/mi_rsamepos.Po
storage/myisam/.deps/mi_scan.Po
storage/myisam/.deps/mi_search.Po
storage/myisam/.deps/mi_static.Po
storage/myisam/.deps/mi_statrec.Po
storage/myisam/.deps/mi_test1.Po
storage/myisam/.deps/mi_test2.Po
storage/myisam/.deps/mi_test3.Po
storage/myisam/.deps/mi_unique.Po
storage/myisam/.deps/mi_update.Po
storage/myisam/.deps/mi_write.Po
storage/myisam/.deps/myisam_ftdump.Po
storage/myisam/.deps/myisamchk.Po
storage/myisam/.deps/myisamlog.Po
storage/myisam/.deps/myisampack.Po
storage/myisam/.deps/rt_index.Po
storage/myisam/.deps/rt_key.Po
storage/myisam/.deps/rt_mbr.Po
storage/myisam/.deps/rt_split.Po
storage/myisam/.deps/rt_test.Po
storage/myisam/.deps/sort.Po
storage/myisam/.deps/sp_key.Po
storage/myisam/.deps/sp_test.Po
Merge
2005-10-06 10:54:07 +02:00
storage/myisam/FT1.MYD
storage/myisam/FT1.MYI
storage/myisam/ft_dump
storage/myisam/ft_eval
storage/myisam/ft_test1
storage/myisam/ftbench/data
storage/myisam/ftbench/t
storage/myisam/ftbench/var/*
storage/myisam/mi_test1
storage/myisam/mi_test2
storage/myisam/mi_test3
storage/myisam/mi_test_all
storage/myisam/myisam.log
storage/myisam/myisam_ftdump
storage/myisam/myisamchk
storage/myisam/myisamlog
storage/myisam/myisampack
storage/myisam/rt_test
storage/myisam/rt_test.MYD
storage/myisam/rt_test.MYI
storage/myisam/sp_test
storage/myisam/test1.MYD
storage/myisam/test1.MYI
storage/myisam/test2.MYD
storage/myisam/test2.MYI
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
storage/myisammrg/.deps/myrg_close.Po
storage/myisammrg/.deps/myrg_create.Po
storage/myisammrg/.deps/myrg_delete.Po
storage/myisammrg/.deps/myrg_extra.Po
storage/myisammrg/.deps/myrg_info.Po
storage/myisammrg/.deps/myrg_locking.Po
storage/myisammrg/.deps/myrg_open.Po
storage/myisammrg/.deps/myrg_panic.Po
storage/myisammrg/.deps/myrg_queue.Po
storage/myisammrg/.deps/myrg_range.Po
storage/myisammrg/.deps/myrg_rfirst.Po
storage/myisammrg/.deps/myrg_rkey.Po
storage/myisammrg/.deps/myrg_rlast.Po
storage/myisammrg/.deps/myrg_rnext.Po
storage/myisammrg/.deps/myrg_rnext_same.Po
storage/myisammrg/.deps/myrg_rprev.Po
storage/myisammrg/.deps/myrg_rrnd.Po
storage/myisammrg/.deps/myrg_rsame.Po
storage/myisammrg/.deps/myrg_static.Po
storage/myisammrg/.deps/myrg_update.Po
storage/myisammrg/.deps/myrg_write.Po
Merge
2005-10-06 10:54:07 +02:00
storage/ndb/bin/DbAsyncGenerator
storage/ndb/bin/DbCreate
storage/ndb/bin/acid
storage/ndb/bin/async-lmc-bench-l-p10.sh
storage/ndb/bin/async-lmc-bench-l.sh
storage/ndb/bin/async-lmc-bench-p10.sh
storage/ndb/bin/async-lmc-bench.sh
storage/ndb/bin/atrt
storage/ndb/bin/atrt-analyze-result.sh
storage/ndb/bin/atrt-clear-result.sh
storage/ndb/bin/atrt-gather-result.sh
storage/ndb/bin/atrt-setup.sh
storage/ndb/bin/bankCreator
storage/ndb/bin/bankMakeGL
storage/ndb/bin/bankSumAccounts
storage/ndb/bin/bankTimer
storage/ndb/bin/bankTransactionMaker
storage/ndb/bin/bankValidateAllGLs
storage/ndb/bin/basicTransporterTest
storage/ndb/bin/benchronja
storage/ndb/bin/bulk_copy
storage/ndb/bin/copy_tab
storage/ndb/bin/create_all_tabs
storage/ndb/bin/create_index
storage/ndb/bin/create_tab
storage/ndb/bin/delete_all
storage/ndb/bin/desc
storage/ndb/bin/drop_all_tabs
storage/ndb/bin/drop_index
storage/ndb/bin/drop_tab
storage/ndb/bin/flexAsynch
storage/ndb/bin/flexBench
storage/ndb/bin/flexHammer
storage/ndb/bin/flexScan
storage/ndb/bin/flexTT
storage/ndb/bin/hugoCalculator
storage/ndb/bin/hugoFill
storage/ndb/bin/hugoLoad
storage/ndb/bin/hugoLockRecords
storage/ndb/bin/hugoPkDelete
storage/ndb/bin/hugoPkRead
storage/ndb/bin/hugoPkReadRecord
storage/ndb/bin/hugoPkUpdate
storage/ndb/bin/hugoScanRead
storage/ndb/bin/hugoScanUpdate
storage/ndb/bin/index
storage/ndb/bin/index2
storage/ndb/bin/initronja
storage/ndb/bin/interpreterInTup
storage/ndb/bin/list_tables
storage/ndb/bin/make-config.sh
storage/ndb/bin/mgmtclient
storage/ndb/bin/mgmtsrvr
storage/ndb/bin/mkconfig
storage/ndb/bin/ndb
storage/ndb/bin/ndb_cpcc
storage/ndb/bin/ndb_cpcd
storage/ndb/bin/ndb_rep
storage/ndb/bin/ndbsql
storage/ndb/bin/newton_basic
storage/ndb/bin/newton_br
storage/ndb/bin/newton_pb
storage/ndb/bin/newton_perf
storage/ndb/bin/perfTransporterTest
storage/ndb/bin/printConfig
storage/ndb/bin/printSchemafile
storage/ndb/bin/printSysfile
storage/ndb/bin/redoLogFileReader
storage/ndb/bin/restart
storage/ndb/bin/restarter
storage/ndb/bin/restarter2
storage/ndb/bin/restarts
storage/ndb/bin/restore
storage/ndb/bin/select_all
storage/ndb/bin/select_count
storage/ndb/bin/telco
storage/ndb/bin/testBackup
storage/ndb/bin/testBank
storage/ndb/bin/testBasic
storage/ndb/bin/testBasicAsynch
storage/ndb/bin/testCopy
storage/ndb/bin/testDataBuffers
storage/ndb/bin/testDict
storage/ndb/bin/testGrep
storage/ndb/bin/testGrepVerify
storage/ndb/bin/testIndex
storage/ndb/bin/testInterpreter
storage/ndb/bin/testKernelDataBuffer
storage/ndb/bin/testLongSig
storage/ndb/bin/testMgm
storage/ndb/bin/testMgmapi
storage/ndb/bin/testNdbApi
storage/ndb/bin/testNodeRestart
Remove some files that should not have been added with BDB upgrade, and update ignore file after move of storage engines to storage/.
2005-09-23 00:53:18 +02:00
storage/ndb/bin/testOIBasic
storage/ndb/bin/testOdbcDriver
storage/ndb/bin/testOperations
storage/ndb/bin/testRestartGci
storage/ndb/bin/testScan
storage/ndb/bin/testScanInterpreter
storage/ndb/bin/testSimplePropertiesSection
storage/ndb/bin/testSystemRestart
storage/ndb/bin/testTimeout
storage/ndb/bin/testTransactions
storage/ndb/bin/test_cpcd
storage/ndb/bin/test_event
storage/ndb/bin/verify_index
storage/ndb/bin/waiter
storage/ndb/config/autom4te.cache/*
storage/ndb/config/config.mk
storage/ndb/examples/ndbapi_example1/ndbapi_example1
storage/ndb/examples/ndbapi_example2/ndbapi_example2
storage/ndb/examples/ndbapi_example3/ndbapi_example3
storage/ndb/examples/ndbapi_example5/ndbapi_example5
storage/ndb/examples/select_all/select_all
storage/ndb/include/ndb_global.h
storage/ndb/include/ndb_types.h
storage/ndb/include/ndb_version.h
storage/ndb/lib/libMGM_API.so
storage/ndb/lib/libNDB_API.so
storage/ndb/lib/libNDB_ODBC.so
storage/ndb/lib/libNEWTON_API.so
storage/ndb/lib/libNEWTON_BASICTEST_COMMON.so
storage/ndb/lib/libREP_API.so
storage/ndb/lib/libndbclient.so
storage/ndb/lib/libndbclient_extra.so
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-23 20:30:26 +02:00
storage/ndb/ndbapi-examples/mgmapi_logevent/mgmapi_logevent
storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2
storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async
storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1
storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event
storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries
storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan
storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple
storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual
storage/ndb/ndbapi-examples/ndbapi_simple_index/ndbapi_simple_index
Remove some files that should not have been added with BDB upgrade, and update ignore file after move of storage engines to storage/.
2005-09-23 00:53:18 +02:00
storage/ndb/src/common/debugger/libtrace.dsp
storage/ndb/src/common/debugger/signaldata/libsignaldataprint.dsp
storage/ndb/src/common/logger/liblogger.dsp
storage/ndb/src/common/mgmcommon/libmgmsrvcommon.dsp
storage/ndb/src/common/mgmcommon/printConfig/*.d
storage/ndb/src/common/portlib/libportlib.dsp
storage/ndb/src/common/transporter/libtransporter.dsp
storage/ndb/src/common/util/libgeneral.dsp
merged
2006-03-06 23:20:19 +01:00
storage/ndb/src/common/util/testBitmask.cpp
Remove some files that should not have been added with BDB upgrade, and update ignore file after move of storage engines to storage/.
2005-09-23 00:53:18 +02:00
storage/ndb/src/cw/cpcd/ndb_cpcd
storage/ndb/src/dummy.cpp
storage/ndb/src/kernel/blocks/backup/libbackup.dsp
Add generated files to ignore list
2005-11-08 01:39:20 +01:00
storage/ndb/src/kernel/blocks/backup/ndb_print_backup_file
Remove some files that should not have been added with BDB upgrade, and update ignore file after move of storage engines to storage/.
2005-09-23 00:53:18 +02:00
storage/ndb/src/kernel/blocks/backup/restore/ndb_restore
storage/ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp
storage/ndb/src/kernel/blocks/dbacc/libdbacc.dsp
storage/ndb/src/kernel/blocks/dbdict/libdbdict.dsp
Add generated files to ignore list
2005-11-08 01:39:20 +01:00
storage/ndb/src/kernel/blocks/dbdict/ndb_print_schema_file
Remove some files that should not have been added with BDB upgrade, and update ignore file after move of storage engines to storage/.
2005-09-23 00:53:18 +02:00
storage/ndb/src/kernel/blocks/dbdih/libdbdih.dsp
Add generated files to ignore list
2005-11-08 01:39:20 +01:00
storage/ndb/src/kernel/blocks/dbdih/ndb_print_sys_file
Remove some files that should not have been added with BDB upgrade, and update ignore file after move of storage engines to storage/.
2005-09-23 00:53:18 +02:00
storage/ndb/src/kernel/blocks/dblqh/libdblqh.dsp
storage/ndb/src/kernel/blocks/dbtc/libdbtc.dsp
storage/ndb/src/kernel/blocks/dbtup/libdbtup.dsp
Add generated files to ignore list
2005-11-08 01:39:20 +01:00
storage/ndb/src/kernel/blocks/dbtup/test_varpage
Remove some files that should not have been added with BDB upgrade, and update ignore file after move of storage engines to storage/.
2005-09-23 00:53:18 +02:00
storage/ndb/src/kernel/blocks/dbtux/libdbtux.dsp
storage/ndb/src/kernel/blocks/dbutil/libdbutil.dsp
storage/ndb/src/kernel/blocks/grep/libgrep.dsp
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
storage/ndb/src/kernel/blocks/ndb_print_file
Remove some files that should not have been added with BDB upgrade, and update ignore file after move of storage engines to storage/.
2005-09-23 00:53:18 +02:00
storage/ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp
storage/ndb/src/kernel/blocks/ndbfs/libndbfs.dsp
storage/ndb/src/kernel/blocks/qmgr/libqmgr.dsp
storage/ndb/src/kernel/blocks/suma/libsuma.dsp
storage/ndb/src/kernel/blocks/trix/libtrix.dsp
storage/ndb/src/kernel/error/liberror.dsp
storage/ndb/src/kernel/ndbd
storage/ndb/src/kernel/ndbd.dsp
storage/ndb/src/kernel/vm/libkernel.dsp
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
2007-01-19 23:30:41 +01:00
storage/ndb/src/libndb.ver
Remove some files that should not have been added with BDB upgrade, and update ignore file after move of storage engines to storage/.
2005-09-23 00:53:18 +02:00
storage/ndb/src/libndbclient.dsp
storage/ndb/src/mgmapi/libmgmapi.dsp
storage/ndb/src/mgmclient/libndbmgmclient.dsp
storage/ndb/src/mgmclient/ndb_mgm
storage/ndb/src/mgmclient/ndb_mgm.dsp
storage/ndb/src/mgmclient/test_cpcd/*.d
storage/ndb/src/mgmsrv/ndb_mgmd
storage/ndb/src/mgmsrv/ndb_mgmd.dsp
storage/ndb/src/ndbapi/libndbapi.dsp
Merge mysql.com:/home/my/mysql-5.0 into mysql.com:/home/my/mysql-5.1
2007-02-23 12:28:34 +01:00
storage/ndb/src/ndbapi/ndberror_check
Merge BUG#15110 from 5.0 into 5.1. Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110 into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 17:09:27 +01:00
storage/ndb/test/ndbapi/DbAsyncGenerator
storage/ndb/test/ndbapi/DbCreate
Remove some files that should not have been added with BDB upgrade, and update ignore file after move of storage engines to storage/.
2005-09-23 00:53:18 +02:00
storage/ndb/test/ndbapi/bank/bankCreator
storage/ndb/test/ndbapi/bank/bankMakeGL
storage/ndb/test/ndbapi/bank/bankSumAccounts
storage/ndb/test/ndbapi/bank/bankTimer
storage/ndb/test/ndbapi/bank/bankTransactionMaker
storage/ndb/test/ndbapi/bank/bankValidateAllGLs
storage/ndb/test/ndbapi/bank/testBank
storage/ndb/test/ndbapi/create_all_tabs
storage/ndb/test/ndbapi/create_tab
storage/ndb/test/ndbapi/drop_all_tabs
storage/ndb/test/ndbapi/flexAsynch
storage/ndb/test/ndbapi/flexBench
storage/ndb/test/ndbapi/flexBench.dsp
storage/ndb/test/ndbapi/flexHammer
storage/ndb/test/ndbapi/flexTT
Merge BUG#15110 from 5.0 into 5.1. Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110 into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 17:09:27 +01:00
storage/ndb/test/ndbapi/ndbapi_slow_select
Remove some files that should not have been added with BDB upgrade, and update ignore file after move of storage engines to storage/.
2005-09-23 00:53:18 +02:00
storage/ndb/test/ndbapi/testBackup
storage/ndb/test/ndbapi/testBasic
storage/ndb/test/ndbapi/testBasic.dsp
storage/ndb/test/ndbapi/testBasicAsynch
Merge BUG#15110 from 5.0 into 5.1. Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110 into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 17:09:27 +01:00
storage/ndb/test/ndbapi/testBitfield
Remove some files that should not have been added with BDB upgrade, and update ignore file after move of storage engines to storage/.
2005-09-23 00:53:18 +02:00
storage/ndb/test/ndbapi/testBlobs
storage/ndb/test/ndbapi/testBlobs.dsp
storage/ndb/test/ndbapi/testDataBuffers
storage/ndb/test/ndbapi/testDeadlock
storage/ndb/test/ndbapi/testDict
storage/ndb/test/ndbapi/testIndex
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-23 20:30:26 +02:00
storage/ndb/test/ndbapi/testIndexStat
storage/ndb/test/ndbapi/testInterpreter
Merge BUG#15110 from 5.0 into 5.1. Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110 into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 17:09:27 +01:00
storage/ndb/test/ndbapi/testLcp
Remove some files that should not have been added with BDB upgrade, and update ignore file after move of storage engines to storage/.
2005-09-23 00:53:18 +02:00
storage/ndb/test/ndbapi/testMgm
storage/ndb/test/ndbapi/testNdbApi
storage/ndb/test/ndbapi/testNodeRestart
storage/ndb/test/ndbapi/testOIBasic
storage/ndb/test/ndbapi/testOperations
Merge BUG#15110 from 5.0 into 5.1. Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110 into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 17:09:27 +01:00
storage/ndb/test/ndbapi/testPartitioning
storage/ndb/test/ndbapi/testReadPerf
Remove some files that should not have been added with BDB upgrade, and update ignore file after move of storage engines to storage/.
2005-09-23 00:53:18 +02:00
storage/ndb/test/ndbapi/testRestartGci
storage/ndb/test/ndbapi/testSRBank
storage/ndb/test/ndbapi/testScan
storage/ndb/test/ndbapi/testScan.dsp
storage/ndb/test/ndbapi/testScanInterpreter
storage/ndb/test/ndbapi/testScanPerf
storage/ndb/test/ndbapi/testSystemRestart
storage/ndb/test/ndbapi/testTimeout
storage/ndb/test/ndbapi/testTransactions
storage/ndb/test/ndbapi/test_event
Merge BUG#15110 from 5.0 into 5.1. Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110 into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 17:09:27 +01:00
storage/ndb/test/ndbapi/test_event_merge
Remove some files that should not have been added with BDB upgrade, and update ignore file after move of storage engines to storage/.
2005-09-23 00:53:18 +02:00
storage/ndb/test/run-test/atrt
storage/ndb/test/src/libNDBT.dsp
storage/ndb/test/tools/copy_tab
storage/ndb/test/tools/create_index
storage/ndb/test/tools/hugoCalculator
storage/ndb/test/tools/hugoFill
storage/ndb/test/tools/hugoLoad
storage/ndb/test/tools/hugoLockRecords
storage/ndb/test/tools/hugoPkDelete
storage/ndb/test/tools/hugoPkRead
storage/ndb/test/tools/hugoPkReadRecord
storage/ndb/test/tools/hugoPkUpdate
storage/ndb/test/tools/hugoScanRead
storage/ndb/test/tools/hugoScanUpdate
Merge BUG#15110 from 5.0 into 5.1. Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110 into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 17:09:27 +01:00
storage/ndb/test/tools/listen_event
Remove some files that should not have been added with BDB upgrade, and update ignore file after move of storage engines to storage/.
2005-09-23 00:53:18 +02:00
storage/ndb/test/tools/ndb_cpcc
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-23 20:30:26 +02:00
storage/ndb/test/tools/rep_latency
Remove some files that should not have been added with BDB upgrade, and update ignore file after move of storage engines to storage/.
2005-09-23 00:53:18 +02:00
storage/ndb/test/tools/restart
storage/ndb/test/tools/verify_index
storage/ndb/tools/ndb_config
storage/ndb/tools/ndb_delete_all
storage/ndb/tools/ndb_delete_all.dsp
storage/ndb/tools/ndb_desc
storage/ndb/tools/ndb_desc.dsp
storage/ndb/tools/ndb_drop_index
storage/ndb/tools/ndb_drop_index.dsp
storage/ndb/tools/ndb_drop_table
storage/ndb/tools/ndb_drop_table.dsp
storage/ndb/tools/ndb_restore
storage/ndb/tools/ndb_select_all
storage/ndb/tools/ndb_select_all.dsp
storage/ndb/tools/ndb_select_count
storage/ndb/tools/ndb_select_count.dsp
storage/ndb/tools/ndb_show_tables
storage/ndb/tools/ndb_show_tables.dsp
storage/ndb/tools/ndb_test_platform
storage/ndb/tools/ndb_waiter
storage/ndb/tools/ndb_waiter.dsp
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
strings/*.ds?
strings/*.vcproj
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
strings/.deps/bchange.Po
strings/.deps/bcmp.Po
strings/.deps/bfill.Po
strings/.deps/bmove.Po
strings/.deps/bmove512.Po
strings/.deps/bmove_upp.Po
strings/.deps/conf_to_src.Po
strings/.deps/ctype-big5.Po
strings/.deps/ctype-bin.Po
strings/.deps/ctype-cp932.Po
strings/.deps/ctype-czech.Po
strings/.deps/ctype-euc_kr.Po
strings/.deps/ctype-eucjpms.Po
strings/.deps/ctype-extra.Po
strings/.deps/ctype-gb2312.Po
strings/.deps/ctype-gbk.Po
strings/.deps/ctype-latin1.Po
strings/.deps/ctype-mb.Po
strings/.deps/ctype-simple.Po
strings/.deps/ctype-sjis.Po
strings/.deps/ctype-tis620.Po
strings/.deps/ctype-uca.Po
strings/.deps/ctype-ucs2.Po
strings/.deps/ctype-ujis.Po
strings/.deps/ctype-utf8.Po
strings/.deps/ctype-win1250ch.Po
strings/.deps/ctype.Po
strings/.deps/decimal.Po
strings/.deps/int2str.Po
strings/.deps/is_prefix.Po
strings/.deps/llstr.Po
strings/.deps/longlong2str.Po
strings/.deps/longlong2str_asm.Po
strings/.deps/my_strchr.Po
strings/.deps/my_strtoll10.Po
strings/.deps/my_vsnprintf.Po
strings/.deps/r_strinstr.Po
strings/.deps/str2int.Po
strings/.deps/str_alloc.Po
strings/.deps/strappend.Po
strings/.deps/strcend.Po
strings/.deps/strcont.Po
strings/.deps/strend.Po
strings/.deps/strfill.Po
strings/.deps/strinstr.Po
strings/.deps/strmake.Po
strings/.deps/strmov.Po
strings/.deps/strnlen.Po
strings/.deps/strnmov.Po
strings/.deps/strstr.Po
strings/.deps/strtod.Po
strings/.deps/strtol.Po
strings/.deps/strtoll.Po
strings/.deps/strtoul.Po
strings/.deps/strtoull.Po
strings/.deps/strxmov.Po
strings/.deps/strxnmov.Po
strings/.deps/xml.Po
Merge
2000-12-03 11:56:27 +01:00
strings/conf_to_src
strings/ctype_autoconf.c
strings/ctype_extra_sources.c
merge with public tree
2003-06-04 23:12:45 +02:00
strings/str_test
Merge bk-internal:/home/bk/mysql-5.0/ into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-10-18 14:09:41 +02:00
strings/test_decimal
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix into rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix
2006-09-13 20:16:53 +02:00
support-files/*.ini
merge
2003-02-10 17:01:29 +01:00
support-files/MacOSX/Description.plist
support-files/MacOSX/Info.plist
Merge with 4.0.13
2003-05-19 15:35:49 +02:00
support-files/MacOSX/ReadMe.txt
Merge with 4.0.11
2003-02-26 00:03:47 +01:00
support-files/MacOSX/StartupParameters.plist
Merge mishka.local:/home/my/mysql-4.1 into mishka.local:/home/my/mysql-5.0
2005-08-25 05:55:48 +02:00
support-files/MacOSX/postflight
Merge with 4.0.11
2003-02-26 00:03:47 +01:00
support-files/MacOSX/postinstall
Merge mishka.local:/home/my/mysql-4.1 into mishka.local:/home/my/mysql-5.0
2005-08-25 05:55:48 +02:00
support-files/MacOSX/preflight
Merge with 4.0.11
2003-02-26 00:03:47 +01:00
support-files/MacOSX/preinstall
Merge
2000-12-03 11:56:27 +01:00
support-files/binary-configure
support-files/my-huge.cnf
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-24 22:02:08 +02:00
support-files/my-innodb-heavy-4G.cnf
Merge
2000-12-03 11:56:27 +01:00
support-files/my-large.cnf
support-files/my-medium.cnf
support-files/my-small.cnf
support-files/mysql-3.23.25-beta.spec
support-files/mysql-3.23.26-beta.spec
support-files/mysql-3.23.27-beta.spec
support-files/mysql-3.23.28-gamma.spec
added loops and other cool stuff to mysqltest fixed slave to preserve temp tables on slave stop; slave start added abort-slave-event-count option to mysqld to test the above added a test case for temp tables with a contantly aborting slave removed warning in sql_parse.cc fixed thimble.cc to compile
2000-12-02 18:11:50 +01:00
support-files/mysql-3.23.29-gamma.spec
Merge
2000-12-03 11:56:27 +01:00
support-files/mysql-log-rotate
support-files/mysql.server
support-files/mysql.spec
Merge bk-internal:/home/bk/mysql-5.1-marvel into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-marvel-engines
2007-08-03 17:15:23 +02:00
support-files/mysqld_multi.server
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-09 13:34:03 +01:00
support-files/ndb-config-2-node.ini
sql_base.cc merge+insert (v.3) myrg_info.c merge+insert (v.3) myrg_extra.c merge+insert (v.3) ignore cleanup
2000-12-08 13:53:24 +01:00
tags
merged
2004-08-20 00:52:43 +02:00
test/ndbapi/bank/bankCreator
test/ndbapi/bank/bankMakeGL
test/ndbapi/bank/bankSumAccounts
test/ndbapi/bank/bankTimer
test/ndbapi/bank/bankTransactionMaker
test/ndbapi/bank/bankValidateAllGLs
test/ndbapi/bank/testBank
Added more ndb binaries to ignore
2004-08-12 12:37:16 +02:00
test/ndbapi/create_all_tabs
test/ndbapi/create_tab
test/ndbapi/drop_all_tabs
test/ndbapi/flexAsynch
test/ndbapi/flexBench
test/ndbapi/flexHammer
test/ndbapi/flexTT
test/ndbapi/testBackup
test/ndbapi/testBasic
test/ndbapi/testBasicAsynch
test/ndbapi/testBlobs
test/ndbapi/testDataBuffers
test/ndbapi/testDeadlock
test/ndbapi/testDict
test/ndbapi/testIndex
test/ndbapi/testMgm
test/ndbapi/testNdbApi
test/ndbapi/testNodeRestart
test/ndbapi/testOIBasic
test/ndbapi/testOperations
test/ndbapi/testRestartGci
test/ndbapi/testScan
test/ndbapi/testScanInterpreter
test/ndbapi/testScanPerf
test/ndbapi/testSystemRestart
test/ndbapi/testTimeout
test/ndbapi/testTransactions
test/ndbapi/test_event
test/run-test/atrt
test/tools/copy_tab
test/tools/create_index
test/tools/hugoCalculator
test/tools/hugoFill
test/tools/hugoLoad
test/tools/hugoLockRecords
test/tools/hugoPkDelete
test/tools/hugoPkRead
test/tools/hugoPkReadRecord
test/tools/hugoPkUpdate
test/tools/hugoScanRead
test/tools/hugoScanUpdate
test/tools/ndb_cpcc
test/tools/restart
test/tools/verify_index
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
test1/*
Merge with 4.0.9
2003-01-18 02:13:37 +01:00
test_xml
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
tests/*.ds?
tests/*.vcproj
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
tests/.deps/dummy.Po
tests/.deps/insert_test.Po
tests/.deps/mysql_client_test.Po
tests/.deps/select_test.Po
tests/.deps/thread_test.Po
Merge bodhi.local:/opt/local/work/tmp_merge into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
2006-07-08 00:30:07 +02:00
tests/.libs -prune
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
tests/.libs/lt-mysql_client_test
tests/.libs/mysql_client_test
Merge bk-internal:/home/bk/mysql-5.1-marvel into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-marvel-engines
2007-08-03 17:15:23 +02:00
tests/bug25714
Merge with 4.0.3 Some simple optimzations, more comments and indentation changes. Add ` around database in 'use database' in binary log. Moved max_error_count and max_warning_count to variables struct. Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls. Changed string functions to use character set of first string argument as default return characterset (Each string function can change the above assumption if needed)
2002-08-30 11:40:40 +02:00
tests/client_test
manual merge
2003-07-31 15:11:52 +02:00
tests/connect_test
Merge
2005-01-24 22:48:48 +01:00
tests/mysql_client_test
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
thr_insert_test/*
thr_test/*
Merge with 4.0.13
2003-05-19 15:35:49 +02:00
thread_test
Merge
2001-01-01 13:21:12 +01:00
tmp/*
Merge bodhi.local:/opt/local/work/tmp_merge into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
2006-07-08 00:30:07 +02:00
tools/.libs -prune
work on MySQL server management daemon
2001-08-28 01:33:11 +02:00
tools/my_vsnprintf.c
Merge
2001-09-17 04:10:50 +02:00
tools/mysqlmanager
work on MySQL server management daemon
2001-08-28 01:33:11 +02:00
tools/mysqlmngd
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-07 15:38:05 +02:00
tools/mysqltestmanager
work on MySQL server management daemon
2001-08-28 01:33:11 +02:00
tools/mysys_priv.h
Merge mysql.com:/home/jimw/my/mysql-5.0-clean into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-30 22:27:38 +02:00
unittest/examples/*.t
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
unittest/examples/.deps/no_plan-t.Po
unittest/examples/.deps/simple-t.Po
unittest/examples/.deps/skip-t.Po
unittest/examples/.deps/skip_all-t.Po
unittest/examples/.deps/todo-t.Po
Merge mysql.com:/home/jimw/my/mysql-5.0-clean into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-30 22:27:38 +02:00
unittest/mysys/*.t
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
unittest/mysys/.deps/base64-t.Po
unittest/mysys/.deps/bitmap-t.Po
unittest/mysys/.deps/my_atomic-t.Po
unittest/mytap/.deps/tap.Po
Merge mysql.com:/home/jimw/my/mysql-5.0-clean into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-30 22:27:38 +02:00
unittest/mytap/t/*.t
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
unittest/mytap/t/.deps/basic-t.Po
Merge mysql.com:/home/jimw/my/mysql-5.0-clean into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-30 22:27:38 +02:00
unittest/unit
merge
2003-02-10 17:01:29 +01:00
vi.h
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
vio/*.ds?
vio/*.vcproj
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
vio/.deps/dummy.Po
vio/.deps/test-ssl.Po
vio/.deps/test-sslclient.Po
vio/.deps/test-sslserver.Po
vio/.deps/vio.Po
vio/.deps/viosocket.Po
vio/.deps/viossl.Po
vio/.deps/viosslfactories.Po
Merge
2001-09-17 04:10:50 +02:00
vio/test-ssl
OpenSSL changes
2001-08-26 21:34:52 +02:00
vio/test-sslclient
vio/test-sslserver
Merge work:/home/bk/mysql-4.0 into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-08-28 01:34:29 +02:00
vio/viotest-ssl
Added number of files into ignore list for win32 build within bk tree.
2005-11-14 14:36:05 +01:00
vio/viotest-sslconnect.cpp
vio/viotest.cpp
These bitKeeper changes will allow Windows to be used as a primary development platform.
2006-09-13 20:15:22 +02:00
win/configure.data
win/vs71cache.txt
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix into rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix
2006-09-13 20:16:53 +02:00
win/vs8cache.txt
Merge mysql.com:/home/gluh/MySQL/Merge/5.1 into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-12-13 12:56:04 +01:00
ylwrap
Added number of files into ignore list for win32 build within bk tree.
2005-11-14 14:36:05 +01:00
zlib/*.ds?
zlib/*.vcproj
Merge magare.gmz:/home/kgeorge/mysql/work/B36011-take2-5.0-bugteam into magare.gmz:/home/kgeorge/mysql/work/B36011-5.1-bugteam
2008-05-16 18:03:50 +02:00
mysql-test/bug36522-64.tar
mysql-test/bug36522.tar
mysql-test/t.log
mysql-test/tps.log
libmysqld/event_parse_data.cc
merge
2008-11-28 15:01:09 +01:00
autom4te.cache
sql/share/czech
sql/share/danish
sql/share/dutch
sql/share/english
sql/share/estonian
sql/share/french
sql/share/german
sql/share/greek
sql/share/hungarian
sql/share/italian
sql/share/japanese
sql/share/japanese-sjis
sql/share/korean
sql/share/norwegian
sql/share/norwegian-ny
sql/share/polish
sql/share/portuguese
sql/share/romanian
sql/share/russian
sql/share/serbian
sql/share/slovak
sql/share/spanish
sql/share/swedish
sql/share/ukrainian
Ignore auto-generated file: libmysqld/examples/mysqltest.cc
2009-08-12 21:45:01 +02:00
libmysqld/examples/mysqltest.cc
Ignore a new symbolic link.
2009-09-23 16:02:39 +02:00
libmysqld/sql_signal.cc
A backporting patch for the following revision from 6.0: revno: 2630.22.41 committer: Alexander Nozdrin <alik@mysql.com> branch nick: 6.0-rt-bug39255 timestamp: Thu 2008-10-16 16:39:30 +0400 message: A patch for Bug#39255: Stored procedures: crash if function references nonexistent table. The problem is not reproduced in 6.0. Adding a test case.
2009-10-15 19:08:41 +02:00
libmysqld/rpl_handler.cc
WL#4259 - Debug Sync Facility Backport from 6.0 to 5.1. Only those sync points are included, which are used in debug_sync.test. The Debug Sync Facility allows to place synchronization points in the code: open_tables(...) DEBUG_SYNC(thd, "after_open_tables"); lock_tables(...) When activated, a sync point can - Send a signal and/or - Wait for a signal Nomenclature: - signal: A value of a global variable that persists until overwritten by a new signal. The global variable can also be seen as a "signal post" or "flag mast". Then the signal is what is attached to the "signal post" or "flag mast". - send a signal: Assign the value (the signal) to the global variable ("set a flag") and broadcast a global condition to wake those waiting for a signal. - wait for a signal: Loop over waiting for the global condition until the global value matches the wait-for signal. Please find more information in the top comment in debug_sync.cc or in the worklog entry.
2009-09-29 17:38:40 +02:00
libmysqld/debug_sync.cc
backport of dbug extensions from 6.0: function/ syntax glob(7) wildcards unit tests
2009-10-30 19:13:58 +01:00
libmysqld/rpl_handler.cc
dbug/tests
Initial import of WL#3726 "DDL locking for all metadata objects". Backport of: ------------------------------------------------------------ revno: 2630.4.1 committer: Dmitry Lenev <dlenev@mysql.com> branch nick: mysql-6.0-3726-w timestamp: Fri 2008-05-23 17:54:03 +0400 message: WL#3726 "DDL locking for all metadata objects". After review fixes in progress. ------------------------------------------------------------ This is the first patch in series. It transforms the metadata locking subsystem to use a dedicated module (mdl.h,cc). No significant changes in the locking protocol. The import passes the test suite with the exception of deprecated/removed 6.0 features, and MERGE tables. The latter are subject to a fix by WL#4144. Unfortunately, the original changeset comments got lost in a merge, thus this import has its own (largely insufficient) comments. This patch fixes Bug#25144 "replication / binlog with view breaks". Warning: this patch introduces an incompatible change: Under LOCK TABLES, it's no longer possible to FLUSH a table that was not locked for WRITE. Under LOCK TABLES, it's no longer possible to DROP a table or VIEW that was not locked for WRITE. ****** Backport of: ------------------------------------------------------------ revno: 2630.4.2 committer: Dmitry Lenev <dlenev@mysql.com> branch nick: mysql-6.0-3726-w timestamp: Sat 2008-05-24 14:03:45 +0400 message: WL#3726 "DDL locking for all metadata objects". After review fixes in progress. ****** Backport of: ------------------------------------------------------------ revno: 2630.4.3 committer: Dmitry Lenev <dlenev@mysql.com> branch nick: mysql-6.0-3726-w timestamp: Sat 2008-05-24 14:08:51 +0400 message: WL#3726 "DDL locking for all metadata objects" Fixed failing Windows builds by adding mdl.cc to the lists of files needed to build server/libmysqld on Windows. ****** Backport of: ------------------------------------------------------------ revno: 2630.4.4 committer: Dmitry Lenev <dlenev@mysql.com> branch nick: mysql-6.0-3726-w timestamp: Sat 2008-05-24 21:57:58 +0400 message: WL#3726 "DDL locking for all metadata objects". Fix for assert failures in kill.test which occured when one tried to kill ALTER TABLE statement on merge table while it was waiting in wait_while_table_is_used() for other connections to close this table. These assert failures stemmed from the fact that cleanup code in this case assumed that temporary table representing new version of table was open with adding to THD::temporary_tables list while code which were opening this temporary table wasn't always fulfilling this. This patch changes code that opens new version of table to always do this linking in. It also streamlines cleanup process for cases when error occurs while we have new version of table open. ****** WL#3726 "DDL locking for all metadata objects" Add libmysqld/mdl.cc to .bzrignore. ****** Backport of: ------------------------------------------------------------ revno: 2630.4.6 committer: Dmitry Lenev <dlenev@mysql.com> branch nick: mysql-6.0-3726-w timestamp: Sun 2008-05-25 00:33:22 +0400 message: WL#3726 "DDL locking for all metadata objects". Addition to the fix of assert failures in kill.test caused by changes for this worklog. Make sure we close the new table only once.
2009-11-30 16:55:03 +01:00
libmysqld/mdl.cc
WL#4284, "Transactional DDL locking". Add two more files to .bzrignore.
2009-12-03 23:55:34 +01:00
client/transaction.h
libmysqld/transaction.cc
WL#4738 streamline/simplify @@variable creation process Bug#16565 mysqld --help --verbose does not order variablesBug#20413 sql_slave_skip_counter is not shown in show variables Bug#20415 Output of mysqld --help --verbose is incomplete Bug#25430 variable not found in SELECT @@global.ft_max_word_len; Bug#32902 plugin variables don't know their names Bug#34599 MySQLD Option and Variable Reference need to be consistent in formatting! Bug#34829 No default value for variable and setting default does not raise error Bug#34834 ? Is accepted as a valid sql mode Bug#34878 Few variables have default value according to documentation but error occurs Bug#34883 ft_boolean_syntax cant be assigned from user variable to global var. Bug#37187 `INFORMATION_SCHEMA`.`GLOBAL_VARIABLES`: inconsistent status Bug#40988 log_output_basic.test succeeded though syntactically false. Bug#41010 enum-style command-line options are not honoured (maria.maria-recover fails) Bug#42103 Setting key_buffer_size to a negative value may lead to very large allocations Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled Bug#44797 plugins w/o command-line options have no disabling option in --help Bug#46314 string system variables don't support expressions Bug#46470 sys_vars.max_binlog_cache_size_basic_32 is broken Bug#46586 When using the plugin interface the type "set" for options caused a crash. Bug#47212 Crash in DBUG_PRINT in mysqltest.cc when trying to print octal number Bug#48758 mysqltest crashes on sys_vars.collation_server_basic in gcov builds Bug#49417 some complaints about mysqld --help --verbose output Bug#49540 DEFAULT value of binlog_format isn't the default value Bug#49640 ambiguous option '--skip-skip-myisam' (double skip prefix) Bug#49644 init_connect and \0 Bug#49645 init_slave and multi-byte characters Bug#49646 mysql --show-warnings crashes when server dies
2009-12-22 10:35:56 +01:00
libmysqld/sys_vars.cc
libmysqld/keycaches.cc
Add client/dtoa.c to .bzrignore.
2010-01-20 16:26:05 +01:00
client/dtoa.c
Add libmysqld/sql_audit.cc to .bzrignore.
2010-01-30 23:11:28 +01:00
libmysqld/sql_audit.cc
Add configure.am to .bzrignore.
2010-03-01 11:07:06 +01:00
configure.am
Ignoring auto-generated libmysqld/des_key_file.cc.
2010-04-21 21:59:19 +02:00
libmysqld/des_key_file.cc
Ignore files auto-generated for each build by CMake-build-scripts.
2010-05-26 12:34:41 +02:00
CPackConfig.cmake
CPackSourceConfig.cmake
make_dist.cmake
client/echo
libmysql/libmysql_exports_file.cc
libmysql/merge_archives_mysqlclient.cmake
libmysqld/merge_archives_mysqlserver.cmake
libmysqld/mysqlserver_depends.c
libmysqld/examples/mysql_embedded
sql/.empty
Update .bzrignore.
2010-07-30 17:29:17 +02:00
mysys/thr_lock
Reference in a new issue Copy permalink