summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge with new VARCHAR codemonty@mysql.com2004-12-06167-19116/+3257
|\
| * Add support for up to VARCHAR (size up to 65535)monty@mysql.com2004-12-06169-19155/+3296
| | | | | | | | | | | | | | | | | | Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors Added support for VARCHAR KEYS to heap Removed support for ISAM Now only long VARCHAR columns are changed to TEXT on demand (not CHAR) Internal temporary files can now use fixed length tables if the used VARCHAR columns are short
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2004-12-06114-389/+24865
|\ \ | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| * | After merge fixesmonty@mysql.com2004-12-0622-91/+120
| | | | | | | | | | | | | | | Fixed compiler warnings Fix core dump when sending SIGHUP to mysqld
| * | Merge with 4.1monty@mysql.com2004-12-06107-336/+24789
| |\ \
| | * | ndb: fix solaris (etc) ndb startup problem in mysql-test-runpekka@mysql.com2004-12-041-1/+1
| | | |
| | * | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/bXXXX-4.1lars@mysql.com2004-12-042-2/+2
| | |\ \
| | | * | Due to a compiler bug, slave.cc:tables_ok() sometimes wrongly returnslars@mysql.com2004-12-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1 if the return type is int or int_fast8_t. The test case that showed this problem is rpl000001 and the tested version was MySQL 5.0.2. The compiler with the problem is GCC 3.0.4 runing on "Linux bitch 2.4.18 #2 Thu Apr 11 14:37:17 EDT 2002 sparc64 unknown". By changing the return type to bool the problem disappear. (Another way to make the problem disappear is to simply print the returned value with printf("%d",?). The printed returned value is always 0 in the test cases I have run.) This is only a partial solution to the problem, since someone could later change the return type of the function back to int or some other type that does not work.
| | * | | postreview fixesbell@sanja.is.com.ua2004-12-042-2/+39
| | | | |
| | * | | mergebell@sanja.is.com.ua2004-12-033-3/+16
| | |\ \ \
| | | * \ \ Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-12-033-3/+16
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
| | | | * | | init values to avoid junk returning in case of null value asking without ↵bell@sanja.is.com.ua2004-11-253-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | assigning value (BUG#6806)
| | * | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-12-0397-379/+24665
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-global-4.1
| | | * | | | Fix t/rpl_create_database.test: replace version in SHOW BINLOG RESULTSjimw@mysql.com2004-12-032-1/+3
| | | | | | |
| | | * | | | Mergejimw@mysql.com2004-12-0330-155/+630
| | | |\ \ \ \
| | | | * \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2004-12-032-27/+19
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| | | | | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-12-032-27/+19
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | | | | | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-12-032-27/+19
| | | | | | |\ \ \ \ | | | | | | | |_|/ / | | | | | | |/| | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | | | | | | * | | sql/sql_class.hserg@serg.mylan2004-12-032-27/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #6284 - report truncation warnings in INSERT ... SELECT only for "INSERT" part sql/sql_insert.cc Bug #6284 - report truncation warnings in INSERT ... SELECT only for "INSERT" part
| | | | * | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2004-12-031-0/+1
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| | | | | * | | | | Merge mysql.com:/home/jonas/src/mysql-4.1-fixjoreland@mysql.com2004-12-031-0/+1
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| | | | | | * | | | | ndb - fix in test suitejoreland@mysql.com2004-12-031-0/+1
| | | | | | | | | | |
| | | | * | | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1pekka@mysql.com2004-12-031-0/+1
| | | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my41
| | | | | * | | | | | ndb: failed update updated tuple version. crash at DbtupTrigger.cpp 1102pekka@mysql.com2004-12-031-0/+1
| | | | | | | | | | |
| | | | * | | | | | | Merge mysql.com:/home/wax/mysql/mysql-4.1wax@mysql.com2004-12-033-0/+255
| | | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | | | | | | | | | | | | | into mysql.com:/home/wax/mysql/mysql-4.1testtemp
| | | | | * | | | | | added project files of mysqltest and mysql_test_run_newwax@kishkin.ru2004-12-033-0/+255
| | | | | | | | | | |
| | | | * | | | | | | Merge mysql.com:/home/jonas/src/mysql-4.1-fixjoreland@mysql.com2004-12-031-8/+14
| | | | |\ \ \ \ \ \ \ | | | | | | |_|/ / / / | | | | | |/| | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| | | | * | | | | | | Merge mysql.com:/space/bkroot/mysql-4.1mats@mysql.com2004-12-0323-120/+340
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/bk/b6391-mysql-4.1
| | | | | * | | | | | | Bug#6391 (binlog-do-db rules ignored)mats@mysql.com2004-12-0323-120/+340
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CREATE DATABASE statement used the current database instead of the database created when checking conditions for replication. CREATE/DROP/ALTER DATABASE statements are now replicated based on the manipulated database.
| | | * | | | | | | | | Manual fixes to merge of fix for Bug #6682 to 4.1.jimw@mysql.com2004-12-032-10/+7
| | | | | | | | | | | |
| | | * | | | | | | | | Mergejimw@mysql.com2004-12-036-6/+45
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when thejimw@mysql.com2004-12-036-8/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | insertion of new records partially failed. It would get logged because of the logic to log a partially-failed 'INSERT ... SELECT' (which can't be rolled back in non-transactional tables), but 'CREATE TABLE ... SELECT' is always rolled back on failure, even for non-transactional tables. (Bug #6682) (Original fix reimplemented after review by Serg and Guilhem.)
| | | * | | | | | | | | - updated lowercase_table3 test result (T1.InnoDB -> T1.ibd). Failure waslenz@mysql.com2004-12-021-1/+1
| | | | |_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | discovered on Mac OS X
| | | * | | | | | | | compatibility fixserg@serg.mylan2004-12-021-1/+1
| | | | | | | | | | |
| | | * | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2004-12-021-1/+1
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| | | | * \ \ \ \ \ \ \ Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1joerg@mysql.com2004-12-021-1/+1
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / | | | | |/| | | | | | |
| | | | | * | | | | | | Change to prevent the failure of "make distclean" on the missing ↵joerg@mysql.com2004-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'regex/Makefile' (and, later, 'strings/Makefile').
| | | * | | | | | | | | - added option --with-archive to enable compiling with the Archive Storage lenz@mysql.com2004-12-021-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Engine
| | | * | | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2004-12-025-0/+50
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| | | | * | | | | | | | Merge mysql.com:/space/my/mysql-4.1lenz@mysql.com2004-12-025-0/+50
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-build
| | | | | * | | | | | | Merge mysql.com:/space/my/mysql-4.1lenz@mysql.com2004-12-025-0/+50
| | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-build
| | | | | | * | | | | | | - fixed file permissions (need execute bits set)lenz@mysql.com2004-12-024-0/+0
| | | | | | | | | | | | |
| | | | | | * | | | | | | - added some BUILD/compile-ppc* build scripts to ease building on LinuxPPClenz@mysql.com2004-12-025-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added ppc_cflags to BUILD/SETUP.sh
| | | * | | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1tsmith@build.mysql.com2004-12-023-27/+124
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into build.mysql.com:/users/tsmith/m/41/b
| | | | * \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-4.1tsmith@build.mysql.com2004-12-023-27/+124
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into build.mysql.com:/users/tsmith/m/41/b
| | | | | * | | | | | | | | | mysqld_safe.sh:tsmith@build.mysql.com2004-11-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix calls to my_print_defaults. Some how, --loose-verbose had been added before --no-defaults/defaults-file, which must be the first option. NOTE: this may make some installations behave differently, if they depend on this broken behavior.
| | | | | * | | | | | | | | | Mergetsmith@build.mysql.com2004-11-302-25/+122
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | mysqldump.c:tsmith@build.mysql.com2004-11-301-19/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minor cleanup to the --order-by-primary feature code
| | | | | | * | | | | | | | | | Add --order-by-primary option, which adds an ORDER BYtsmith@build.mysql.com2004-11-162-25/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clause the the SELECT statement used to dump the data for any table which has a primary or unique key. This is useful for dumping MyISAM tables which will be later imported into InnoDB tables.
| | | * | | | | | | | | | | | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1marko@hundin.mysql.fi2004-12-0233-80/+23378
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/k/mysql-4.1
View Lorry Controller Status