summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* manual.texi Added that InnoDB tablespace must be at least 10 MB, removed ↵unknown2001-05-212-1/+15
| | | | | | | | | | | | single quotes from phantom srv0start.c Tablespace size must be at least 10 MB innobase/srv/srv0start.c: Tablespace size must be at least 10 MB Docs/manual.texi: Added that InnoDB tablespace must be at least 10 MB, removed single quotes from phantom
* manual.texi Added entry in contrib software.unknown2001-05-211-0/+2
| | | | | Docs/manual.texi: Added entry in contrib software.
* manual.texi minor change notes modsunknown2001-05-201-4/+4
| | | | | Docs/manual.texi: minor change notes mods
* os0file.h Define always WIN_ASYNC_IO, check at run-time if the OS actually ↵unknown2001-05-201-4/+2
| | | | | | | supports it innobase/include/os0file.h: Define always WIN_ASYNC_IO, check at run-time if the OS actually supports it
* Merge heikki@work.mysql.com:/home/my/mysqlunknown2001-05-203-12/+60
|\ | | | | | | | | | | | | into donna.mysql.fi:/home/heikki/mysqle
| * os0file.h InnoDB should now run with the same binary on Win95 and NT: checks ↵unknown2001-05-202-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | OS version srv0start.c InnoDB should now run with the same binary on Win95 and NT: checks OS version innobase/srv/srv0start.c: InnoDB should now run with the same binary on Win95 and NT: checks OS version innobase/include/os0file.h: InnoDB should now run with the same binary on Win95 and NT: checks OS version
| * os0file.c Removed extraneous fsync and corected a typo in Windows codeunknown2001-05-201-7/+37
| | | | | | | | | | | | | | | | os0file.c Changed file write buffer size in os_file_set_size from 16 MB to 8 MB innobase/os/os0file.c: Removed extraneous fsync and corected a typo in Windows code
* | mergeunknown2001-05-198-30/+29
|\ \ | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | Force close of sockets on HPUX 10.20unknown2001-05-197-31/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support option lines longer than 256 chars. Close the slow log at shutdown. Always allow debug options to mysqld. Change some DBUG_PRINT tags. Docs/manual.texi: Small cleanups configure.in: Force close of sockets on HPUX 10.20 mysql-test/t/merge.test: Remove used tables mysys/default.c: Support option lines longer than 256 chars. mysys/mf_keycache.c: Split check_keycache tags sql/mysqld.cc: Move things to 'cleanup'. Close the slow log at shutdown. Always allow debug options sql/violite.c: Change the error tag to vio_error
* | | manual.texi more development tree section changesunknown2001-05-182-45/+59
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | manual.texi change "InnoDB consinsten read" to manual.texi "InnoDB consistent read" in @node lines manual.texi (to match section's actual title) manual.texi cleanups to "installing from development source manual.texi tree" section Docs/manual.texi: more development tree section changes BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | ibuf0ibuf.c Insert buffer calculated SQL NULL size wrong, causing overflow ↵unknown2001-05-183-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and assertion failure in some cases log0log.c Retrieve a dummy value from a function to prevent gcc crashing on HP-UX innobase/log/log0log.c: Retrieve a dummy value from a function to prevent gcc crashing on HP-UX innobase/ibuf/ibuf0ibuf.c: Insert buffer calculated SQL NULL size wrong, causing overflow and assertion failure in some cases BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Mergeunknown2001-05-183-46/+49
|\ \ | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union
| * | Do-patch-file Fix typo (extra 'mv')unknown2001-05-183-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ignore added Logs/* binary/* BitKeeper/etc/ignore: added Logs/* binary/* Build-tools/Do-patch-file: Fix typo (extra 'mv') BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Merge work.mysql.com:/home/bk/mysqlunknown2001-05-1837-7884/+51
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | into threads.polyesthetic.msg:/usr/local/src/my/3 Docs/manual.texi: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | manual.texi @[XXX] -> @{[XXX]} (syntax error)unknown2001-05-181-1/+1
| | | | | | | | | | | | | | | Docs/manual.texi: @[XXX] -> @{[XXX]} (syntax error)
| * | Clean out some more generated files from the bdb tree. Add a hackunknown2001-05-1836-7884/+50
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to bdb/dist/s_rpc so that bk doesn't complain about the rpc_server/db_server_proc.c file that gets overwritten (but needs to be stored in BK). Add a bdb/dist/template directory which is needed by bdb/dist/s_recover. BitKeeper/deleted/.del-gen_client_ext.h~5c621cacb18b38: Delete: bdb/include/gen_client_ext.h BitKeeper/deleted/.del-gen_client_ret~786a5e65119b3991: Delete: bdb/dist/template/gen_client_ret BitKeeper/deleted/.del-db_server.x~811aeb6b630fe7aa: Delete: bdb/rpc_server/db_server.x BitKeeper/deleted/.del-db_server_proc.sed~1a9af8e5b051acbd: Delete: bdb/rpc_server/db_server_proc.sed BitKeeper/deleted/.del-db_server_proc~2e8b49d42aefab55: Delete: bdb/dist/template/db_server_proc BitKeeper/deleted/.del-gen_server_ext.h~fd7bcfe6bbca8bcb: Delete: bdb/include/gen_server_ext.h BitKeeper/deleted/.del-db_archive.dsp~e3da826e91bb086: Delete: bdb/build_win32/db_archive.dsp BitKeeper/deleted/.del-db_checkpoint.dsp~8071af22db95b1db: Delete: bdb/build_win32/db_checkpoint.dsp BitKeeper/deleted/.del-db_deadlock.dsp~befd45d29eaeb672: Delete: bdb/build_win32/db_deadlock.dsp BitKeeper/deleted/.del-db_dll.dsp~4e9dda53c84511b6: Delete: bdb/build_win32/db_dll.dsp BitKeeper/deleted/.del-db_dump.dsp~e07d2a82708b61: Delete: bdb/build_win32/db_dump.dsp BitKeeper/deleted/.del-db_java.dsp~e3941d5a9810b360: Delete: bdb/build_win32/db_java.dsp BitKeeper/deleted/.del-db_load.dsp~e83a2af8e24a715d: Delete: bdb/build_win32/db_load.dsp BitKeeper/deleted/.del-db_printlog.dsp~163f6e1073a5f396: Delete: bdb/build_win32/db_printlog.dsp BitKeeper/deleted/.del-db_recover.dsp~835c32ab73359256: Delete: bdb/build_win32/db_recover.dsp BitKeeper/deleted/.del-db_stat.dsp~f77417f5d9984986: Delete: bdb/build_win32/db_stat.dsp BitKeeper/deleted/.del-db_static.dsp~78ea414467defc70: Delete: bdb/build_win32/db_static.dsp BitKeeper/deleted/.del-db_tcl.dsp~5ad951d774e41520: Delete: bdb/build_win32/db_tcl.dsp BitKeeper/deleted/.del-db_upgrade.dsp~90fd250190af4984: Delete: bdb/build_win32/db_upgrade.dsp BitKeeper/deleted/.del-db_verify.dsp~e9a4938542f86cea: Delete: bdb/build_win32/db_verify.dsp BitKeeper/deleted/.del-ex_access.dsp~8dd6017efffae14e: Delete: bdb/build_win32/ex_access.dsp BitKeeper/deleted/.del-ex_btrec.dsp~c87137287d8d67dc: Delete: bdb/build_win32/ex_btrec.dsp BitKeeper/deleted/.del-ex_env.dsp~1732d5e41efda77: Delete: bdb/build_win32/ex_env.dsp BitKeeper/deleted/.del-ex_lock.dsp~286d2566e786dde: Delete: bdb/build_win32/ex_lock.dsp BitKeeper/deleted/.del-ex_mpool.dsp~9eb937bc70c1573: Delete: bdb/build_win32/ex_mpool.dsp BitKeeper/deleted/.del-ex_tpcb.dsp~644b38dae8b38152: Delete: bdb/build_win32/ex_tpcb.dsp BitKeeper/deleted/.del-excxx_access.dsp~31e87b6228470681: Delete: bdb/build_win32/excxx_access.dsp BitKeeper/deleted/.del-excxx_btrec.dsp~61b563f4ac1f73eb: Delete: bdb/build_win32/excxx_btrec.dsp BitKeeper/deleted/.del-excxx_env.dsp~b0bf2649a4c797ac: Delete: bdb/build_win32/excxx_env.dsp BitKeeper/deleted/.del-excxx_lock.dsp~257abf03544f6270: Delete: bdb/build_win32/excxx_lock.dsp BitKeeper/deleted/.del-excxx_mpool.dsp~d17a5d09f09f5217: Delete: bdb/build_win32/excxx_mpool.dsp BitKeeper/deleted/.del-excxx_tpcb.dsp~159c727e2c15105e: Delete: bdb/build_win32/excxx_tpcb.dsp BitKeeper/deleted/.del-logtrack.list~7f4f1382b37d98e5: Delete: bdb/test/logtrack.list BitKeeper/etc/ignore: added bdb/build_win32/db_archive.dsp bdb/build_win32/db_checkpoint.dsp bdb/build_win32/db_deadlock.dsp bdb/build_win32/db_dump.dsp bdb/build_win32/db_load.dsp bdb/build_win32/db_printlog.dsp bdb/build_win32/db_recover.dsp bdb/build_win32/db_stat.dsp 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 bdb/build_win32/db_dll.dsp bdb/build_win32/db_java.dsp bdb/build_win32/db_static.dsp bdb/build_win32/db_tcl.dsp bdb/dist/template/gen_client_ret bdb/dist/template/db_server_proc bdb/include/gen_client_ext.h bdb/include/gen_server_ext.h bdb/rpc_server/db_server_proc.sed bdb/rpc_server/db_server.x bdb/test/logtrack.list bdb/dist/s_rpc: This is a hack to handle the $proc_file special case. Since it is both a source file and a generated file, we have to dance a bit to get it to work with 'bk get', not just with 'bk edit'. This still isn't perfect (I don't know what perfect would be in this case), but it seems to work for now.
* | manual.texi Added a mirror, adjusted some URLs.unknown2001-05-172-14/+10
|/ | | | | | | Docs/manual.texi: Added a mirror, adjusted some URLs. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysqlunknown2001-05-1711-63/+223
|\ | | | | | | | | Docs/manual.texi: Auto merged
| * Fixed bug when using MERGE on files > 4Gunknown2001-05-1711-63/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug in SELECT db1.table.* FROM db1.table,db2.table Fixed bug in INSERT DELAYED when doing shutdown and a table was locked Changed that tmp_table_size =4G-1 means unlimited. Docs/manual.texi: Added new section about crashed MyISAM tables. Cleaned up subsections for InnoDB client/mysql.cc: Cleanup myisam/mi_rkey.c: Cleanup myisam/mi_search.c: Fixed wrong casts in debug messages myisammrg/myrg_rrnd.c: Fixed bug when using files > 4G mysys/getvar.c: Changed to use longlong to support arguments up to 4G mysys/thr_lock.c: Fix for delay insert sql/mysqld.cc: Increased default size for temporary tables sql/sql_base.cc: Fixed bug in SELECT db1.table.* FROM db1.table,db2.table sql/sql_insert.cc: Fixed bug in INSERT DELAYED when doing shutdown and a table was locked sql/sql_select.cc: Changed that tmp_table_size =4G-1 means unlimited.
* | mergedunknown2001-05-167-98/+106
|\ \
| * | Fulltext manual changed, MERGE bug fixedunknown2001-05-167-97/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs/manual.texi: Fulltext manual changed, MERGE bug added to changelog myisammrg/mymrgdef.h: MERGE bug fixed myisammrg/myrg_rkey.c: MERGE bug fixed myisammrg/myrg_rnext.c: MERGE bug fixed myisammrg/myrg_rprev.c: MERGE bug fixed mysql-test/r/merge.result: MERGE bug fixed mysql-test/t/merge.test: MERGE bug fixed
* | | Merge work:/home/bk/mysqlunknown2001-05-162-0/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.sashanet.com:/home/sasha/src/bk/mysql
| * | | mysql-test/r/rpl000001.resultunknown2001-05-161-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | forgot to add result mysql-test/r/rpl000001.result: forgot to add result
| * | | mysql-test/t/rpl000001.testunknown2001-05-161-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added a test for updates on user table mysql-test/t/rpl000001.test: added a test for updates on user table
* | | | os0file.c Fixed an extraneous error message at the start of db, changed from ↵unknown2001-05-161-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | O_SYNC back to fdatasync because extremely slow on Sun innobase/os/os0file.c: Fixed an extraneous error message at the start of db, changed from O_SYNC back to fdatasync because extremely slow on Sun
* | | | os0file.c More precise error message numberunknown2001-05-152-5/+15
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ut0dbg.h Changed Innobase->InnoDB os0file.c InnoDB prints now the number of OS error in a file operation innobase/include/ut0dbg.h: Changed Innobase->InnoDB innobase/os/os0file.c: More precise error message number
* | | Merge work.mysql.com:/home/bk/mysqlunknown2001-05-142-3/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | into threads.polyesthetic.msg:/usr/local/src/my/3
| * | Merge work:/home/bk/mysqlunknown2001-05-141-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.sashanet.com:/home/sasha/src/bk/mysql
| | * | sql/stacktrace.cunknown2001-05-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed frame depth since we now are a frame deeper on Alpha, use SP instead of FP sql/stacktrace.c: fixed frame depth since we now are a frame deeper on Alpha, use SP instead of FP
| * | | row0undo.c Fix a bug if we run out of space in the tablespace assertion in ↵unknown2001-05-141-1/+0
| |/ / | | | | | | | | | | | | | | | | | | trx0roll.c innobase/row/row0undo.c: Fix a bug if we run out of space in the tablespace assertion in trx0roll.c
* | | RPM .spec file: add "mysql" to the Provides: line, to match whatunknown2001-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redhat's RPM's are looking for. Submitted by Florin Andrei <florin@sgi.com>. support-files/mysql.spec.sh: Add "mysql" to the Provides: line, to match what Redhat's RPM's are looking for.
* | | Merge work.mysql.com:/home/bk/mysqlunknown2001-05-14121-1272/+3085
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | into threads.polyesthetic.msg:/usr/local/src/my/3 BitKeeper/etc/logging_ok: auto-union sql/sql_select.cc: Auto merged
| * | os0file.c Use O_SYNC if possible, second choice fdatasync, and last choice fsyncunknown2001-05-143-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in Check if fdatasync exists manual.texi Updated defragmenting doc manual.texi Corrected fillfactor contract threashold for a page to 1/2 Docs/manual.texi: Updated defragmenting doc innobase/configure.in: Check if fdatasync exists innobase/os/os0file.c: Use O_SYNC if possible, second choice fdatasync, and last choice fsync
| * | Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysqlunknown2001-05-148-376/+442
| |\ \ | | | | | | | | | | | | | | | | Docs/manual.texi: Auto merged
| | * | Cleanup up stacktrace codeunknown2001-05-148-376/+442
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated qsort source from glibc. Add debugging of keycache when EXTRA_DEBUG is specified Docs/manual.texi: Added new contrib stuff bdb/dist/Makefile.in: Don't automaticly checkout things from bk mysys/mf_keycache.c: Add debugging of keycache when EXTRA_DEBUG is specified. mysys/mf_qsort.c: Updated qsort source from glibc. sql/Makefile.am: Cleanup up stacktrace code sql/mysqld.cc: Cleanup up stacktrace code
| * | | manual.texi changed location of samp_db distribution and MySQLunknown2001-05-121-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | manual.texi book errata. Docs/manual.texi: changed location of samp_db distribution and MySQL book errata.
| * | Added information about using mysql-maxunknown2001-05-126-28/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/mysqld.cc: Fixes for Alpha cc compiler support-files/my-huge.cnf.sh: cleanup support-files/my-large.cnf.sh: cleanup support-files/my-medium.cnf.sh: cleanup support-files/my-small.cnf.sh: cleanup
| * | Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysqlunknown2001-05-126-77/+138
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs/manual.texi: Auto merged sql/mysqld.cc: Auto merged
| | * | cleanupunknown2001-05-126-77/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs/manual.texi: Updated gdb / trace information innobase/pars/pars0grm.c: Removed warning on windows mysys/mf_keycache.c: Changed "exec" to "check_keycache" sql/mysqld.cc: Added suffix for windows binaries
| * | | Fixes for MySQL-Maxunknown2001-05-112-23/+68
| | | |
| * | | manual.texi Added a note on table defragmenting and a sentence on InnoDB speedunknown2001-05-111-0/+19
| | |/ | |/| | | | | | | | | | Docs/manual.texi: Added a note on table defragmenting and a sentence on InnoDB speed
| * | sql/mysqld.ccunknown2001-05-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | put back the things that the merge removed sql/mysqld.cc: put back the things that the merge removed
| * | mergedunknown2001-05-091-32/+176
| |\ \ | | | | | | | | | | | | | | | | sql/mysqld.cc: merged - need to fix
| | * | stack trace updates:unknown2001-05-091-29/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | limited support on Alpha - in general case, even with frame pointer, stack trace on alpha is impossible without looking at the symbol table frame pointer does get saved on the stack, but you have no idea where and where the return address is saved. So the best we can do without the symbol table is look for magic opcodes and try to guess how big each frame is and where the return address was hidden from the instruction parameters. In practice, we can usually go up 3-4 frames before we hit some nasty frame that the current code cannot figure out. This is actually not too bad, especially when we already have the query Also cleaned up messages, print more variables, tell the user of how much memory mysqld could potentially use, and warn of what can happen with default STACK_SIZE and a lot of connections if coredump happens when there are more than 200 connections. sql/mysqld.cc: stack trace updates
| * | | Merge heikki@work.mysql.com:/home/my/mysqlunknown2001-05-091-2/+4
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | into donna.mysql.fi:/home/heikki/mysqle
| | * | row0sel.c Fix a bug in consistent read through secondary keyunknown2001-05-091-2/+4
| | |/ | | | | | | | | | | | | innobase/row/row0sel.c: Fix a bug in consistent read through secondary key
| * | Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysqlunknown2001-05-0921-91/+193
| |\ \ | | |/ | |/| | | | | | | Docs/manual.texi: Auto merged
| | * Applied patches for BDB tablesunknown2001-05-0921-91/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes to InnoDB to compile on Windows Fix for temporary InnoDB tables Fixed bug in REPLACE() Fixed sub char keys for InnoDB Docs/manual.texi: Changelog + update of table types bdb/include/log.h: Patch from Sleepycat bdb/log/log.c: Patch from Sleepycat bdb/log/log_rec.c: Patch from Sleepycat client/mysqladmin.c: Cleanup innobase/include/univ.i: Fix for compilation on Windows innobase/os/os0file.c: cleanup innobase/pars/pars0grm.y: Fix for compilation on Windows mysql-test/r/innodb.result: New test case mysql-test/t/innodb.test: New test case sql/ha_innobase.cc: cleanup sql/ha_innobase.h: Fix for prefix keys sql/handler.h: Fix for temporary Innodb tables sql/item_strfunc.cc: Fixed bug in REPLACE() sql/lock.cc: Fix for temporary Innodb tables sql/mysqld.cc: Added --skip-stack-trace sql/share/english/errmsg.txt: Better error messages sql/sql_base.cc: Fix for temporary Innodb tables sql/sql_select.cc: Fix for temporary Innodb tables sql/sql_table.cc: Fixed sub char keys for InnoDB sql/table.h: Fix for temporary Innodb tables
| * | Docs/manual.texiunknown2001-05-071-1/+0
| |/ | | | | | | | | | | | | | | | | removed porn site Docs/manual.texi: removed porn site
| * Mergeunknown2001-05-054-3/+32
| |\ | | | | | | | | | | | | | | | | | | sql/sql_yacc.yy: Auto merged Docs/manual.texi: SCCS merged