mariadb

Tree: 57c08a6a33

Author	SHA1	Message	Date
unknown	57c08a6a33	Merge mysql.com:/home/ram/work/b26038/b26038.5.0 into mysql.com:/home/ram/work/b26038/b26038.5.1 mysql-test/t/gis.test: Auto merged sql/item_geofunc.cc: Auto merged sql/item_geofunc.h: Auto merged sql/spatial.cc: Auto merged sql/spatial.h: Auto merged mysql-test/include/gis_generic.inc: manual merge mysql-test/r/archive_gis.result: manual merge mysql-test/r/gis.result: manual merge mysql-test/r/innodb_gis.result: manual merge mysql-test/r/ndb_gis.result: manual merge	19 years ago
unknown	d4272a16de	after merge fix (bug #26038 ) Item_func_geometry_from_text::val_str() should set null_value in case of wrong data. mysql-test/include/gis_generic.inc: after merge fix Item_func_geometry_from_text::val_str() should set null_value in case of wrong data. mysql-test/r/archive_gis.result: after merge fix Item_func_geometry_from_text::val_str() should set null_value in case of wrong data. mysql-test/r/gis.result: after merge fix Item_func_geometry_from_text::val_str() should set null_value in case of wrong data. mysql-test/r/innodb_gis.result: after merge fix Item_func_geometry_from_text::val_str() should set null_value in case of wrong data. mysql-test/r/ndb_gis.result: after merge fix Item_func_geometry_from_text::val_str() should set null_value in case of wrong data. mysql-test/t/gis.test: after merge fix Item_func_geometry_from_text::val_str() should set null_value in case of wrong data. sql/item_geofunc.cc: after merge fix Item_func_geometry_from_text::val_str() should set null_value in case of wrong data.	19 years ago
unknown	6842f6b12a	Merge mysql.com:/home/ram/work/b26038/b26038.4.1 into mysql.com:/home/ram/work/b26038/b26038.5.0 sql/item_geofunc.cc: Auto merged sql/spatial.cc: Auto merged sql/spatial.h: Auto merged mysql-test/r/gis.result: will be fixed after the merging. mysql-test/t/gis.test: merging, the result will be fixed in an after-merge fix CS sql/item_geofunc.h: merging	19 years ago
unknown	cbb38476e1	Fix for bug #26038 : X() value of empty NOT NULL POINT is neither NULL nor NOT NULL Having maybe_null flag unset for geometry/spatial functions leads to wrong Item_func_isnull::val_int()'s results. Fix: set maybe_null flag and add is_null() methods. mysql-test/r/gis.result: Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL - test result. mysql-test/t/gis.test: Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL - test case. sql/item_geofunc.cc: Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL - set maybe_null flag for Item_geometry_func and Item_func_as_wkt. - moved length check to the beginnig of the Item_func_spatial_collection::val_str() to affect geometry collection objects at once. - changed Item_func_isempty::val_int() and Item_func_issimple::val_int() to properly handle null_value. sql/item_geofunc.h: Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL - set maybe_null flag for geometry/spatial functions. - added is_null() to Item_geometry_func and Item_func_spatial_rel classes. sql/spatial.cc: Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL - changed return type of Geometry::create_from_wkb() to be consistent with Geometry::create_from_wkt(), now it returns Geometry object or NULL in case of error. sql/spatial.h: Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL - changed return type of Geometry::create_from_wkb() to be consistent with Geometry::create_from_wkt(), now it returns Geometry object or NULL in case of error.	19 years ago
unknown	71a25f2b3e	Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint client/mysqltest.c: Auto merged	19 years ago
unknown	a9afbd5085	Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged	19 years ago
unknown	ca99440907	Turn the "is_windows" flag _on_ when compiled on windows	19 years ago
unknown	2080df125e	Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint mysql-test/t/mysqldump.test: Auto merged	19 years ago
unknown	6fa33adf17	Remove extra ; at end of line	19 years ago
unknown	eb3fd8cebd	Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint mysql-test/t/mysqldump.test: Auto merged	19 years ago
unknown	8e74830003	Remove unportable constructs in mysqldump.test	19 years ago
unknown	145c17707f	Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint client/mysqltest.c: Auto merged mysql-test/r/mysqltest.result: Auto merged mysql-test/t/mysqltest.test: Auto merged	19 years ago
unknown	082ad73439	Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint mysql-test/r/mysqltest.result: Auto merged mysql-test/t/mysqltest.test: Manual merge	19 years ago
unknown	a8be1b9325	Commment out two test's thats just confusing for cmd.exe	19 years ago
unknown	8cb50382d4	Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged mysql-test/t/mysqltest.test: Auto merged mysql-test/r/mysqltest.result: SCCS merged	19 years ago
unknown	8d7e8d9715	Add cat_file command to mysqltest	19 years ago
unknown	4ee96f8c52	Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint mysql-test/t/mysqlbinlog.test: Auto merged	19 years ago
unknown	2b46c20a7d	Use a temporary file to pass UTF8 chars to "mysql" in a portable way	19 years ago
unknown	9e5efc371a	Remove non portable exec's from csv.test mysql-test/r/csv.result: Update result file - There is no builtin equvivalent of "cat" - ls was replaced with "file_exists" which does not produce any output mysql-test/t/csv.test: Replce obscure exec's with mysqltest builtin commands	19 years ago
unknown	f2e3bc0ee9	Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint client/mysqltest.c: Auto merged mysql-test/t/mysqltest.test: Auto merged	19 years ago
unknown	a25c33cf73	Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged mysql-test/t/mysqltest.test: Auto merged	19 years ago
unknown	d329b1f203	Add "append_file" command to mysqltest	19 years ago
unknown	52e8f39120	Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint	19 years ago
unknown	f94e77511a	Replace "exec rm" with remove_file and "exec touch" with "write_file"	19 years ago
unknown	4392754e96	Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint client/Makefile.am: Manual merge	19 years ago
unknown	dcd3b8d4b6	Add echo.c as EXTRA_DIST file	19 years ago
unknown	dbfa53d22d	Bug#25592 wrong reporting for mysql-test-run.pl --mysqld=--binlog-format=... mysql-test/mysql-test-run.pl: Allow both dash and underscore as separator for mysqld option	19 years ago
unknown	a4a619dcb1	Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint	19 years ago
unknown	d7b2f201f4	Merge pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint sql/share/errmsg.txt: Auto merged	19 years ago
unknown	4e1974c329	Merge pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint sql/share/errmsg.txt: Auto merged	19 years ago
unknown	5e7c6c2937	Clean "gen_lex_hash" if it's been built	19 years ago
unknown	7bab154f55	Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint client/mysqltest.c: Auto merged mysql-test/r/mysqltest.result: Auto merged mysql-test/t/mysqltest.test: Auto merged	19 years ago
unknown	583e4f0ee7	Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: SCCS merged	19 years ago
unknown	ad41369d3f	Update for running with cmd.exe directly mysql-test/r/mysqltest.result: Update result file after removing one test mysql-test/t/mysqltest.test: Remove use of "ls" in system Rewrite "system echo" which introduces CR/LF problems with "write_file" Remove test for end of line junk for "write_file" - it has mismatching number of "'s	19 years ago
unknown	da21afb219	Don't output escape char from 'do_eval' on windows. "It" won't know it's an escape char. Replace /dev/null with NUL Replace "closed stdout" with "not open fd"	19 years ago
unknown	e9498335fb	Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint mysql-test/t/mysql.test: Auto merged	19 years ago
unknown	2f7a4de64b	Use " instead of ' to avoid win problem with '	19 years ago
unknown	f395d6b6a1	Add echo to be compiled	19 years ago
unknown	b1d78170e2	Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint client/mysqltest.c: Auto merged mysql-test/lib/mtr_misc.pl: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~7: Auto merged mysql-test/mysql-test-run.pl: Manual merge with add of --debug-info	19 years ago
unknown	6660006b2f	Add echo.c to be built on Windows	19 years ago
unknown	2214c20777	Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged mysql-test/lib/mtr_misc.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged	19 years ago
unknown	7396402416	Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint mysql-test/r/order_by.result: Auto merged mysql-test/t/order_by.test: Auto merged sql/Makefile.am: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/sql_select.cc: Auto merged	19 years ago
unknown	c6e1de4c56	Merge 192.168.0.10:mysql/mysql-4.1-maint into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint client/mysqltest.c: Auto merged	19 years ago
unknown	89cbc57250	Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint mysql-test/r/order_by.result: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/sql_select.cc: Auto merged mysql-test/t/order_by.test: SCCS merged	19 years ago
unknown	a843a05f92	Workaround for problem where cygwin's bash/sh randomly fails with error 128 which mainly occurs on win2003 64bit. - Execute "exec" commands directly with cmd.exe and replace "--exec echo ..." with "--exec .\echo.exe ..." client/mysqltest.c: Workaround the problem with "echo" in windows not behaving like "echo" in Unix. - Replace "--exec echo ..." with "--exec <path to mysqltest>\echo.exe" thus forcing use of our own echo implementation which baheves like on Unix. - The above change makes it possible to remove the need to execute all --exec's inside cygwin. Add ifdefs to only use use cygwin's bash conditionally mysql-test/lib/mtr_misc.pl: Add function for converting to the OS's native format mysql-test/mysql-test-run.pl: Convert path to executables to "windows native" (c:\<path>\) instead of "mixed"(c:/<path>) mode necessary for pipes and redirects to work properly in cmd.exe client/echo.c: New BitKeeper file ``client/echo.c''	19 years ago
unknown	92584188d4	Merge 192.168.0.10:mysql/mysql-5.0-maint into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint sql/mysql_priv.h: Auto merged	19 years ago
unknown	4ff5ff2c0b	Merge 192.168.0.10:mysql/mysql-4.1-maint into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint	19 years ago
unknown	109bd52ea3	Merge neptunus.(none):/home/msvensson/mysql/bug10777/my51-bug10777 into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint sql/Makefile.am: Auto merged	19 years ago
unknown	f1b8bea142	Remove the hack to let lex_hash.h depend on it's tool and not the sources	19 years ago
unknown	44092322aa	Merge neptunus.(none):/home/msvensson/mysql/bug10777/my50-bug10777 into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint sql/Makefile.am: Auto merged	19 years ago

1 2 3 4 5 ...

43096 Commits (57c08a6a3355faa28ab243281e8aca86f1e7b46c) All Branches Search

43096 Commits (57c08a6a3355faa28ab243281e8aca86f1e7b46c)

All Branches